diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index 2ee367df8cd8..90f5c05b7c73 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -112,6 +112,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr const isScreenFocused = useIsAccountSettingsRouteActive(shouldUseNarrowLayout); const isWorkspacesTabSelected = focusedRouteName === SCREENS.SETTINGS.WORKSPACES; + const hasActivatedWallet = ([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM] as string[]).includes(userWallet?.tierName ?? ''); const { renderProductTrainingTooltip: renderWorkspaceSettingsTooltip, @@ -181,6 +182,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr screenName: SCREENS.SETTINGS.WALLET.ROOT, brickRoadIndicator: walletBrickRoadIndicator, action: () => Navigation.navigate(ROUTES.SETTINGS_WALLET), + badgeText: hasActivatedWallet ? convertToDisplayString(userWallet?.currentBalance) : undefined, }, { translationKey: 'common.preferences', @@ -198,7 +200,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr }; return defaultMenu; - }, [loginList, privatePersonalDetails, styles.accountSettingsSectionContainer, walletBrickRoadIndicator]); + }, [loginList, privatePersonalDetails, styles.accountSettingsSectionContainer, walletBrickRoadIndicator, hasActivatedWallet, userWallet?.currentBalance]); const navigateToWorkspacesSettings = useCallback(() => { hideWorkspaceSettingsTooltip(); @@ -343,12 +345,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr */ const getMenuItemsSection = useCallback( (menuItemsData: Menu) => { - /** - * @param isPaymentItem whether the item being rendered is the payments menu item - * @returns the user's wallet balance - */ - const getWalletBalance = (isPaymentItem: boolean): string | undefined => (isPaymentItem ? convertToDisplayString(userWallet?.currentBalance) : undefined); - const openPopover = (link: string | (() => Promise) | undefined, event: GestureResponderEvent | MouseEvent) => { if (!Navigation.getActiveRoute().includes(ROUTES.SETTINGS)) { return; @@ -378,7 +374,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr {translate(menuItemsData.sectionTranslationKey)} {menuItemsData.items.map((item) => { const keyTitle = item.translationKey ? translate(item.translationKey) : item.title; - const isPaymentItem = item.translationKey === 'common.wallet'; const isFocused = focusedRouteName ? focusedRouteName === item.screenName : false; return ( @@ -393,7 +388,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr item.action(); })} iconStyles={item.iconStyles} - badgeText={item.badgeText ?? getWalletBalance(isPaymentItem)} + badgeText={item.badgeText} badgeStyle={item.badgeStyle} fallbackIcon={item.fallbackIcon} brickRoadIndicator={item.brickRoadIndicator} @@ -425,18 +420,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr ); }, - [ - styles.pb4, - styles.mh3, - styles.sectionTitle, - styles.sectionMenuItem, - translate, - userWallet?.currentBalance, - focusedRouteName, - isExecuting, - singleExecution, - styles.productTrainingTooltipWrapper, - ], + [styles.pb4, styles.mh3, styles.sectionTitle, styles.sectionMenuItem, translate, focusedRouteName, isExecuting, singleExecution, styles.productTrainingTooltipWrapper], ); const accountMenuItems = useMemo(() => getMenuItemsSection(accountMenuItemsData), [accountMenuItemsData, getMenuItemsSection]); diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx index 56d64413836f..63902af88a83 100644 --- a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx +++ b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx @@ -482,13 +482,14 @@ function WalletPage({shouldListenForResize = false}: WalletPageProps) { titleStyles={styles.accountSettingsSectionTitle} > <> - {shouldShowLoadingSpinner ? ( + {shouldShowLoadingSpinner && ( - ) : ( + )} + {!shouldShowLoadingSpinner && hasActivatedWallet && (