wallet-stack 1.0.0-alpha.133 → 1.0.0-alpha.135

package/src/send/EnterAmount.tsx

@@ -10,7 +10,7 @@ import BackButton from 'src/components/BackButton'
 import { BottomSheetModalRefType } from 'src/components/BottomSheet'
 import Button, { BtnSizes } from 'src/components/Button'
 import FeeInfoBottomSheet from 'src/components/FeeInfoBottomSheet'
-import { FilterChip } from 'src/components/FilterChipsCarousel'
+import { FilterChip, isNetworkChip } from 'src/components/FilterChipsCarousel'
 import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import KeyboardAwareScrollView from 'src/components/KeyboardAwareScrollView'
 import { ReviewDetailsItem } from 'src/components/ReviewTransaction'
@@ -34,6 +34,7 @@ import { Spacing } from 'src/styles/styles'
 import { feeCurrenciesSelector } from 'src/tokens/selectors'
 import { TokenBalance } from 'src/tokens/slice'
 import { PreparedTransactionsResult } from 'src/viem/prepareTransactions'
+import networkConfig from 'src/web3/networkConfig'
 
 export interface ProceedArgs {
   tokenAmount: BigNumber
@@ -113,9 +114,20 @@ export default function EnterAmount({
 }: Props) {
   const { t } = useTranslation()
   const insets = useSafeAreaInsets()
-  const [token, setToken] = useState<TokenBalance>(() => defaultToken ?? tokens[0])
+  const [token, setToken] = useState<TokenBalance | undefined>(() => {
+    if (defaultToken) return defaultToken
+    const activeFilters = filterChips?.filter((chip) => chip.isSelected) ?? []
+    const selectableTokens = tokens.filter((t) =>
+      activeFilters.every((filter) =>
+        isNetworkChip(filter) ? filter.filterFn(t, filter.selectedNetworkIds) : filter.filterFn(t)
+      )
+    )
+    return selectableTokens[0]
+  })
   const [selectedPercentage, setSelectedPercentage] = useState<number | null>(null)
-  const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, token.networkId))
+  const feeCurrencies = useSelector((state) =>
+    feeCurrenciesSelector(state, token?.networkId ?? networkConfig.defaultNetworkId)
+  )
   const networkFee = useNetworkFee(prepareTransactionsResult)
   const localCurrencySymbol = useSelector(getLocalCurrencySymbol) ?? LocalCurrencySymbol.USD
 
@@ -142,6 +154,8 @@ export default function EnterAmount({
   useEffect(() => {
     onClearPreparedTransactions()
 
+    if (!token) return
+
     const canRefresh =
       processedAmounts.token.bignum &&
       processedAmounts.token.bignum.gt(0) &&
@@ -158,9 +172,9 @@ export default function EnterAmount({
   const onOpenTokenPicker = () => {
     tokenBottomSheetRef.current?.snapToIndex(0)
     AppAnalytics.track(SendEvents.token_dropdown_opened, {
-      currentTokenId: token.tokenId,
-      currentTokenAddress: token.address,
-      currentNetworkId: token.networkId,
+      currentTokenId: token?.tokenId ?? '',
+      currentTokenAddress: token?.address ?? null,
+      currentNetworkId: token?.networkId ?? null,
     })
   }
 
@@ -174,6 +188,7 @@ export default function EnterAmount({
   }
 
   const onSelectPercentageAmount = (percentage: number) => {
+    if (!token) return
     handleSelectPercentageAmount(percentage)
     setSelectedPercentage(percentage)
 
@@ -187,6 +202,7 @@ export default function EnterAmount({
   }
 
   const showLowerAmountError =
+    token &&
     processedAmounts.token.bignum &&
     !processedAmounts.token.bignum.lte(token.balance) &&
     !disableBalanceCheck
@@ -205,6 +221,7 @@ export default function EnterAmount({
     prepareTransactionsResult.transactions.length > 0
 
   const disabled =
+    !token ||
     disableProceed ||
     (disableBalanceCheck ? !!processedAmounts.token.bignum?.isZero() : !transactionIsPossible)
 
@@ -236,89 +253,95 @@ export default function EnterAmount({
             onOpenTokenPicker={tokenSelectionDisabled ? undefined : onOpenTokenPicker}
           />
 
-          {prepareTransactionsResult?.type !== 'not-enough-balance-for-gas' && !!networkFee && (
-            <View style={styles.feeContainer}>
-              <ReviewDetailsItem
-                approx
-                testID="SendEnterAmount/NetworkFee"
-                type="token-amount"
-                label={t('networkFee')}
-                tokenAmount={networkFee.amount}
-                localAmount={networkFee.localAmount}
-                tokenInfo={networkFee.token}
-                localCurrencySymbol={localCurrencySymbol}
-                onInfoPress={() => feeInfoBottomSheetRef.current?.snapToIndex(0)}
-              />
+          {token &&
+            prepareTransactionsResult?.type !== 'not-enough-balance-for-gas' &&
+            !!networkFee && (
+              <View style={styles.feeContainer}>
+                <ReviewDetailsItem
+                  approx
+                  testID="SendEnterAmount/NetworkFee"
+                  type="token-amount"
+                  label={t('networkFee')}
+                  tokenAmount={networkFee.amount}
+                  localAmount={networkFee.localAmount}
+                  tokenInfo={networkFee.token}
+                  localCurrencySymbol={localCurrencySymbol}
+                  onInfoPress={() => feeInfoBottomSheetRef.current?.snapToIndex(0)}
+                />
 
-              <FeeInfoBottomSheet forwardedRef={feeInfoBottomSheetRef} networkFee={networkFee} />
-            </View>
-          )}
+                <FeeInfoBottomSheet forwardedRef={feeInfoBottomSheetRef} networkFee={networkFee} />
+              </View>
+            )}
         </View>
 
-        {showLowerAmountError && (
-          <InLineNotification
-            variant={NotificationVariant.Warning}
-            title={t('sendEnterAmountScreen.insufficientBalanceWarning.title', {
-              tokenSymbol: token.symbol,
-            })}
-            description={t('sendEnterAmountScreen.insufficientBalanceWarning.description', {
-              tokenSymbol: token.symbol,
-            })}
-            style={styles.warning}
-            testID="SendEnterAmount/NotEnoughBalanceWarning"
-          />
-        )}
-        {showMaxAmountWarning && (
-          <InLineNotification
-            variant={NotificationVariant.Warning}
-            title={t('sendEnterAmountScreen.maxAmountWarning.title')}
-            description={t('sendEnterAmountScreen.maxAmountWarning.description', {
-              feeTokenSymbol: prepareTransactionsResult.feeCurrency.symbol,
-            })}
-            style={styles.warning}
-            testID="SendEnterAmount/MaxAmountWarning"
-          />
-        )}
-        {showNotEnoughBalanceForGasWarning && (
-          <InLineNotification
-            variant={NotificationVariant.Warning}
-            title={t('sendEnterAmountScreen.notEnoughBalanceForGasWarning.title', {
-              feeTokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
-            })}
-            description={t('sendEnterAmountScreen.notEnoughBalanceForGasWarning.description', {
-              feeTokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
-            })}
-            style={styles.warning}
-            testID="SendEnterAmount/NotEnoughForGasWarning"
-          />
-        )}
-        {prepareTransactionError && (
-          <InLineNotification
-            variant={NotificationVariant.Error}
-            title={t('sendEnterAmountScreen.prepareTransactionError.title')}
-            description={t('sendEnterAmountScreen.prepareTransactionError.description')}
-            style={styles.warning}
-            testID="SendEnterAmount/PrepareTransactionError"
-          />
-        )}
+        {token && (
+          <>
+            {showLowerAmountError && (
+              <InLineNotification
+                variant={NotificationVariant.Warning}
+                title={t('sendEnterAmountScreen.insufficientBalanceWarning.title', {
+                  tokenSymbol: token.symbol,
+                })}
+                description={t('sendEnterAmountScreen.insufficientBalanceWarning.description', {
+                  tokenSymbol: token.symbol,
+                })}
+                style={styles.warning}
+                testID="SendEnterAmount/NotEnoughBalanceWarning"
+              />
+            )}
+            {showMaxAmountWarning && (
+              <InLineNotification
+                variant={NotificationVariant.Warning}
+                title={t('sendEnterAmountScreen.maxAmountWarning.title')}
+                description={t('sendEnterAmountScreen.maxAmountWarning.description', {
+                  feeTokenSymbol: prepareTransactionsResult.feeCurrency.symbol,
+                })}
+                style={styles.warning}
+                testID="SendEnterAmount/MaxAmountWarning"
+              />
+            )}
+            {showNotEnoughBalanceForGasWarning && (
+              <InLineNotification
+                variant={NotificationVariant.Warning}
+                title={t('sendEnterAmountScreen.notEnoughBalanceForGasWarning.title', {
+                  feeTokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
+                })}
+                description={t('sendEnterAmountScreen.notEnoughBalanceForGasWarning.description', {
+                  feeTokenSymbol: prepareTransactionsResult.feeCurrencies[0].symbol,
+                })}
+                style={styles.warning}
+                testID="SendEnterAmount/NotEnoughForGasWarning"
+              />
+            )}
+            {prepareTransactionError && (
+              <InLineNotification
+                variant={NotificationVariant.Error}
+                title={t('sendEnterAmountScreen.prepareTransactionError.title')}
+                description={t('sendEnterAmountScreen.prepareTransactionError.description')}
+                style={styles.warning}
+                testID="SendEnterAmount/PrepareTransactionError"
+              />
+            )}
 
-        {children}
+            {children}
 
-        <EnterAmountOptions
-          onPressAmount={onSelectPercentageAmount}
-          selectedAmount={selectedPercentage}
-          testID="SendEnterAmount/AmountOptions"
-        />
+            <EnterAmountOptions
+              onPressAmount={onSelectPercentageAmount}
+              selectedAmount={selectedPercentage}
+              testID="SendEnterAmount/AmountOptions"
+            />
 
-        <ProceedComponent
-          tokenAmount={processedAmounts.token.bignum}
-          localAmount={processedAmounts.local.bignum}
-          token={token}
-          amountEnteredIn={amountType}
-          onPressProceed={onPressProceed}
-          disabled={disabled}
-          showLoading={prepareTransactionsLoading}
-        />
+            <ProceedComponent
+              tokenAmount={processedAmounts.token.bignum}
+              localAmount={processedAmounts.local.bignum}
+              token={token}
+              amountEnteredIn={amountType}
+              onPressProceed={onPressProceed}
+              disabled={disabled}
+              showLoading={prepareTransactionsLoading}
+            />
+          </>
+        )}
       </KeyboardAwareScrollView>
       <TokenBottomSheet
         forwardedRef={tokenBottomSheetRef}

package/src/send/SelectRecipientAddress.tsx

@@ -9,13 +9,14 @@ import { SendEvents } from 'src/analytics/Events'
 import BackButton from 'src/components/BackButton'
 import Touchable from 'src/components/Touchable'
 import CustomHeader from 'src/components/header/CustomHeader'
+import VerifiedBadge from 'src/icons/VerifiedBadge'
 import { addressToVerifiedBySelector, e164NumberToAddressSelector } from 'src/identity/selectors'
-import { miniPay, valora } from 'src/images/Images'
 import { noHeader } from 'src/navigator/Headers'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
 import { getDisplayName } from 'src/recipients/recipient'
+import { VERIFIERS, Verifier, isKnownVerifier } from 'src/recipients/verifier'
 import { useSelector } from 'src/redux/hooks'
 import Colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
@@ -23,19 +24,8 @@ import { Spacing } from 'src/styles/styles'
 
 type Props = NativeStackScreenProps<StackParamList, Screens.SelectRecipientAddress>
 
-const VERIFIERS = {
-  valora: { name: 'Valora', icon: valora },
-  minipay: { name: 'MiniPay', icon: miniPay },
-} as const
-
-export type Verifier = keyof typeof VERIFIERS
-
 const ICON_SIZE = 40
 
-function isKnownVerifier(verifier: string | undefined): verifier is Verifier {
-  return !!verifier && Object.hasOwn(VERIFIERS, verifier)
-}
-
 function VerifierIcon({ verifier }: { verifier: Verifier }) {
   return <Image source={VERIFIERS[verifier].icon} style={styles.icon} resizeMode="contain" />
 }
@@ -103,7 +93,10 @@ function SelectRecipientAddress({ route }: Props) {
               <VerifierIcon verifier={verifier} />
               <View style={styles.rowContent}>
                 <Text style={styles.address}>{formatShortenedAddress(address)}</Text>
-                <Text style={styles.verifier}>{VERIFIERS[verifier].name}</Text>
+                <View style={styles.verifier}>
+                  <VerifiedBadge color={Colors.contentSecondary} />
+                  <Text style={styles.verifierName}>{VERIFIERS[verifier].name}</Text>
+                </View>
               </View>
             </View>
           </Touchable>
@@ -156,6 +149,11 @@ const styles = StyleSheet.create({
     ...typeScale.labelMedium,
   },
   verifier: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: Spacing.Tiny4,
+  },
+  verifierName: {
     ...typeScale.bodySmall,
     color: Colors.contentSecondary,
   },

package/src/send/SendConfirmation.test.tsx

@@ -174,7 +174,7 @@ describe('SendConfirmation', () => {
   it('shows the unknown address warning when the recipient address is not a known app user', () => {
     const { getByTestId } = renderScreen(mockSendConfirmationProps, {
       identity: {
-        addressToVerificationStatus: { [mockAccount]: false },
+        addressToVerifiedBy: { [mockAccount]: null },
       },
     })
 
@@ -184,7 +184,7 @@ describe('SendConfirmation', () => {
   it('does not show the unknown address warning when the recipient address is verified', () => {
     const { queryByTestId } = renderScreen(mockSendConfirmationProps, {
       identity: {
-        addressToVerificationStatus: { [mockAccount]: true },
+        addressToVerifiedBy: { [mockAccount]: 'valora' },
       },
     })
 
@@ -193,7 +193,7 @@ describe('SendConfirmation', () => {
 
   it('does not show the unknown address warning when the address has not been looked up yet', () => {
     const { queryByTestId } = renderScreen(mockSendConfirmationProps, {
-      identity: { addressToVerificationStatus: {} },
+      identity: { addressToVerifiedBy: {} },
     })
 
     expect(queryByTestId('UnknownAddressInfo')).toBeNull()

package/src/send/SendConfirmation.tsx

@@ -24,7 +24,7 @@ import {
 } from 'src/components/ReviewTransaction'
 import { formatValueToDisplay } from 'src/components/TokenDisplay'
 import TokenIcon from 'src/components/TokenIcon'
-import { addressToVerificationStatusSelector } from 'src/identity/selectors'
+import { addressToVerifiedBySelector } from 'src/identity/selectors'
 import { LocalCurrencySymbol } from 'src/localCurrency/consts'
 import { getLocalCurrencyCode, getLocalCurrencySymbol } from 'src/localCurrency/selectors'
 import { noHeader } from 'src/navigator/Headers'
@@ -91,11 +91,11 @@ export default function SendConfirmation({ route: { params } }: Props) {
   const localAmount = useTokenToLocalAmount(tokenAmount, tokenId)
   const usdAmount = useAmountAsUsd(tokenAmount, tokenId)
   const walletAddress = useSelector(walletAddressSelector)
-  const addressToVerificationStatus = useSelector(addressToVerificationStatusSelector)
+  const addressToVerifiedBy = useSelector(addressToVerifiedBySelector)
   const showUnknownAddressInfo =
     recipient.recipientType === RecipientType.Address &&
     !!recipient.address &&
-    addressToVerificationStatus[recipient.address] === false
+    addressToVerifiedBy[recipient.address] === null
 
   const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, tokenInfo!.networkId))
   const {

package/src/send/SendEnterAmount.test.tsx

@@ -308,6 +308,33 @@ describe('SendEnterAmount', () => {
       expect(queryByText('sendEnterAmountScreen.miniPayFilterChip')).toBeFalsy()
     })
 
+    it('should not select a default token when isMiniPayRecipient is true and user has no MiniPay tokens', () => {
+      jest.mocked(getDynamicConfigParams).mockReturnValue({
+        miniPayTokenIds: ['celo-alfajores:0xNOT_HELD_BY_USER'],
+      })
+
+      const { getByText, queryByTestId, getByTestId } = render(
+        <Provider store={store}>
+          <MockedNavigator
+            component={SendEnterAmount}
+            params={{ ...params, isMiniPayRecipient: true }}
+          />
+        </Provider>
+      )
+
+      // "Select token" placeholder is rendered in place of the selected token
+      expect(getByText('tokenEnterAmount.selectToken')).toBeTruthy()
+      // Amount input, percentage options, and Review button are not rendered
+      expect(queryByTestId('SendEnterAmount/TokenAmountInput')).toBeNull()
+      expect(queryByTestId('SendEnterAmount/AmountOptions')).toBeNull()
+      expect(queryByTestId('SendEnterAmount/ReviewButton')).toBeNull()
+      // MiniPay filter chip is still present (inside the token picker)
+      expect(getByText('sendEnterAmountScreen.miniPayFilterChip')).toBeTruthy()
+      // Tapping the token row opens the picker
+      fireEvent.press(getByTestId('SendEnterAmount/TokenSelect'))
+      expect(getByTestId('TokenBottomSheet')).toBeTruthy()
+    })
+
     it('should include isMiniPayRecipient in send_amount_continue analytics', async () => {
       jest.mocked(usePrepareSendTransactions).mockReturnValue({
         prepareTransactionsResult: mockPrepareTransactionsResultPossible,

package/src/send/SendSelectRecipient.test.tsx

@@ -7,10 +7,9 @@ import { SendEvents } from 'src/analytics/Events'
 import { SendOrigin } from 'src/analytics/types'
 import { getAppConfig } from 'src/appConfig'
 import { fetchAddressVerification, fetchAddressesAndValidate } from 'src/identity/actions'
-import { RecipientVerificationStatus } from 'src/identity/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
-import { RecipientType, getRecipientVerificationStatus } from 'src/recipients/recipient'
+import { RecipientType } from 'src/recipients/recipient'
 import SendSelectRecipient from 'src/send/SendSelectRecipient'
 import { getDynamicConfigParams } from 'src/statsig'
 import { StatsigDynamicConfigs } from 'src/statsig/types'
@@ -31,10 +30,6 @@ import {
 jest.mock('@react-native-clipboard/clipboard')
 jest.mock('src/utils/IosVersionUtils')
 jest.mock('src/recipients/resolve-id')
-jest.mock('src/recipients/recipient', () => ({
-  ...(jest.requireActual('src/recipients/recipient') as any),
-  getRecipientVerificationStatus: jest.fn(),
-}))
 
 jest.mock('react-native-device-info', () => ({ getFontScaleSync: () => 1 }))
 jest.mock('src/statsig')
@@ -203,11 +198,13 @@ describe('SendSelectRecipient', () => {
     expect(getByTestId('SelectRecipient/NoResults')).toBeTruthy()
   })
   it('navigates to send amount when a verified phone recipient is tapped in search results', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.VERIFIED)
-
-    const store = createMockStore(storeWithPhoneVerified)
+    const store = createMockStore({
+      ...storeWithPhoneVerified,
+      identity: {
+        e164NumberToAddress: { [mockE164Number2Invite]: [mockAccount3] },
+        addressToVerifiedBy: { [mockAccount3]: 'valora' },
+      },
+    })
 
     const { getByTestId } = render(
       <Provider store={store}>
@@ -237,7 +234,12 @@ describe('SendSelectRecipient', () => {
     })
   })
   it('navigates to send amount when an address is tapped and the user phone number is not verified', async () => {
-    const store = createMockStore(defaultStore)
+    const store = createMockStore({
+      ...defaultStore,
+      identity: {
+        addressToVerifiedBy: { [mockAddressRecipient.address.toLowerCase()]: 'valora' },
+      },
+    })
 
     const { getByTestId } = render(
       <Provider store={store}>
@@ -267,11 +269,12 @@ describe('SendSelectRecipient', () => {
   })
 
   it('dispatches address verification when an address is tapped and the user phone number is verified', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.VERIFIED)
-
-    const store = createMockStore(storeWithPhoneVerified)
+    const store = createMockStore({
+      ...storeWithPhoneVerified,
+      identity: {
+        addressToVerifiedBy: { [mockAccount2.toLowerCase()]: 'valora' },
+      },
+    })
 
     const { getByTestId } = render(
       <Provider store={store}>
@@ -299,11 +302,12 @@ describe('SendSelectRecipient', () => {
     expect(store.getActions()).toEqual([fetchAddressVerification(mockAccount2.toLowerCase())])
   })
   it('does not navigate when an unverified phone recipient is tapped and no share URL is configured', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.UNVERIFIED)
-
-    const store = createMockStore(storeWithPhoneVerified)
+    const store = createMockStore({
+      ...storeWithPhoneVerified,
+      identity: {
+        e164NumberToAddress: { [mockE164Number2Invite]: null },
+      },
+    })
 
     const { getByTestId } = render(
       <Provider store={store}>
@@ -340,11 +344,13 @@ describe('SendSelectRecipient', () => {
         inviteFriends: { shareUrl },
       },
     })
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.UNVERIFIED)
 
-    const store = createMockStore(storeWithPhoneVerified)
+    const store = createMockStore({
+      ...storeWithPhoneVerified,
+      identity: {
+        e164NumberToAddress: { [mockE164Number2Invite]: null },
+      },
+    })
 
     const { getByTestId } = render(
       <Provider store={store}>
@@ -373,11 +379,11 @@ describe('SendSelectRecipient', () => {
   })
 
   it('navigates and dispatches address verification when an unknown address is tapped and the user phone number is verified', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.UNVERIFIED)
-
-    const store = createMockStore(storeWithPhoneVerified)
+    // addressToVerifiedBy entry is `null` → checked and not verified
+    const store = createMockStore({
+      ...storeWithPhoneVerified,
+      identity: { addressToVerifiedBy: { [mockAccount2.toLowerCase()]: null } },
+    })
 
     const { getByTestId } = render(
       <Provider store={store}>
@@ -468,10 +474,6 @@ describe('SendSelectRecipient', () => {
   })
 
   it('navigates to send amount when a verified phone recipient with a single address is tapped', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.VERIFIED)
-
     const store = createMockStore({
       ...storeWithPhoneVerified,
       identity: {
@@ -511,10 +513,6 @@ describe('SendSelectRecipient', () => {
     })
   })
   it('navigates with isMiniPayRecipient when address is verified by minipay', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.VERIFIED)
-
     const store = createMockStore({
       ...storeWithPhoneVerified,
       identity: {
@@ -552,10 +550,6 @@ describe('SendSelectRecipient', () => {
     })
   })
   it('navigates to address picker when phone number recipient has multiple verified addresses', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.VERIFIED)
-
     const store = createMockStore({
       ...storeWithPhoneVerified,
       identity: {
@@ -598,10 +592,6 @@ describe('SendSelectRecipient', () => {
     })
   })
   it('navigates to send enter amount when phone number has multiple raw addresses but only one with a verifier', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.VERIFIED)
-
     const store = createMockStore({
       ...storeWithPhoneVerified,
       identity: {
@@ -652,10 +642,6 @@ describe('SendSelectRecipient', () => {
   it.each([{ searchAddress: mockAccount2 }, { searchAddress: mockAccount3 }])(
     'navigates to send enter amount with correct address if an address is entered which also maps to a phone number with multiple addresses',
     async ({ searchAddress }) => {
-      jest
-        .mocked(getRecipientVerificationStatus)
-        .mockReturnValue(RecipientVerificationStatus.VERIFIED)
-
       const store = createMockStore({
         ...storeWithPhoneVerified,
         identity: {

package/src/send/useFetchRecipientVerificationStatus.ts

@@ -1,10 +1,7 @@
 import { useEffect, useState } from 'react'
 import { phoneNumberVerifiedSelector } from 'src/app/selectors'
 import { fetchAddressVerification, fetchAddressesAndValidate } from 'src/identity/actions'
-import {
-  addressToVerificationStatusSelector,
-  e164NumberToAddressSelector,
-} from 'src/identity/selectors'
+import { addressToVerifiedBySelector, e164NumberToAddressSelector } from 'src/identity/selectors'
 import { RecipientVerificationStatus } from 'src/identity/types'
 import { Recipient, RecipientType, getRecipientVerificationStatus } from 'src/recipients/recipient'
 import { useDispatch, useSelector } from 'src/redux/hooks'
@@ -16,7 +13,7 @@ const useFetchRecipientVerificationStatus = () => {
   )
 
   const e164NumberToAddress = useSelector(e164NumberToAddressSelector)
-  const addressToVerificationStatus = useSelector(addressToVerificationStatusSelector)
+  const addressToVerifiedBy = useSelector(addressToVerifiedBySelector)
   const phoneNumberVerified = useSelector(phoneNumberVerifiedSelector)
   const dispatch = useDispatch()
 
@@ -36,9 +33,7 @@ const useFetchRecipientVerificationStatus = () => {
     ) {
       dispatch(fetchAddressesAndValidate(selectedRecipient.e164PhoneNumber))
     } else if (selectedRecipient?.address) {
-      if (addressToVerificationStatus[selectedRecipient.address]) {
-        setRecipientVerificationStatus(RecipientVerificationStatus.VERIFIED)
-      } else if (phoneNumberVerified) {
+      if (phoneNumberVerified) {
         dispatch(fetchAddressVerification(selectedRecipient.address))
       } else {
         setRecipientVerificationStatus(RecipientVerificationStatus.UNVERIFIED)
@@ -49,12 +44,12 @@ const useFetchRecipientVerificationStatus = () => {
   useEffect(() => {
     if (recipient && recipientVerificationStatus === RecipientVerificationStatus.UNKNOWN) {
       // e164NumberToAddress is updated after a successful phone number lookup,
-      // addressToVerificationStatus is updated after a successful address lookup
+      // addressToVerifiedBy is updated after a successful address lookup
       setRecipientVerificationStatus(
-        getRecipientVerificationStatus(recipient, e164NumberToAddress, addressToVerificationStatus)
+        getRecipientVerificationStatus(recipient, e164NumberToAddress, addressToVerifiedBy)
       )
     }
-  }, [e164NumberToAddress, addressToVerificationStatus, recipient, recipientVerificationStatus])
+  }, [e164NumberToAddress, addressToVerifiedBy, recipient, recipientVerificationStatus])
 
   return {
     recipient,