Merge pull request #5982 from EdgeApp/matthew/move-import-options

Move import options into import private key scene

Author: peachbits

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased (develop)
 
+- changed: Move `importKeyOptions` into `CreateWalletImportScene`
+- removed: Remove `CreateWalletImportOptionsScene`
+
 ## 4.46.0 (staging)
 
 - added: Xgram swap exchange plugin support

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',
@@ -461,8 +458,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',

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}