Merge pull request #4429 from EdgeApp/jon/hbar-activation-ui2

- changed: Retheme CreateWalletAccountSelectScene
EdgeApp · Sep 4, 2023 · a6bbd8f · a6bbd8f
2 parents e52d3a6 + a6fe8bb
commit a6bbd8f
Show file tree

Hide file tree

Showing 7 changed files with 160 additions and 381 deletions.
diff --git a/src/__tests__/scenes/CreateWalletAccountSetupScene.test.tsx b/src/__tests__/scenes/CreateWalletAccountSetupScene.test.tsx
@@ -18,10 +18,6 @@ describe('CreateWalletAccountSelect', () => {
               walletType: 'wallet:bitcoin',
               currencyCode: 'BTC'
             } as any,
-            selectedFiat: {
-              label: 'USD',
-              value: 'USD'
-            },
             isReactivation: true,
             existingWalletId: 'myWallet'
           })}

diff --git a/src/actions/WalletActions.tsx b/src/actions/WalletActions.tsx
@@ -18,7 +18,6 @@ import { MapObject } from '../types/types'
 import { getCurrencyCode, getCurrencyInfos, getToken, makeCreateWalletType } from '../util/CurrencyInfoHelpers'
 import { getWalletName } from '../util/CurrencyWalletHelpers'
 import { fetchInfo } from '../util/network'
-import { getSupportedFiats } from '../util/utils'
 import { refreshConnectedWallets } from './FioActions'
 
 export interface SelectWalletTokenParams {
@@ -93,7 +92,6 @@ function selectEOSWallet(navigation: NavigationBase, walletId: string, currencyC
     const state = getState()
     const wallet = state.core.account.currencyWallets[walletId]
     const {
-      fiatCurrencyCode,
       name,
       currencyInfo: { currencyCode, pluginId }
     } = wallet
@@ -113,17 +111,13 @@ function selectEOSWallet(navigation: NavigationBase, walletId: string, currencyC
       await dispatch(updateWalletsRequest())
       // not activated yet
       // find fiat and crypto (EOSIO) types and populate scene props
-      const supportedFiats = getSupportedFiats()
-      const fiatTypeIndex = supportedFiats.findIndex(fiatType => fiatType.value === fiatCurrencyCode.replace('iso:', ''))
-      const selectedFiat = supportedFiats[fiatTypeIndex]
       const currencyInfos = getCurrencyInfos(state.core.account)
       const currencyInfo = currencyInfos.find(info => info.currencyCode === currencyCode)
       if (!currencyInfo) throw new Error('CannotFindCurrencyInfo')
       const selectedWalletType = makeCreateWalletType(currencyInfo)
       const specialCurrencyInfo = getSpecialCurrencyInfo(pluginId)
       if (specialCurrencyInfo.skipAccountNameValidation) {
         navigation.push('createWalletAccountSelect', {
-          selectedFiat: selectedFiat,
           selectedWalletType,
           accountName: walletName,
           existingWalletId: walletId
@@ -132,7 +126,6 @@ function selectEOSWallet(navigation: NavigationBase, walletId: string, currencyC
         const createWalletAccountSetupSceneProps = {
           accountHandle: '',
           selectedWalletType,
-          selectedFiat,
           isReactivation: true,
           existingWalletId: walletId
         }