Merge pull request #5304 from EdgeApp/matthew/no-non-segwit

Remove legacy non-segwit wallets from new account wallet selection scene

CHANGELOG.md

@@ -7,6 +7,7 @@
 - changed: Prevent exchange rate fluctuations from restarting transaction list stream
 - changed: Call `saveTx` after signing or broadcasting transactions from WalletConnect
 - changed: Navigate to wallet list after restoring wallets
+- changed: Remove legacy non-segwit wallets from new account wallet selection scene
 - fixed: Use account default fiat for transaction fee display in `SweepPrivateKeyCalculateFeeScene`
 
 ## 4.15.0

src/actions/LoginActions.tsx

@@ -111,7 +111,7 @@ export function initializeAccount(navigation: NavigationBase, account: EdgeAccou
         screen: 'edgeAppStack',
         params: {
           screen: 'createWalletSelectCryptoNewAccount',
-          params: { newAccountFlow, defaultSelection }
+          params: { newAccountFlow, defaultSelection, disableLegacy: true }
         }
       })
 

src/actions/WalletListMenuActions.tsx

@@ -144,6 +144,7 @@ export function walletListMenuAction(
     case 'split': {
       return async () => {
         navigation.navigate('createWalletSelectCrypto', {
+          disableLegacy: true,
           splitPluginIds,
           splitSourceWalletId: walletId
         })

src/components/scenes/CreateWalletSelectCryptoScene.tsx

@@ -38,6 +38,7 @@ import { WalletListCurrencyRow } from '../themed/WalletListCurrencyRow'
 export interface CreateWalletSelectCryptoParams {
   newAccountFlow?: (navigation: NavigationProp<'createWalletSelectCrypto' | 'createWalletSelectCryptoNewAccount'>, items: WalletCreateItem[]) => Promise<void>
   defaultSelection?: EdgeAsset[]
+  disableLegacy?: boolean
   splitPluginIds?: string[]
   splitSourceWalletId?: string
 }
@@ -46,7 +47,7 @@ interface Props extends EdgeSceneProps<'createWalletSelectCrypto' | 'createWalle
 
 const CreateWalletSelectCryptoComponent = (props: Props) => {
   const { navigation, route } = props
-  const { newAccountFlow, defaultSelection = [], splitPluginIds = [], splitSourceWalletId } = route.params
+  const { newAccountFlow, defaultSelection = [], disableLegacy = false, splitPluginIds = [], splitSourceWalletId } = route.params
 
   const dispatch = useDispatch()
   const theme = useTheme()
@@ -67,7 +68,7 @@ const CreateWalletSelectCryptoComponent = (props: Props) => {
   const [searchTerm, setSearchTerm] = React.useState('')
 
   const allowedAssets = splitPluginIds.length > 0 ? splitPluginIds.map(pluginId => ({ pluginId, tokenId: null })) : undefined
-  const createList = getCreateWalletList(account, { allowedAssets, disableLegacy: splitPluginIds.length > 0 })
+  const createList = getCreateWalletList(account, { allowedAssets, disableLegacy })
 
   const createWalletList = React.useMemo(() => {
     const preselectedList: WalletCreateItem[] = []