fixup! Change title for WalletDetailsScene For the TransactionList, keep the same title so the user knows which wallet the transactions are for.

Author: Jon-edge

src/actions/WalletListMenuActions.tsx

@@ -287,15 +287,9 @@ export function walletListMenuAction(
 
     case 'goToParent': {
       return async (dispatch, getState) => {
-        const state = getState()
-        const { account } = state.core
-        const { currencyWallets } = account
-        const wallet = currencyWallets[walletId]
-
         navigation.navigate('walletDetails', {
           walletId,
-          tokenId: null,
-          walletName: getWalletName(wallet)
+          tokenId: null
         })
       }
     }

src/components/cards/InfoCardCarousel.tsx

@@ -6,6 +6,8 @@ import { getBuildNumber, getVersion } from 'react-native-device-info'
 import shajs from 'sha.js'
 
 import { hideMessageTweak } from '../../actions/AccountReferralActions'
+import { getFirstOpenInfo } from '../../actions/FirstOpenActions'
+import { useAsyncValue } from '../../hooks/useAsyncValue'
 import { useHandler } from '../../hooks/useHandler'
 import { useIsAccountFunded } from '../../hooks/useIsAccountFunded'
 import { useDispatch, useSelector } from '../../types/reactRedux'
@@ -22,16 +24,18 @@ interface Props {
   enterAnim: Anim
   screenWidth: number
   cards?: InfoCard[]
-  countryCode?: string
 }
 
 export const InfoCardCarousel = (props: Props) => {
-  const { enterAnim, countryCode, navigation, screenWidth, cards } = props
+  const { enterAnim, navigation, screenWidth, cards } = props
   const theme = useTheme()
   const dispatch = useDispatch()
 
   const accountReferral = useSelector(state => state.account.accountReferral)
 
+  const [firstOpenInfo] = useAsyncValue(async () => await getFirstOpenInfo())
+  const { countryCode } = firstOpenInfo ?? {}
+
   const [filteredCards, setFilteredCards] = React.useState<FilteredInfoCard[]>([])
 
   // Set account funded status

src/components/scenes/HomeScene.tsx

@@ -147,7 +147,6 @@ export const HomeScene = (props: Props) => {
                 <InfoCardCarousel
                   enterAnim={fadeInUp110}
                   cards={infoServerData.rollup?.promoCards2}
-                  countryCode={countryCode}
                   navigation={navigation as NavigationBase}
                   screenWidth={screenWidth}
                 />

src/components/scenes/TransactionListScene.tsx

@@ -30,9 +30,7 @@ import { TransactionListRow } from '../themed/TransactionListRow'
 
 export interface TransactionListParams {
   walletId: string
-  walletName: string
   tokenId: EdgeTokenId
-  countryCode?: string
   searchText?: string
 }
 

src/components/scenes/WalletDetailsScene.tsx

@@ -46,9 +46,7 @@ import { TransactionListTop } from '../themed/TransactionListTop'
 
 export interface WalletDetailsParams {
   walletId: string
-  walletName: string
   tokenId: EdgeTokenId
-  countryCode?: string
 }
 
 interface Props extends WalletsTabSceneProps<'walletDetails'> {
@@ -284,7 +282,6 @@ function WalletDetailsComponent(props: Props) {
             enterAnim={fadeInDown10}
             cards={(infoServerData.rollup?.assetStatusCards2 ?? {})[`${pluginId}${tokenId == null ? '' : `_${tokenId}`}`]}
             navigation={navigation as NavigationBase}
-            countryCode={route.params.countryCode}
             screenWidth={screenWidth}
           />
           {assetId != null && <SectionHeaderUi4 leftTitle={displayName} rightNode={lstrings.coin_rank_see_more} onRightPress={handlePressCoinRanking} />}
@@ -315,7 +312,7 @@ function WalletDetailsComponent(props: Props) {
             ) : isSearching ? (
               <EdgeText style={styles.noResultsText}>{lstrings.transaction_list_search_no_result}</EdgeText>
             ) : (
-              <BuyCrypto countryCode={route.params.countryCode} navigation={navigation as NavigationBase} wallet={wallet} tokenId={tokenId} />
+              <BuyCrypto navigation={navigation as NavigationBase} wallet={wallet} tokenId={tokenId} />
             )}
           </View>
         </Reanimated.ScrollView>

src/components/themed/BuyCrypto.tsx

@@ -3,7 +3,9 @@ import * as React from 'react'
 import { View } from 'react-native'
 import { sprintf } from 'sprintf-js'
 
+import { getFirstOpenInfo } from '../../actions/FirstOpenActions'
 import { DONE_THRESHOLD, SPECIAL_CURRENCY_INFO } from '../../constants/WalletAndCurrencyConstants'
+import { useAsyncValue } from '../../hooks/useAsyncValue'
 import { useHandler } from '../../hooks/useHandler'
 import { useWatch } from '../../hooks/useWatch'
 import { toPercentString } from '../../locales/intl'
@@ -21,18 +23,20 @@ interface OwnProps {
   wallet: EdgeCurrencyWallet
   tokenId: EdgeTokenId
   navigation: NavigationBase
-  countryCode?: string
 }
 
 type Props = OwnProps
 
 export const BuyCrypto = (props: Props) => {
-  const { countryCode, wallet, tokenId, navigation } = props
+  const { wallet, tokenId, navigation } = props
   const theme = useTheme()
   const styles = getStyles(theme)
 
   const syncRatio = useWatch(wallet, 'syncRatio')
 
+  const [firstOpenInfo] = useAsyncValue(async () => await getFirstOpenInfo())
+  const { countryCode } = firstOpenInfo ?? {}
+
   const handlePress = useHandler(() => {
     navigation.navigate('buyTab', { screen: 'pluginListBuy' })
   })

src/components/themed/WalletListSwipeable.tsx

@@ -4,7 +4,6 @@ import { useMemo } from 'react'
 import { FlatList, RefreshControl } from 'react-native'
 import Animated from 'react-native-reanimated'
 
-import { getFirstOpenInfo } from '../../actions/FirstOpenActions'
 import { selectWalletToken } from '../../actions/WalletActions'
 import { SCROLL_INDICATOR_INSET_FIX } from '../../constants/constantSettings'
 import { useHandler } from '../../hooks/useHandler'
@@ -75,8 +74,6 @@ function WalletListSwipeableComponent(props: Props) {
   )
 
   const handleCreateWallet = useHandler(async (walletId: string, tokenId: EdgeTokenId) => {
-    const wallet = account.currencyWallets[walletId]
-    const { countryCode } = await getFirstOpenInfo()
     dispatch(
       selectWalletToken({
         navigation: navigation as NavigationBase,
@@ -89,9 +86,7 @@ function WalletListSwipeableComponent(props: Props) {
           activationNotRequired &&
           navigation.navigate('walletDetails', {
             walletId,
-            tokenId,
-            walletName: wallet.name ?? wallet.currencyInfo.displayName,
-            countryCode
+            tokenId
           })
       )
       .finally(onReset)

src/components/themed/WalletListSwipeableCurrencyRow.tsx

@@ -4,7 +4,6 @@ import { Text } from 'react-native'
 import { SharedValue } from 'react-native-reanimated'
 
 import { checkAndShowLightBackupModal } from '../../actions/BackupModalActions'
-import { getFirstOpenInfo } from '../../actions/FirstOpenActions'
 import { selectWalletToken } from '../../actions/WalletActions'
 import { Fontello } from '../../assets/vector/index'
 import { useHandler } from '../../hooks/useHandler'
@@ -20,7 +19,6 @@ import { WalletListCurrencyRow } from '../themed/WalletListCurrencyRow'
 
 interface Props {
   navigation: WalletsTabSceneProps<'walletList'>['navigation']
-
   token?: EdgeToken
   tokenId: EdgeTokenId
   wallet: EdgeCurrencyWallet
@@ -84,13 +82,10 @@ function WalletListSwipeableCurrencyRowComponent(props: Props) {
       })
     )
       .then(async activated => {
-        const { countryCode } = await getFirstOpenInfo()
         if (activated) {
           navigation.navigate('walletDetails', {
             tokenId,
-            walletId: wallet.id,
-            walletName: wallet.name ?? wallet.currencyInfo.displayName,
-            countryCode
+            walletId: wallet.id
           })
         }
       })