fix tests not working in latest main [skip slack] [run tests]

cake-tech · Feb 3, 2025 · 7272151 · 7272151
1 parent 6d4b931
commit 7272151
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/integration_test/robots/wallet_keys_robot.dart b/integration_test/robots/wallet_keys_robot.dart
@@ -70,33 +70,45 @@ class WalletKeysAndSeedPageRobot {
     if (walletType == WalletType.bitcoin ||
         walletType == WalletType.litecoin ||
         walletType == WalletType.bitcoinCash) {
-      commonTestCases.hasText(appStore.wallet!.seed!);
+      final seedWords = appStore.wallet!.seed!.split(" ");
+      for (var seedWord in seedWords) {
+        commonTestCases.hasTextAtLestOnce(seedWord);
+      }
       tester.printToConsole('$walletName wallet has seeds properly displayed');
     }
 
     if (isEVMCompatibleChain(walletType) ||
         walletType == WalletType.solana ||
         walletType == WalletType.tron) {
       if (hasSeed) {
-        commonTestCases.hasText(appStore.wallet!.seed!);
+        final seedWords = appStore.wallet!.seed!.split(" ");
+        for (var seedWord in seedWords) {
+          commonTestCases.hasTextAtLestOnce(seedWord);
+        }
         tester.printToConsole('$walletName wallet has seeds properly displayed');
       }
       if (hasPrivateKey) {
+        await commonTestCases.tapItemByKey('wallet_keys_page_keys');
         commonTestCases.hasText(appStore.wallet!.privateKey!);
         tester.printToConsole('$walletName wallet has private key properly displayed');
       }
     }
 
     if (walletType == WalletType.nano || walletType == WalletType.banano) {
       if (hasSeed) {
-        commonTestCases.hasText(appStore.wallet!.seed!);
+        final seedWords = appStore.wallet!.seed!.split(" ");
+        for (var seedWord in seedWords) {
+          commonTestCases.hasTextAtLestOnce(seedWord);
+        }
         tester.printToConsole('$walletName wallet has seeds properly displayed');
       }
       if (hasHexSeed) {
+        await commonTestCases.tapItemByKey('wallet_keys_page_keys');
         commonTestCases.hasText(appStore.wallet!.hexSeed!);
         tester.printToConsole('$walletName wallet has hexSeed properly displayed');
       }
       if (hasPrivateKey) {
+        await commonTestCases.tapItemByKey('wallet_keys_page_keys');
         commonTestCases.hasText(appStore.wallet!.privateKey!);
         tester.printToConsole('$walletName wallet has private key properly displayed');
       }
@@ -129,35 +141,39 @@ class WalletKeysAndSeedPageRobot {
     final hasSeedLegacy = Polyseed.isValidSeed(seed);
 
     if (hasPublicSpendKey) {
+      await commonTestCases.tapItemByKey('wallet_keys_page_keys');
       commonTestCases.hasText(keys.publicSpendKey);
       tester.printToConsole('$walletName wallet has public spend key properly displayed');
     }
     if (hasPrivateSpendKey) {
+      await commonTestCases.tapItemByKey('wallet_keys_page_keys');
       commonTestCases.hasText(keys.privateSpendKey);
       tester.printToConsole('$walletName wallet has private spend key properly displayed');
     }
     if (hasPublicViewKey) {
+      await commonTestCases.tapItemByKey('wallet_keys_page_keys');
       commonTestCases.hasText(keys.publicViewKey);
       tester.printToConsole('$walletName wallet has public view key properly displayed');
     }
     if (hasPrivateViewKey) {
+      await commonTestCases.tapItemByKey('wallet_keys_page_keys');
       commonTestCases.hasText(keys.privateViewKey);
       tester.printToConsole('$walletName wallet has private view key properly displayed');
     }
     if (hasSeeds) {
-      await commonTestCases.dragUntilVisible(
-        '${walletName}_wallet_seed_item_key',
-        'wallet_keys_page_credentials_list_view_key',
-      );
-      commonTestCases.hasText(seed);
+      await commonTestCases.tapItemByKey('wallet_keys_page_seed');
+      final seedWords = seed.split(" ");
+      for (var seedWord in seedWords) {
+        commonTestCases.hasTextAtLestOnce(seedWord);
+      }
       tester.printToConsole('$walletName wallet has seeds properly displayed');
     }
     if (hasSeedLegacy) {
-      await commonTestCases.dragUntilVisible(
-        '${walletName}_wallet_seed_legacy_item_key',
-        'wallet_keys_page_credentials_list_view_key',
-      );
-      commonTestCases.hasText(legacySeed);
+      await commonTestCases.tapItemByKey('wallet_keys_page_seed_legacy');
+      final seedWords = legacySeed.split(" ");
+      for (var seedWord in seedWords) {
+        commonTestCases.hasTextAtLestOnce(seedWord);
+      }
       tester.printToConsole('$walletName wallet has legacy seeds properly displayed');
     }
   }

diff --git a/lib/src/screens/wallet_keys/wallet_keys_page.dart b/lib/src/screens/wallet_keys/wallet_keys_page.dart
@@ -127,9 +127,9 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
             dividerColor: Colors.transparent,
             padding: EdgeInsets.zero,
             tabs: [
-              Tab(text: S.of(context).widgets_seed),
-              if (showKeyTab) Tab(text: S.of(context).keys),
-              if (showLegacySeedTab) Tab(text: S.of(context).legacy),
+              Tab(text: S.of(context).widgets_seed, key: ValueKey('wallet_keys_page_seed')),
+              if (showKeyTab) Tab(text: S.of(context).keys, key: ValueKey('wallet_keys_page_keys'),),
+              if (showLegacySeedTab) Tab(text: S.of(context).legacy, key: ValueKey('wallet_keys_page_seed_legacy')),
             ],
           ),
           ),