Merge branch 'staging'

Author: peachbits

CHANGELOG.md

@@ -2,7 +2,14 @@
 
 ## Unreleased (develop)
 
-## 4.46.0 (staging)
+## 4.47.0 (staging)
+
+- added: Include Zano sweep private key support for ZANO and tokens.
+- changed: Move `importKeyOptions` into `CreateWalletImportScene`
+- fixed: Swap KYC terms modal stacking on auto-refresh and accidental dismissal disabling providers
+- removed: Remove `CreateWalletImportOptionsScene`
+
+## 4.46.0 (2026-03-20)
 
 - added: Xgram swap exchange plugin support
 - added: New Banxa payment methods
@@ -11,15 +18,15 @@
 - fixed: Disable "Migrate Wallets" button when no assets are available to migrate
 - fixed: Contacts permission prompt no longer appears on first receive and only shows from transaction-list or payee edit flows
 
-## 4.45.0 (2025-03-10)
+## 4.45.0 (2026-03-10)
 
 - fixed: Fixed Zano token minting transaction detection issues.
 - fixed: Fixed Zano resync data clearing bug.
 - fixed: Improved Nym Mixnet Network Privacy performance.
 - fixed: Promo card carousel touch interception opening wrong card's CTA link.
 - removed: Temporarily disabled Nym mixnet until feature is stable.
 
-## 4.44.0 (2025-02-24)
+## 4.44.0 (2026-02-24)
 
 - added: MAYAChain (CACAO) wallet support
 - added: Monad (MON) wallet support
@@ -45,7 +52,7 @@
 - fixed: Fix incorrect Moonpay buy tracking values caused by deeplink handler overwrite
 - fixed: Search bars automatically accepting autocorrect suggestions
 
-## 4.43.2 (2025-02-15)
+## 4.43.2 (2026-02-15)
 
 - fixed: (Zano) Reject wrapped ETH addresses in address validation.
 

eslint.config.mjs

@@ -239,9 +239,6 @@ export default [
       'src/components/scenes/CreateWalletAccountSelectScene.tsx',
       'src/components/scenes/CreateWalletAccountSetupScene.tsx',
 
-      'src/components/scenes/CreateWalletImportOptionsScene.tsx',
-      'src/components/scenes/CreateWalletImportScene.tsx',
-
       'src/components/scenes/CurrencyNotificationScene.tsx',
       'src/components/scenes/DefaultFiatSettingScene.tsx',
       'src/components/scenes/DuressModeHowToScene.tsx',
@@ -290,8 +287,6 @@ export default [
 
       'src/components/scenes/SwapSettingsScene.tsx',
       'src/components/scenes/SwapSuccessScene.tsx',
-      'src/components/scenes/SweepPrivateKeyCalculateFeeScene.tsx',
-      'src/components/scenes/SweepPrivateKeyCompletionScene.tsx',
 
       'src/components/scenes/TransactionDetailsScene.tsx',
 
@@ -461,8 +456,7 @@ export default [
       'src/plugins/stake-plugins/thorchainSavers/tcSaversPlugin.tsx',
       'src/plugins/stake-plugins/thorchainSavers/tcSaversPluginSegwit.tsx',
       'src/plugins/stake-plugins/uniswapV2/Ecosystem.ts',
-      'src/plugins/stake-plugins/uniswapV2/policies/cemeteryPolicy.ts',
-      'src/plugins/stake-plugins/uniswapV2/policies/masonryPolicy.ts',
+
       'src/plugins/stake-plugins/uniswapV2/policies/VelodromeV2StakePolicy.ts',
       'src/plugins/stake-plugins/util/accumulator.ts',
       'src/plugins/stake-plugins/util/biggystringplus.ts',

ios/Podfile.lock

@@ -15,15 +15,15 @@ PODS:
   - disklet (0.5.2):
     - React
   - DoubleConversion (1.1.6)
-  - edge-core-js (2.43.4):
+  - edge-core-js (2.44.0):
     - React-Core
-  - edge-currency-accountbased (4.77.0):
+  - edge-currency-accountbased (4.78.1):
     - React-Core
   - edge-currency-plugins (3.9.0):
     - React-Core
-  - edge-exchange-plugins (2.43.0):
+  - edge-exchange-plugins (2.44.0):
     - React-Core
-  - edge-login-ui-rn (3.35.3):
+  - edge-login-ui-rn (3.35.4):
     - React-Core
   - EXConstants (17.1.7):
     - ExpoModulesCore
@@ -1663,7 +1663,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-piratechain (0.5.22):
+  - react-native-piratechain (0.5.23):
     - gRPC-Swift (~> 1.8)
     - MnemonicSwift (~> 2.2)
     - React-Core
@@ -1774,7 +1774,7 @@ PODS:
   - react-native-zano (0.2.8):
     - OpenSSL-Universal
     - React-Core
-  - react-native-zcash (0.10.4):
+  - react-native-zcash (0.10.5):
     - gRPC-Swift (~> 1.8)
     - MnemonicSwift (~> 2.2)
     - React-Core
@@ -3335,11 +3335,11 @@ SPEC CHECKSUMS:
   CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
   disklet: 8a20bf8a568635b6e6bb8f93297dac13ee5cef98
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
-  edge-core-js: 4a682c282f0e539e8ce24d5050fc9d8c19379c3d
-  edge-currency-accountbased: da708080381fe41112e120ec1ecd125bc757f773
+  edge-core-js: bf3986a6bb63077e0e25552d741633432eedb67d
+  edge-currency-accountbased: 9b582e3deefc58316eeeb3c4edc5a18f780a3bf4
   edge-currency-plugins: fe38711931eb630b3d33c1624224446690c00d8b
-  edge-exchange-plugins: d0aa0bac5ede747ee276facbd616a29ba1d762e4
-  edge-login-ui-rn: 7e777d276fa6e6f73f5f1fb9c60abd272f85728d
+  edge-exchange-plugins: f22c999ffcef0e448480ae0ee8ff4cca267dc3ce
+  edge-login-ui-rn: 9ff3deacb0045ae32f4b5f7500ddd0e4e7101437
   EXConstants: 98bcf0f22b820f9b28f9fee55ff2daededadd2f8
   Expo: 43d9e0c3108cc3a1c2739743e9b51086144ee4b0
   ExpoAsset: ef06e880126c375f580d4923fdd1cdf4ee6ee7d6
@@ -3410,13 +3410,13 @@ SPEC CHECKSUMS:
   react-native-mymonero-core: 89717c706af7024c9100ccb6c3f22a587ccc8f09
   react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
   react-native-performance: f0471c84eda0f6625bd42a1f515b1b216f284b12
-  react-native-piratechain: 7a589e5935cce38db012200c2d1e454502af7f10
+  react-native-piratechain: 43daeb4279a59c0231d604fb4ab6b0291d910c19
   react-native-render-html: 5afc4751f1a98621b3009432ef84c47019dcb2bd
   react-native-safari-view: 07dc856a2663fef31eaca6beb79b111b8f6cf1f2
   react-native-safe-area-context: 83e0ac3d023997de1c2e035af907cc4dc05f718c
   react-native-webview: 69c118d283fccfbc4fca0cd680e036ff3bf188fa
   react-native-zano: 55542cc969fbe349608b3f877575b9f3ce62c303
-  react-native-zcash: 3d108b151ae84a2425d05353715025ddd0715d9d
+  react-native-zcash: 22c1c518f6c3a141e5a323bc078004dbfc97c883
   React-NativeModulesApple: df8e5bc59e78ca3040ffbf41336889f3bd0fad68
   React-oscompat: ef5df1c734f19b8003e149317d041b8ce1f7d29c
   React-perflogger: 9a151e0b4c933c9205fd648c246506a83f31395d

ios/edge/Info.plist

@@ -179,5 +179,7 @@
 	<array>
 		<string>applinks:edge.app</string>
 	</array>
+	<key>UIDesignRequiresCompatibility</key>
+	<true/>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-react-gui",
-  "version": "4.46.0",
+  "version": "4.47.0",
   "private": true,
   "description": "Edge Wallet React GUI",
   "homepage": "https://edge.app",
@@ -106,13 +106,13 @@
     "deprecated-react-native-prop-types": "^5.0.0",
     "detect-bundler": "^1.1.0",
     "disklet": "^0.5.2",
-    "edge-core-js": "^2.43.4",
-    "edge-currency-accountbased": "^4.77.0",
+    "edge-core-js": "^2.44.0",
+    "edge-currency-accountbased": "^4.78.1",
     "edge-currency-monero": "^2.2.0",
     "edge-currency-plugins": "^3.9.0",
-    "edge-exchange-plugins": "^2.43.0",
+    "edge-exchange-plugins": "^2.44.0",
     "edge-info-server": "^3.10.0",
-    "edge-login-ui-rn": "^3.35.3",
+    "edge-login-ui-rn": "^3.35.4",
     "ethers": "^5.7.2",
     "expo": "^53.0.0",
     "jsrsasign": "^11.1.0",
@@ -154,7 +154,7 @@
     "react-native-patina": "^0.1.6",
     "react-native-performance": "^5.1.4",
     "react-native-permissions": "^4.1.5",
-    "react-native-piratechain": "^0.5.22",
+    "react-native-piratechain": "^0.5.23",
     "react-native-reanimated": "^4.1.3",
     "react-native-render-html": "^6.3.4",
     "react-native-reorderable-list": "^0.5.0",
@@ -172,7 +172,7 @@
     "react-native-wheel-picker-android": "^2.0.6",
     "react-native-worklets": "^0.6.1",
     "react-native-zano": "^0.2.8",
-    "react-native-zcash": "^0.10.4",
+    "react-native-zcash": "^0.10.5",
     "react-redux": "^8.1.1",
     "redux": "^4.2.1",
     "redux-thunk": "^2.3.0",

src/__tests__/scenes/__snapshots__/CreateWalletImportScene.test.tsx.snap

@@ -318,7 +318,9 @@ exports[`CreateWalletImportScene should render with loading props 1`] = `
         }
       />
     </View>
-    <RCTScrollView>
+    <RCTScrollView
+      keyboardShouldPersistTaps="handled"
+    >
       <View>
         <View
           style={
@@ -892,7 +894,7 @@ exports[`CreateWalletImportScene should render with loading props 1`] = `
                 {
                   "busy": undefined,
                   "checked": undefined,
-                  "disabled": false,
+                  "disabled": true,
                   "expanded": undefined,
                   "selected": undefined,
                 }
@@ -907,7 +909,7 @@ exports[`CreateWalletImportScene should render with loading props 1`] = `
               }
               accessible={true}
               collapsable={false}
-              focusable={true}
+              focusable={false}
               hitSlop={
                 {
                   "bottom": 11,
@@ -929,7 +931,7 @@ exports[`CreateWalletImportScene should render with loading props 1`] = `
                   "borderRadius": 34,
                   "height": 67,
                   "justifyContent": "center",
-                  "opacity": 1,
+                  "opacity": 0.3,
                   "overflow": "visible",
                   "paddingHorizontal": 34,
                   "paddingVertical": 0,

src/components/Main.tsx

@@ -66,7 +66,6 @@ import { CreateWalletAccountSelectScene as CreateWalletAccountSelectSceneCompone
 import { CreateWalletAccountSetupScene as CreateWalletAccountSetupSceneComponent } from './scenes/CreateWalletAccountSetupScene'
 import { CreateWalletCompletionScene as CreateWalletCompletionSceneComponent } from './scenes/CreateWalletCompletionScene'
 import { CreateWalletEditNameScene as CreateWalletSelectFiatSceneComponent } from './scenes/CreateWalletEditNameScene'
-import { CreateWalletImportOptionsScene as CreateWalletImportOptionsSceneComponent } from './scenes/CreateWalletImportOptionsScene'
 import { CreateWalletImportScene as CreateWalletImportSceneComponent } from './scenes/CreateWalletImportScene'
 import { CreateWalletSelectCryptoScene as CreateWalletSelectCryptoSceneComponent } from './scenes/CreateWalletSelectCryptoScene'
 import { CurrencyNotificationScene as CurrencyNotificationSceneComponent } from './scenes/CurrencyNotificationScene'
@@ -198,9 +197,6 @@ const CreateWalletAccountSetupScene = ifLoggedIn(
 const CreateWalletCompletionScene = ifLoggedIn(
   CreateWalletCompletionSceneComponent
 )
-const CreateWalletImportOptionsScene = ifLoggedIn(
-  CreateWalletImportOptionsSceneComponent
-)
 const CreateWalletImportScene = ifLoggedIn(CreateWalletImportSceneComponent)
 const CreateWalletSelectCryptoScene = ifLoggedIn(
   CreateWalletSelectCryptoSceneComponent
@@ -764,13 +760,6 @@ const EdgeAppStack: React.FC = () => {
           headerRight: () => null
         }}
       />
-      <AppStack.Screen
-        name="createWalletImportOptions"
-        component={CreateWalletImportOptionsScene}
-        options={{
-          headerRight: () => null
-        }}
-      />
       <AppStack.Screen
         name="createWalletSelectCrypto"
         component={CreateWalletSelectCryptoScene}

src/components/modals/SwapVerifyTermsModal.tsx

@@ -111,9 +111,6 @@ const SwapVerifyTermsModal: React.FC<Props> = props => {
           <ModalTitle>{displayName}</ModalTitle>
         </View>
       }
-      onCancel={() => {
-        bridge.resolve(false)
-      }}
     >
       <Paragraph>{lstrings.swap_terms_statement}</Paragraph>
       <ModalButtons

src/components/scenes/CreateWalletCompletionScene.tsx

@@ -252,23 +252,44 @@ const CreateWalletCompletionComponent: React.FC<Props> = props => {
   })
 
   const handleMigrate = useHandler(() => {
-    // Transform filtered items into the structure expected by the migration component
-    const migrateWalletList: MigrateWalletItem[] = newWalletItems.map(
-      createWallet => {
-        const { key, pluginId } = createWallet
-        const wallet = wallets.find(
-          wallet => wallet.currencyInfo.pluginId === pluginId
-        )
+    // Build migrate items from successfully created parent wallets, then attach
+    // selected tokens for the same plugin to that same wallet id.
+    const successfulNewWalletItems = newWalletItems.filter(
+      item => itemStatus[item.key] === 'complete'
+    )
+    const addedTokenKeys = new Set<string>()
+    const migrateWalletList: MigrateWalletItem[] = []
+
+    for (const createWallet of successfulNewWalletItems) {
+      const { key, pluginId, walletType } = createWallet
+      const wallet = wallets.find(
+        wallet => wallet.currencyInfo.pluginId === pluginId
+      )
+      const createWalletId = wallet?.id ?? ''
+      const displayName = walletNames[key]
+
+      migrateWalletList.push({
+        ...createWallet,
+        createWalletId,
+        displayName,
+        key,
+        type: 'create'
+      })
+
+      for (const tokenItem of newTokenItems) {
+        if (tokenItem.pluginId !== pluginId) continue
+        if (addedTokenKeys.has(tokenItem.key)) continue
+        addedTokenKeys.add(tokenItem.key)
 
-        return {
-          ...createWallet,
-          createWalletId: wallet == null ? '' : wallet.id,
-          displayName: walletNames[key],
-          key,
+        migrateWalletList.push({
+          ...tokenItem,
+          createWalletId,
+          displayName,
+          walletType,
           type: 'create'
-        }
+        })
       }
-    )
+    }
 
     // Navigate to the migration screen with the prepared list
     if (migrateWalletList.length > 0) {