Jon/scenewrapper updates

CHANGELOG.md

@@ -2,9 +2,12 @@
 
 ## Unreleased (develop)
 
+- added: Zcash buy/sell support with Banxa
+
 ## 4.41.0 (staging)
 
 - changed: Replace `currencyCode` usage with `EdgeTokenId` throughout the app
+- changed: (UFO) Re-enable UFO
 - changed: Update translations
 
 ## 4.40.0 (staging)

eslint.config.mjs

@@ -41,7 +41,17 @@ export default [
 
       // Add our own rules:
       'edge/useAbortable-abort-check-param': 'error',
-      'edge/useAbortable-abort-check-usage': 'error'
+      'edge/useAbortable-abort-check-usage': 'error',
+
+      // Warn on styled() usage to encourage migration away from styled components
+      'no-restricted-syntax': [
+        'warn',
+        {
+          selector: "CallExpression[callee.name='styled']",
+          message:
+            'Avoid using styled() - prefer regular components with useTheme() and cacheStyles()'
+        }
+      ]
     }
   },
 
@@ -81,14 +91,12 @@ export default [
       'src/actions/FioAddressActions.ts',
       'src/actions/FirstOpenActions.tsx',
       'src/actions/LoanWelcomeActions.tsx',
-      'src/actions/LocalSettingsActions.ts',
 
-      'src/actions/LoginActions.tsx',
       'src/actions/NotificationActions.ts',
       'src/actions/PaymentProtoActions.tsx',
       'src/actions/ReceiveDropdown.tsx',
       'src/actions/RecoveryReminderActions.tsx',
-      'src/actions/RequestReviewActions.tsx',
+
       'src/actions/ScamWarningActions.tsx',
       'src/actions/ScanActions.tsx',
 
@@ -241,7 +249,7 @@ export default [
       'src/components/scenes/CreateWalletEditNameScene.tsx',
       'src/components/scenes/CreateWalletImportOptionsScene.tsx',
       'src/components/scenes/CreateWalletImportScene.tsx',
-      'src/components/scenes/CreateWalletSelectCryptoScene.tsx',
+
       'src/components/scenes/CurrencyNotificationScene.tsx',
       'src/components/scenes/CurrencySettingsScene.tsx',
       'src/components/scenes/DefaultFiatSettingScene.tsx',
@@ -288,10 +296,9 @@ export default [
       'src/components/scenes/OtpSettingsScene.tsx',
       'src/components/scenes/PasswordRecoveryScene.tsx',
       'src/components/scenes/PromotionSettingsScene.tsx',
-      'src/components/scenes/ReviewTriggerTestScene.tsx',
+
       'src/components/scenes/SecurityAlertsScene.tsx',
 
-      'src/components/scenes/SettingsScene.tsx',
       'src/components/scenes/SpendingLimitsScene.tsx',
       'src/components/scenes/Staking/EarnScene.tsx',
       'src/components/scenes/Staking/StakeOptionsScene.tsx',
@@ -308,7 +315,7 @@ export default [
 
       'src/components/scenes/TransactionsExportScene.tsx',
       'src/components/scenes/UpgradeUsernameScreen.tsx',
-      'src/components/scenes/WalletListScene.tsx',
+
       'src/components/scenes/WalletRestoreScene.tsx',
       'src/components/scenes/WcConnectionsScene.tsx',
       'src/components/scenes/WcConnectScene.tsx',
@@ -467,7 +474,7 @@ export default [
       'src/plugins/stake-plugins/generic/policyAdapters/EthereumKilnAdaptor.ts',
       'src/plugins/stake-plugins/generic/policyAdapters/GlifInfinityPoolAdapter.ts',
       'src/plugins/stake-plugins/generic/policyAdapters/TarotPoolAdaptor.ts',
-      'src/plugins/stake-plugins/generic/policyAdapters/ThorchainYieldAdaptor.ts',
+
       'src/plugins/stake-plugins/generic/util/EdgeWalletSigner.ts',
       'src/plugins/stake-plugins/generic/util/KilnApi.ts',
       'src/plugins/stake-plugins/generic/util/tarotUtils.ts',
@@ -484,9 +491,7 @@ export default [
       'src/plugins/stake-plugins/util/builder.ts',
       'src/reducers/ExchangeInfoReducer.ts',
       'src/reducers/NetworkReducer.ts',
-      'src/reducers/PasswordReminderReducer.ts',
 
-      'src/reducers/SpendingLimitsReducer.ts',
       'src/selectors/getCreateWalletList.ts',
       'src/selectors/SettingsSelectors.ts',
       'src/state/createStateProvider.tsx',
@@ -505,7 +510,7 @@ export default [
       'src/util/CurrencyWalletHelpers.ts',
 
       'src/util/exchangeRates.ts',
-      'src/util/fake/FakeProviders.tsx',
+
       'src/util/FioAddressUtils.ts',
       'src/util/getAccountUsername.ts',
       'src/util/GuiPluginTools.ts',

ios/Podfile.lock

@@ -15,13 +15,13 @@ PODS:
   - disklet (0.5.2):
     - React
   - DoubleConversion (1.1.6)
-  - edge-core-js (2.37.0):
+  - edge-core-js (2.38.2):
     - React-Core
-  - edge-currency-accountbased (4.67.0):
+  - edge-currency-accountbased (4.68.0):
     - React-Core
-  - edge-currency-plugins (3.8.9):
+  - edge-currency-plugins (3.8.10):
     - React-Core
-  - edge-exchange-plugins (2.40.1):
+  - edge-exchange-plugins (2.40.2):
     - React-Core
   - edge-login-ui-rn (3.34.6):
     - React-Core
@@ -3333,10 +3333,10 @@ SPEC CHECKSUMS:
   CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
   disklet: 8a20bf8a568635b6e6bb8f93297dac13ee5cef98
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
-  edge-core-js: 248f7d28942a5ea6c9835eca6f9f16969c89476c
-  edge-currency-accountbased: 993920e46f000e04df92d0a49eabb57973096d1c
-  edge-currency-plugins: 0d8a1a8da63672342cbc9bd5055feb4b397544e7
-  edge-exchange-plugins: b92baace286dd8ed8a7a6672e1d0172f04a91357
+  edge-core-js: 8b015465c8462879816149c8a5896a854d53e971
+  edge-currency-accountbased: b526ee12efefad410125c51135222b0c63e42f12
+  edge-currency-plugins: 6b3341707a6a5c74f837a012768dd2f6c55a691b
+  edge-exchange-plugins: f35930ddcd5a4551a6e45334cb3f4c0295c23acd
   edge-login-ui-rn: c9648a772533c092f4526a189cd4da9d6f729639
   EXConstants: 98bcf0f22b820f9b28f9fee55ff2daededadd2f8
   Expo: 43d9e0c3108cc3a1c2739743e9b51086144ee4b0

maestro/01-accounts/C000000-change-password.yaml

@@ -22,6 +22,10 @@ tags:
     file: ../common/create-account.yaml
     label: "Create new account"
 
+# Dismiss modals
+- runFlow:
+    file: ../common/dismiss-modals.yaml
+
 # Navigate to Settings
 - tapOn:
     id: "sideMenuButton"

maestro/01-accounts/C000001-switch-and-forget-account.yaml

@@ -31,22 +31,9 @@ tags:
       USERNAME: ${USERNAME1}
       PASSWORD: ${PASSWORD1}
 
-# Dismiss allow-notifications modal
-- extendedWaitUntil:
-    visible: "Security is Our Priority"
-    timeout: 10000
-    optional: true
-- tapOn:
-    text: "Cancel"
-    optional: true
-# If the survey modal shows, dismiss it
-- extendedWaitUntil:
-    visible: "How Did You Discover Edge?"
-    timeout: 10000
-    optional: true
-- tapOn:
-    text: "Dismiss"
-    optional: true
+# Dismiss modals
+- runFlow:
+    file: ../common/dismiss-modals.yaml
 
 # Login into account #2
 - tapOn:

maestro/01-accounts/C000006-light-account.yaml

@@ -70,7 +70,7 @@ tags:
       # If the request notifications modal show with "Security is Our Priority" then cancel it - Currently appears before wallets are created
       - extendedWaitUntil:
           visible: Security is Our Priority
-          timeout: 15000
+          timeout: 25000
           optional: true
       - runFlow:
           when:
@@ -79,13 +79,15 @@ tags:
             - tapOn:
                 text: "Cancel"
           label: "Request notifications modal"
-      - assertVisible: "Choose Wallets to Add"
+      - extendedWaitUntil: 
+          visible: "Choose Wallets to Add"
+          timeout: 20000
       - assertVisible: ${"BTC.*"}
       - assertVisible: ${"ETH.*"}
       - assertVisible: ${"LTC.*"}
       - tapOn: Next
       - waitForAnimationToEnd:
-          timeout: 2000
+          timeout: 5000
 
 # Dismiss Web3 Handle Modal
 - runFlow:
@@ -96,8 +98,9 @@ tags:
           text: "Not Now"
     label: "Dismiss Web3 Handle Modal"
 # Confirm flow completed successfully
-- assertVisible: 
-    text: "Assets"
+- extendedWaitUntil: 
+    visible: "Assets"
+    timeout: 20000
     label: "Light account created successfully"
 
 # Ensure visible reminder to backup account & correct modal
@@ -116,18 +119,27 @@ tags:
       - tapOn: Back Up Account
       - waitForAnimationToEnd:
           timeout: 10000
-      - assertVisible: Choose Username
+      - extendedWaitUntil:
+          visible: Choose Username
+          timeout: 10000
       - assertVisible: Next
       - tapOn:
           id: "headerLeftButton"
+      # could pause here
+      # Test Receive Scene via "Deposit" button
+      - tapOn: Deposit
+      - tapOn: "From Another Wallet/Exchange"
+      - tapOn: "BTC"
+      - assertVisible: "Receive"
+      - assertVisible: "To buy, sell, and receive.*"
+      - assertVisible: "Back Up Account"
       - tapOn:
-          id: "sideMenuButton"
-      - tapOn: "Logout"
-      - assertNotVisible: ${".*guest.*"}
-      - tapOn: ${MAESTRO_EDGE_NEW_ACCOUNT_PIN_SINGLE}
-      - tapOn: ${MAESTRO_EDGE_NEW_ACCOUNT_PIN_SINGLE}
-      - tapOn: ${MAESTRO_EDGE_NEW_ACCOUNT_PIN_SINGLE}
-      - tapOn: ${MAESTRO_EDGE_NEW_ACCOUNT_PIN_SINGLE}
+          id: "chevronBack"
+
+      # Relogin with PIN
+      - runFlow:
+          file: ../common/relogin-pin.yaml
+          label: "Relogin with PIN"
       # Dismiss "Discover Edge" modal
       - runFlow:
           when:
@@ -136,20 +148,27 @@ tags:
             - tapOn:
                 text: "Dismiss"
           label: "Dismiss Discover Edge modal"
-      # Learn More button
+      # Learn More button (From Assets scene so no conflict with promo card "Learn More" button)
+      - tapOn: Assets
       - tapOn:
           id: "notifBackup"
+      - extendedWaitUntil:
+          visible: Continue with Guest Account
       - tapOn: Learn More
       - assertVisible: "Guest Account" # Support article title
+
+      # Reopen to same screen and check unable to view seed phrase
       - launchApp:
           stopApp: false
-      - tapOn:
-          id: "sideMenuButton"
-      - tapOn: "Logout"
-      - tapOn: ${MAESTRO_EDGE_NEW_ACCOUNT_PIN_SINGLE}
-      - tapOn: ${MAESTRO_EDGE_NEW_ACCOUNT_PIN_SINGLE}
-      - tapOn: ${MAESTRO_EDGE_NEW_ACCOUNT_PIN_SINGLE}
-      - tapOn: ${MAESTRO_EDGE_NEW_ACCOUNT_PIN_SINGLE}
+      - longPressOn: BTC
+      - assertNotVisible: ".*Master Private Key"
+      - assertNotVisible: ".*Get Raw Keys"
+
+
+      # Relogin with PIN
+      - runFlow:
+          file: ../common/relogin-pin.yaml
+          label: "Relogin with PIN"
       # Dismiss "Discover Edge" modal
       - runFlow:
           when:
@@ -187,7 +206,9 @@ tags:
       - tapOn: Get Started
       - waitForAnimationToEnd:
           timeout: 10000
-      - assertVisible: Choose Username
+      - extendedWaitUntil:
+          visible: Choose Username
+          timeout: 10000
       - assertVisible: Next
       - tapOn:
           id: "headerLeftButton"
@@ -213,6 +234,8 @@ tags:
       - tapOn: Continue with Guest Account
       # Learn More button
       - tapOn: Back Up Account
+      - extendedWaitUntil:
+          visible: Continue with Guest Account
       - tapOn: Learn More
       - assertVisible: "Guest Account" # Support article title
       - launchApp:
@@ -233,7 +256,9 @@ tags:
           optional: true
       - waitForAnimationToEnd:
           timeout: 5000
-      - assertVisible: Choose Username
+      - extendedWaitUntil:
+          visible: Choose Username
+          timeout: 10000
       - assertVisible: Next
 
 # Complete backup of account
@@ -336,6 +361,12 @@ tags:
       - pressKey: Enter
       - inputText: ${MAESTRO_EDGE_NEW_ACCOUNT_PASSWORD}
       - pressKey: Enter
+
+      # Dismiss option to save password to keychain
+      - tapOn:
+          text: Not Now
+          optional: true
+
       - extendedWaitUntil:
           visible: "Assets"
           timeout: 5000