Merge branch 'staging'

Author: samholmes

.npmrc

@@ -0,0 +1 @@
+@jsr:registry=https://npm.jsr.io

CHANGELOG.md

@@ -2,8 +2,17 @@
 
 ## Unreleased (develop)
 
-## 4.38.0 (staging)
+## 4.39.0 (staging)
 
+- added: BitsOfGold and LibertyX ramp plugins.
+- added: Added remote ramp plugin filtering from info-server rollup.
+- fixed: Fixed broken `logEvent` tracking calls by adding the needed `dispatch`.
+- fixed: Localized display names for payment types in new buy/sell feature.
+- removed: Remove change quote tracking.
+
+## 4.38.0 (2025-11-04)
+
+- added: Include loginId's for all accounts when uploading logs.
 - changed: Reduced number of views in `WalletListCurrencyRow`
 - changed: Custom assets to show a generic grey icon, overlayed with the first three letters of the asset
 - changed: "X" button re-added to `EdgeModal` for accessibility

android/app/build.gradle

@@ -126,8 +126,15 @@ android {
         coreLibraryDesugaringEnabled true
     }
 
-    // Edge hacks for zcash and piratechain conflicts:
     packagingOptions {
+        // Edge addition to support 16KiB alignment,
+        // by re-compressing native libraries within the APK.
+        // We can remove this once we upgrade to AGP 8.5.1:
+        jniLibs {
+            useLegacyPackaging true
+        }
+
+        // Edge hacks for zcash and piratechain conflicts:
         resources {
             pickFirst 'compact_formats.proto'
             pickFirst 'darkside.proto'

eslint.config.mjs

@@ -69,7 +69,7 @@ export default [
       'src/actions/FirstOpenActions.tsx',
       'src/actions/LoanWelcomeActions.tsx',
       'src/actions/LocalSettingsActions.ts',
-      'src/actions/LogActions.tsx',
+
       'src/actions/LoginActions.tsx',
       'src/actions/NotificationActions.ts',
       'src/actions/PaymentProtoActions.tsx',
@@ -166,7 +166,7 @@ export default [
       'src/components/modals/InsufficientFeesModal.tsx',
       'src/components/modals/ListModal.tsx',
       'src/components/modals/LoanWelcomeModal.tsx',
-      'src/components/modals/LogsModal.tsx',
+
       'src/components/modals/PasswordReminderModal.tsx',
       'src/components/modals/PermissionsSettingModal.tsx',
 
@@ -337,7 +337,7 @@ export default [
       'src/components/text/SectionHeading.tsx',
       'src/components/text/TitleText.tsx',
       'src/components/themed/Alert.tsx',
-      'src/components/themed/BuyCrypto.tsx',
+
       'src/components/themed/CreateWalletSelectCryptoRow.tsx',
       'src/components/themed/DividerLine.tsx',
       'src/components/themed/EdgeProviderComponent.tsx',
@@ -375,7 +375,6 @@ export default [
       'src/components/themed/TransactionListTop.tsx',
       'src/components/themed/VectorIcon.tsx',
       'src/components/themed/WalletList.tsx',
-      'src/components/themed/WalletListCreateRow.tsx',
 
       'src/components/themed/WalletListErrorRow.tsx',
       'src/components/themed/WalletListHeader.tsx',
@@ -397,7 +396,7 @@ export default [
       'src/components/tiles/LtvRatioTile.tsx',
       'src/components/tiles/PercentageChangeArrowTile.tsx',
       'src/components/tiles/TotalDebtCollateralTile.tsx',
-      'src/constants/WalletAndCurrencyConstants.ts',
+
       'src/controllers/action-queue/ActionQueueStore.ts',
       'src/controllers/action-queue/cleaners.ts',
       'src/controllers/action-queue/push.ts',
@@ -441,7 +440,6 @@ export default [
       'src/plugins/borrow-plugins/common/cleaners/asBigNumber.ts',
       'src/plugins/borrow-plugins/plugins/aave/AaveBorrowEngineFactory.ts',
       'src/plugins/borrow-plugins/plugins/aave/index.ts',
-      'src/plugins/gui/amountQuotePlugin.ts',
 
       'src/plugins/gui/providers/bityProvider.ts',
       'src/plugins/gui/providers/ioniaProvider.ts',
@@ -514,7 +512,7 @@ export default [
       'src/util/scaling.ts',
       'src/util/show-confetti.ts',
       'src/util/stakeUtils.ts',
-      'src/util/tracking.ts',
+
       'src/util/ukComplianceUtils.ts',
       'src/util/utils.ts',
       'src/util/WebUtils.ts',

ios/Podfile.lock

@@ -17,13 +17,13 @@ PODS:
   - DoubleConversion (1.1.6)
   - edge-core-js (2.35.0):
     - React-Core
-  - edge-currency-accountbased (4.62.0):
+  - edge-currency-accountbased (4.64.0):
     - React-Core
-  - edge-currency-plugins (3.8.6):
+  - edge-currency-plugins (3.8.8):
     - React-Core
-  - edge-exchange-plugins (2.38.0):
+  - edge-exchange-plugins (2.39.0):
     - React-Core
-  - edge-login-ui-rn (3.34.0):
+  - edge-login-ui-rn (3.34.2):
     - React-Core
   - EXConstants (17.1.7):
     - ExpoModulesCore
@@ -1665,7 +1665,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-piratechain (0.5.15):
+  - react-native-piratechain (0.5.17):
     - gRPC-Swift (~> 1.8)
     - MnemonicSwift (~> 2.2)
     - React-Core
@@ -1774,7 +1774,7 @@ PODS:
   - react-native-zano (0.2.4):
     - OpenSSL-Universal
     - React-Core
-  - react-native-zcash (0.9.12):
+  - react-native-zcash (0.9.13):
     - gRPC-Swift (~> 1.8)
     - MnemonicSwift (~> 2.2)
     - React-Core
@@ -3334,10 +3334,10 @@ SPEC CHECKSUMS:
   disklet: 8a20bf8a568635b6e6bb8f93297dac13ee5cef98
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   edge-core-js: 2e9266c5197e8f556058acf4874e5e554985e590
-  edge-currency-accountbased: 23f75ffd6812d07532fb8a34f859d6ad9ff17fcd
-  edge-currency-plugins: 537146b173718c7af437a3f37fdcbfa12ff586b1
-  edge-exchange-plugins: 55fece35d8f261283bdd72295ddc8a687a3152f5
-  edge-login-ui-rn: 309dde378bed51f617aa932844f96f61d023e56a
+  edge-currency-accountbased: d9282bdabfc506695a14a0ccf35d9484f61de10e
+  edge-currency-plugins: bcb24eb550c6bf1b94e03c59405c8967aa4fbb89
+  edge-exchange-plugins: f7cdcd868376a63819884fa45be39173b1e2d919
+  edge-login-ui-rn: cf9f3d8a7d8ae12ff6d436dc393c10732cbfa4fd
   EXConstants: 98bcf0f22b820f9b28f9fee55ff2daededadd2f8
   Expo: 43d9e0c3108cc3a1c2739743e9b51086144ee4b0
   ExpoAsset: ef06e880126c375f580d4923fdd1cdf4ee6ee7d6
@@ -3409,12 +3409,12 @@ SPEC CHECKSUMS:
   react-native-mymonero-core: bf81befad6d782d89a45cd4f83ebb1f1956dc8cb
   react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
   react-native-performance: f0471c84eda0f6625bd42a1f515b1b216f284b12
-  react-native-piratechain: 687c0c02ccc8a6459a054aa1556437781ccf938b
+  react-native-piratechain: f0a13cf2eeb4c201df5e32ffa999d4571eec3063
   react-native-safari-view: 07dc856a2663fef31eaca6beb79b111b8f6cf1f2
   react-native-safe-area-context: 83e0ac3d023997de1c2e035af907cc4dc05f718c
   react-native-webview: 69c118d283fccfbc4fca0cd680e036ff3bf188fa
   react-native-zano: cf72a5dc977df7656eebb113203945cbaf42989f
-  react-native-zcash: 736e5286545fafcfed1136becb46aaefa4f9dc7f
+  react-native-zcash: d1af8beed078af32c292a61b9793b51fbd3d4090
   React-NativeModulesApple: df8e5bc59e78ca3040ffbf41336889f3bd0fad68
   React-oscompat: ef5df1c734f19b8003e149317d041b8ce1f7d29c
   React-perflogger: 9a151e0b4c933c9205fd648c246506a83f31395d

maestro/01-create-account/C999005-create-n-delete-account.yaml

@@ -98,6 +98,7 @@ tags:
 # Delete account
 - tapOn: "Delete Account"
 - inputText: ${MAESTRO_EDGE_UTXO_PASSWORD}
+- hideKeyboard
 - tapOn: "Submit"
 - tapOn: "I understand and agree to the terms"
 - scroll

maestro/03-login/C190284-2fa-01.yaml

@@ -3,6 +3,8 @@
 # Title: Login from Edgy WiFi into an account created with 2FA enabled- Blocked 2FA
 # Expected Result:
 #   1. User is blocked and prevented from being able to login due to 2FA
+#   2. Entering backup code correctly logs in
+#   3. Able to see assets after logging in
 
 appId: ${MAESTRO_APP_ID}
 tags:
@@ -60,9 +62,19 @@ tags:
     text: "SKIP"
     optional: true
 
+# If the request notifications modal show with "Security is Our Priority"
+# Cancel it
+- extendedWaitUntil:
+    visible: "Security is Our Priority"
+    timeout: 20000
+    optional: true
+- tapOn:
+    text: "Cancel"
+    optional: true
+
 # If the survey modal shows, dismiss it
 - extendedWaitUntil:
-    visible: "How Did You Discover"
+    visible: "How Did You Discover Edge?"
     timeout: 20000
     optional: true
 - tapOn:

maestro/12-side-menu/C202842-side-menu-no-crash.yaml

@@ -16,21 +16,8 @@ tags:
     env:
       USERNAME: ${MAESTRO_EDGE_UTXO_USERNAME}
       PASSWORD: ${MAESTRO_EDGE_UTXO_PASSWORD}
-
-# If the request notifications modal show with "Security is Our Priority"
-# Cancel it
-- tapOn:
-    text: "Cancel"
-    optional: true
-
-# If the survey modal shows, dismiss it
-- extendedWaitUntil:
-    visible: "How Did You Discover"
-    timeout: 20000
-    optional: true
-- tapOn:
-    text: "Dismiss"
-    optional: true
+- runFlow:
+    file: ../common/dismiss-modals.yaml
 
 - extendedWaitUntil:
     visible: "Assets"
@@ -82,9 +69,10 @@ tags:
     id: "xCloseButton"
 - tapOn:
     id: "sideMenuButton"
+# Different copy text for Android and iOS - use regex to match "Copy" or "Copy text xx"
 - tapOn: "Share Edge"
-- assertVisible: "Copy"
-- tapOn: "Copy"
+- assertVisible: ${"Copy.*"}
+- tapOn: ${"Copy.*"}
 - tapOn: "Settings"
 - assertVisible: "Settings"
 - assertVisible:

maestro/12-side-menu/C202842a-side-menu-no-crash.yaml

@@ -19,31 +19,8 @@ tags:
     env:
       USERNAME: ${MAESTRO_EDGE_UTXO_USERNAME}
       PASSWORD: ${MAESTRO_EDGE_UTXO_PASSWORD}
-
-# If the request notifications modal show with "Security is Our Priority"
-# Cancel it
-- tapOn:
-    text: "Cancel"
-    optional: true
-
-# If the survey modal shows, dismiss it
-- extendedWaitUntil:
-    visible: "How Did You Discover"
-    timeout: 20000
-    optional: true
-- tapOn:
-    text: "Dismiss"
-    optional: true
-
-# If the enable 2FA notification shows, dismiss it
-- tapOn:
-    id: "notifOtp.close"
-    optional: true
-
-# If the IP validation notification shows, dismiss it
-- tapOn:
-    id: "undefined.close"
-    optional: true
+- runFlow:
+    file: ../common/dismiss-modals.yaml
 
 - extendedWaitUntil:
     visible: "Assets"