@@ -32,9 +32,9 @@ describe('@settings - Settings', () => {
3232 } ) ;
3333
3434 describe ( 'General' , ( ) => {
35- ciIt ( '@settings_1 - Can switch local currency' , async ( ) => {
35+ ciIt ( '@settings_01 - Can switch local currency' , async ( ) => {
3636 // switch to local currency
37- const fiatSymbol = await elementByIdWithin ( 'TotalBalance-primary' , 'MoneyFiatSymbol' ) ;
37+ const fiatSymbol = await elementByIdWithin ( 'TotalBalance-primary' , 'MoneyFiatSymbol' ) ;
3838 try {
3939 await tap ( 'TotalBalance' ) ;
4040 await expect ( fiatSymbol ) . toHaveText ( '$' ) ;
@@ -71,14 +71,14 @@ describe('@settings - Settings', () => {
7171 await doNavigationClose ( ) ;
7272 } ) ;
7373
74- ciIt ( '@settings_2 - Can switch Bitcoin Unit' , async ( ) => {
75- const fiatSymbol = await elementByIdWithin ( 'TotalBalance-primary' , 'MoneyFiatSymbol' ) ;
76- const balance = await elementByIdWithin ( 'TotalBalance-primary' , 'MoneyText' ) ;
77-
74+ ciIt ( '@settings_02 - Can switch Bitcoin Unit' , async ( ) => {
75+ const fiatSymbol = await elementByIdWithin ( 'TotalBalance-primary' , 'MoneyFiatSymbol' ) ;
76+ const balance = await elementByIdWithin ( 'TotalBalance-primary' , 'MoneyText' ) ;
77+
7878 await tap ( 'HeaderMenu' ) ;
7979 await tap ( 'DrawerSettings' ) ;
8080 await tap ( 'GeneralSettings' ) ;
81-
81+
8282 // switch to USD
8383 await tap ( 'UnitSettings' ) ;
8484 await tap ( 'USD' ) ;
@@ -113,35 +113,37 @@ describe('@settings - Settings', () => {
113113 await expect ( balance ) . toHaveText ( '0.00000000' ) ;
114114 } ) ;
115115
116- ciIt ( '@settings_3 - Can switch transaction speed' , async ( ) => {
116+ ciIt ( '@settings_03 - Can switch transaction speed' , async ( ) => {
117117 await tap ( 'HeaderMenu' ) ;
118118 await tap ( 'DrawerSettings' ) ;
119119 await tap ( 'GeneralSettings' ) ;
120120
121121 // switch to Fast
122122 await tap ( 'TransactionSpeedSettings' ) ;
123123 await tap ( 'fast' ) ;
124- await expect ( await elementByIdWithin ( 'TransactionSpeedSettings' , 'Value' ) ) . toHaveText ( 'Fast' ) ;
124+ await expect ( await elementByIdWithin ( 'TransactionSpeedSettings' , 'Value' ) ) . toHaveText (
125+ / .* F a s t /
126+ ) ;
125127
126128 // switch to Custom
127129 await tap ( 'TransactionSpeedSettings' ) ;
128130 await tap ( 'custom' ) ;
129- ( await elementByIdWithin ( 'CustomFee' , ' N1') ) . click ( ) ;
131+ await tap ( ' N1') ;
130132 await tap ( 'Continue' ) ;
131133 await tap ( 'NavigationBack' ) ;
132134 await expect ( await elementByIdWithin ( 'TransactionSpeedSettings' , 'Value' ) ) . toHaveText (
133- ' Custom'
135+ / . * C u s t o m /
134136 ) ;
135137
136138 // switch back to Normal
137139 await tap ( 'TransactionSpeedSettings' ) ;
138140 await tap ( 'normal' ) ;
139141 await expect ( await elementByIdWithin ( 'TransactionSpeedSettings' , 'Value' ) ) . toHaveText (
140- ' Normal'
142+ / . * N o r m a l /
141143 ) ;
142144 } ) ;
143145
144- ciIt ( '@settings_4 - Can remove last used tags' , async ( ) => {
146+ ciIt ( '@settings_04 - Can remove last used tags' , async ( ) => {
145147 // no tags, menu entry should be hidden
146148 await tap ( 'HeaderMenu' ) ;
147149 await tap ( 'DrawerSettings' ) ;
@@ -181,7 +183,7 @@ describe('@settings - Settings', () => {
181183 ( await elementByText ( tag ) ) . waitForDisplayed ( { reverse : true } ) ;
182184 } ) ;
183185
184- ciIt ( '@settings_5 - Can show About screen' , async ( ) => {
186+ ciIt ( '@settings_05 - Can show About screen' , async ( ) => {
185187 await tap ( 'HeaderMenu' ) ;
186188 await tap ( 'DrawerSettings' ) ;
187189 await tap ( 'About' ) ;
@@ -190,7 +192,7 @@ describe('@settings - Settings', () => {
190192 } ) ;
191193
192194 describe ( 'Security and Privacy' , ( ) => {
193- ciIt ( '@settings_6 - Can swipe to hide balance' , async ( ) => {
195+ ciIt ( '@settings_06 - Can swipe to hide balance' , async ( ) => {
194196 // test plan:
195197 // - swipe to hide balance
196198 // - disable 'swipe to hide balance'
@@ -237,14 +239,14 @@ describe('@settings - Settings', () => {
237239
238240 // Restart the app
239241 await sleep ( 3000 ) ;
240- await launchFreshApp ( ) ;
242+ await launchFreshApp ( { tryHandleAlert : driver . isAndroid } ) ;
241243 // Balance should be hidden
242244 await elementById ( 'ShowBalance' ) . waitForDisplayed ( ) ;
243245 } ) ;
244246 } ) ;
245247
246248 describe ( 'Backup or restore' , ( ) => {
247- ciIt ( '@settings_7 - Can show backup and validate it' , async ( ) => {
249+ ciIt ( '@settings_07 - Can show backup and validate it' , async ( ) => {
248250 await tap ( 'HeaderMenu' ) ;
249251 await tap ( 'DrawerSettings' ) ;
250252 await tap ( 'BackupSettings' ) ;
@@ -285,7 +287,7 @@ describe('@settings - Settings', () => {
285287
286288 describe ( 'Advanced' , ( ) => {
287289 // not available in ldk-node
288- ciIt . skip ( '@settings_8 - Can switch address types' , async ( ) => {
290+ ciIt . skip ( '@settings_08 - Can switch address types' , async ( ) => {
289291 // wallet be in regtest mode by default
290292 // at first check if it is Native segwit by default
291293 const address = await getReceiveAddress ( ) ;
@@ -322,7 +324,7 @@ describe('@settings - Settings', () => {
322324 await sleep ( 1000 ) ;
323325 } ) ;
324326
325- ciIt ( '@settings_9 - Can open LN settings screens' , async ( ) => {
327+ ciIt ( '@settings_09 - Can open LN settings screens' , async ( ) => {
326328 await tap ( 'HeaderMenu' ) ;
327329 await tap ( 'DrawerSettings' ) ;
328330 // LDKDebug, CopyNodeId, RefreshLDK, RestartLDK and RebroadcastLDKTXS N/A in DevSettings
@@ -455,7 +457,7 @@ describe('@settings - Settings', () => {
455457 await sleep ( 1000 ) ;
456458
457459 // add slash at the end
458- const rgsUrl = await ( await elementById ( 'RGSUrl ' ) ) . getText ( ) ;
460+ const rgsUrl = await ( await elementById ( 'ConnectedUrl ' ) ) . getText ( ) ;
459461 console . info ( { rgsUrl } ) ;
460462 const newUrl = `${ rgsUrl } /` ;
461463
0 commit comments