Merge pull request #5371 from EdgeApp/jon/smol-4.19

Jon/smol-4.19
EdgeApp · Nov 26, 2024 · a1a8747 · a1a8747
2 parents 89d5c51 + 4ccc703
commit a1a8747
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,11 @@
 
 ## 4.17.2
 
+- added: "Add Wallet" button to bottom of `WalletListScene`
 - fixed: (Zcash/Pirate) Fixed android build issues
+- fixed: Default home/assets scene post-login based on last visited scene
+- fixed: Receive flip input default currency selection
+- removed: Keyboard autofocus from `WalletListModal`
 
 ## 4.17.1
 

diff --git a/src/__tests__/modals/__snapshots__/WalletListModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/WalletListModal.test.tsx.snap
@@ -353,7 +353,7 @@ exports[`WalletListModal should render with loading props 1`] = `
                   }
                 }
                 accessible={true}
-                autoFocus={true}
+                autoFocus={false}
                 disableAnimation={
                   {
                     "value": 0,

diff --git a/src/__tests__/scenes/__snapshots__/RequestScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/RequestScene.test.tsx.snap
@@ -191,7 +191,7 @@ exports[`Request should render with loaded props 1`] = `
         marginRem={0}
       >
         <Memo
-          forceField="crypto"
+          forceField="fiat"
           headerCallback={[Function]}
           headerText="Receive to My Bitcoin"
           keyboardVisible={false}

diff --git a/src/actions/LoginActions.tsx b/src/actions/LoginActions.tsx
@@ -120,11 +120,12 @@ export function initializeAccount(navigation: NavigationBase, account: EdgeAccou
 
       performance.mark('loginEnd', { detail: { isNewAccount: newAccount } })
     } else {
+      const { defaultScreen } = getDeviceSettings()
       rootNavigation.replace('edgeApp', {
         screen: 'edgeAppStack',
         params: {
           screen: 'edgeTabs',
-          params: { screen: 'home' }
+          params: defaultScreen === 'home' ? { screen: 'home' } : { screen: 'walletsTab', params: { screen: 'walletList' } }
         }
       })
       referralPromise.catch(() => console.log(`Failed to load account referral info`))

diff --git a/src/components/modals/WalletListModal.tsx b/src/components/modals/WalletListModal.tsx
@@ -213,7 +213,6 @@ export function WalletListModal(props: Props) {
           <ModalTitle>{headerTitle}</ModalTitle>
           <SimpleTextInput
             aroundRem={0.5}
-            autoFocus
             returnKeyType="search"
             placeholder={lstrings.search_wallets}
             onChangeText={setSearchText}

diff --git a/src/components/scenes/RequestScene.tsx b/src/components/scenes/RequestScene.tsx
@@ -384,7 +384,7 @@ export class RequestSceneComponent extends React.Component<Props & HookProps, St
           <EdgeAnim enter={fadeInUp25}>
             <EdgeCard marginRem={0}>
               <ExchangedFlipInput2
-                forceField="crypto"
+                forceField="fiat"
                 headerCallback={this.handleOpenWalletListModal}
                 headerText={flipInputHeaderText}
                 inputAccessoryViewID={this.state.isFioMode ? inputAccessoryViewID : undefined}

diff --git a/src/components/scenes/WalletListScene.tsx b/src/components/scenes/WalletListScene.tsx
@@ -86,6 +86,10 @@ export function WalletListScene(props: Props) {
     navigation.navigate('walletRestore')
   })
 
+  const handlePressAddWallets = useHandler(() => {
+    navigation.navigate('createWalletSelectCrypto', {})
+  })
+
   const tokenSupportingWalletIds = React.useMemo(() => {
     const walletIds: string[] = []
     for (const wallet of Object.values(account.currencyWallets)) {
@@ -129,8 +133,13 @@ export function WalletListScene(props: Props) {
     if (isSearching && tokenSupportingWalletIds.length > 0) {
       return <SceneButtons secondary={{ label: lstrings.add_custom_token, onPress: handlePressAddEditToken }} />
     }
-    return <SceneButtons secondary={{ label: lstrings.restore_wallets_modal_title, onPress: handlePressRestoreWallets }} />
-  }, [handlePressAddEditToken, handlePressRestoreWallets, tokenSupportingWalletIds, isSearching])
+    return (
+      <SceneButtons
+        primary={{ label: lstrings.wallet_list_add_wallet, onPress: handlePressAddWallets }}
+        secondary={{ label: lstrings.restore_wallets_modal_title, onPress: handlePressRestoreWallets }}
+      />
+    )
+  }, [isSearching, tokenSupportingWalletIds.length, handlePressAddWallets, handlePressRestoreWallets, handlePressAddEditToken])
 
   const renderFooter: FooterRender = React.useCallback(
     sceneWrapperInfo => {