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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wallet-stack",
-  "version": "1.0.0-alpha.133",
+  "version": "1.0.0-alpha.134",
   "author": "Valora Inc",
   "license": "Apache-2.0",
   "repository": {

package/src/analytics/Properties.tsx

@@ -71,7 +71,7 @@ import { NftOrigin } from 'src/nfts/types'
 import { NotificationReceiveState } from 'src/notifications/types'
 import { PointsActivityId } from 'src/points/types'
 import { RecipientType } from 'src/recipients/recipient'
-import { Verifier } from 'src/send/SelectRecipientAddress'
+import { Verifier } from 'src/recipients/verifier'
 import { AmountEnteredIn, QrCode } from 'src/send/types'
 import { Field, SwapType } from 'src/swap/types'
 import { TokenActionName } from 'src/tokens/types'

package/src/components/ReviewTransaction.test.tsx

@@ -76,18 +76,27 @@ describe('ReviewSummaryItem', () => {
 })
 
 describe('ReviewSummaryItemContact', () => {
-  it('displays name + phone if recipient has a name and phone number', () => {
+  const renderContact = (recipient: Recipient, storeOverrides: Record<string, unknown> = {}) =>
+    render(
+      <Provider store={createMockStore(storeOverrides)}>
+        <ReviewSummaryItemContact recipient={recipient} testID="ContactItem" />
+      </Provider>
+    )
+
+  it('shows name as primary value and resolved short address as subtitle for phone recipients', () => {
     const recipient = {
       name: 'John Doe',
       displayNumber: '+111111111',
       e164PhoneNumber: '+222222222',
+      address: '0x0123456789012345678901234567890123456789',
     } as Recipient
-    const tree = render(<ReviewSummaryItemContact recipient={recipient} testID="ContactItem" />)
+    const tree = renderContact(recipient)
 
     expect(tree.getByTestId('ContactItem/PrimaryValue')).toHaveTextContent('John Doe', {
       exact: false,
     })
-    expect(tree.getByTestId('ContactItem/SecondaryValue')).toHaveTextContent('+111111111', {
+    // Phone recipients always surface the on-chain destination on the review screen.
+    expect(tree.getByTestId('ContactItem/SecondaryValue')).toHaveTextContent('0x0123...6789', {
       exact: false,
     })
   })
@@ -109,14 +118,17 @@ describe('ReviewSummaryItemContact', () => {
   ])(
     'displays only $phoneNumberType phone if name is not available',
     ({ displayNumber, e164PhoneNumber, expectedDisplayedValue }) => {
-      const recipient = { displayNumber, e164PhoneNumber } as Recipient
-      const tree = render(<ReviewSummaryItemContact recipient={recipient} testID="ContactItem" />)
+      const address = '0x0123456789012345678901234567890123456789'
+      const recipient = { displayNumber, e164PhoneNumber, address } as Recipient
+      const tree = renderContact(recipient)
 
       expect(tree.getByTestId('ContactItem/PrimaryValue')).toHaveTextContent(
         expectedDisplayedValue,
         { exact: false }
       )
-      expect(tree.queryByTestId('ContactItem/SecondaryValue')).toBeNull()
+      expect(tree.getByTestId('ContactItem/SecondaryValue')).toHaveTextContent('0x0123...6789', {
+        exact: false,
+      })
     }
   )
 
@@ -124,16 +136,45 @@ describe('ReviewSummaryItemContact', () => {
     const recipient = {
       address: '0x123456789',
     } as Recipient
-    const tree = render(<ReviewSummaryItemContact recipient={recipient} testID="ContactItem" />)
+    const tree = renderContact(recipient)
 
     expect(tree.getByTestId('ContactItem/PrimaryValue')).toHaveTextContent('0x123456789', {
       exact: false,
     })
   })
 
+  it('inlines the verifier with the short address for phone recipients', () => {
+    const address = '0x0123456789012345678901234567890123456789'
+    const recipient = {
+      name: 'John Doe',
+      displayNumber: '+111111111',
+      e164PhoneNumber: '+222222222',
+      address,
+    } as Recipient
+    const tree = renderContact(recipient, {
+      identity: { addressToVerifiedBy: { [address]: 'valora' } },
+    })
+
+    const subtitle = tree.getByTestId('ContactItem/SecondaryValue')
+    expect(subtitle).toHaveTextContent('0x0123...6789', { exact: false })
+    expect(subtitle).toHaveTextContent('Valora', { exact: false })
+  })
+
+  it('inlines just the verifier for address-only recipients with a known verifier', () => {
+    const address = '0x0123456789012345678901234567890123456789'
+    const recipient = { address } as Recipient
+    const tree = renderContact(recipient, {
+      identity: { addressToVerifiedBy: { [address]: 'minipay' } },
+    })
+
+    const subtitle = tree.getByTestId('ContactItem/SecondaryValue')
+    // No address in the subtitle — it's already in the primary slot for address-only recipients
+    expect(subtitle).toHaveTextContent('MiniPay', { exact: false })
+  })
+
   it('logs an error if no name/phone/address exist', () => {
     const recipient = {} as Recipient
-    const tree = render(<ReviewSummaryItemContact recipient={recipient} testID="ContactItem" />)
+    const tree = renderContact(recipient)
     expect(Logger.error).toHaveBeenCalledTimes(1)
     expect(tree.toJSON()).toBeNull()
   })

package/src/components/ReviewTransaction.tsx

@@ -4,6 +4,7 @@ import React, { useMemo, type ReactNode } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { ScrollView, StyleSheet, Text, View, type StyleProp, type TextStyle } from 'react-native'
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
+import { formatShortenedAddress } from 'src/account/utils'
 import BackButton from 'src/components/BackButton'
 import ContactCircle from 'src/components/ContactCircle'
 import CustomHeader from 'src/components/header/CustomHeader'
@@ -14,8 +15,10 @@ import InfoIcon from 'src/icons/InfoIcon'
 import WalletIcon from 'src/icons/navigator/Wallet'
 import PhoneIcon from 'src/icons/Phone'
 import UserIcon from 'src/icons/User'
+import VerifiedBadge from 'src/icons/VerifiedBadge'
 import { LocalCurrencySymbol } from 'src/localCurrency/consts'
-import { getDisplayDetail, type Recipient } from 'src/recipients/recipient'
+import { type Recipient } from 'src/recipients/recipient'
+import { useVerifierName } from 'src/recipients/verifier'
 import colors, { type ColorValue } from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
@@ -70,7 +73,7 @@ export function ReviewSummaryItem(props: {
   label: string
   icon: ReactNode
   primaryValue: string
-  secondaryValue?: string
+  secondaryValue?: ReactNode
   testID?: string
   onPress?: () => void
 }) {
@@ -96,12 +99,21 @@ export function ReviewSummaryItem(props: {
 
             {!!props.secondaryValue && (
               <View style={styles.reviewSummaryItemSecondaryValueWrapper}>
-                <Text
-                  style={styles.reviewSummaryItemSecondaryValue}
-                  testID={`${props.testID}/SecondaryValue`}
-                >
-                  {props.secondaryValue}
-                </Text>
+                {typeof props.secondaryValue === 'string' ? (
+                  <Text
+                    style={styles.reviewSummaryItemSecondaryValue}
+                    testID={`${props.testID}/SecondaryValue`}
+                  >
+                    {props.secondaryValue}
+                  </Text>
+                ) : (
+                  <View
+                    style={styles.reviewSummaryItemSecondaryValueContent}
+                    testID={`${props.testID}/SecondaryValue`}
+                  >
+                    {props.secondaryValue}
+                  </View>
+                )}
                 {!!props.onPress && <InfoIcon size={14} color={colors.contentSecondary} />}
               </View>
             )}
@@ -112,6 +124,24 @@ export function ReviewSummaryItem(props: {
   )
 }
 
+function renderAddressAndVerifier(
+  shortAddress: string | undefined,
+  verifierName: string | undefined
+): ReactNode {
+  if (!shortAddress && !verifierName) return undefined
+  return (
+    <>
+      {!!shortAddress && <Text style={styles.reviewSummaryItemSecondaryValue}>{shortAddress}</Text>}
+      {!!verifierName && (
+        <>
+          <VerifiedBadge color={colors.contentSecondary} />
+          <Text style={styles.reviewSummaryItemSecondaryValue}>{verifierName}</Text>
+        </>
+      )}
+    </>
+  )
+}
+
 export function ReviewSummaryItemContact({
   testID,
   recipient,
@@ -120,20 +150,30 @@ export function ReviewSummaryItemContact({
   recipient: Recipient
 }) {
   const { t } = useTranslation()
+  const verifierName = useVerifierName(recipient.address)
   const contact = useMemo(() => {
     const phone = recipient.displayNumber || recipient.e164PhoneNumber
+    // For recipients with a phone mapping, surface the resolved on-chain address (and verifier,
+    // if known) as a subtitle so the user can verify the actual destination they are signing.
+    const shortAddress = recipient.address ? formatShortenedAddress(recipient.address) : undefined
+    const phoneSubtitle = renderAddressAndVerifier(shortAddress, verifierName)
+
     if (recipient.name) {
-      return { title: recipient.name, subtitle: getDisplayDetail(recipient), icon: UserIcon }
+      return { title: recipient.name, subtitle: phoneSubtitle, icon: UserIcon }
     }
 
     if (phone) {
-      return { title: phone, icon: PhoneIcon }
+      return { title: phone, subtitle: phoneSubtitle, icon: PhoneIcon }
     }
 
     if (recipient.address) {
-      return { title: recipient.address, icon: WalletIcon }
+      return {
+        title: recipient.address,
+        subtitle: renderAddressAndVerifier(undefined, verifierName),
+        icon: WalletIcon,
+      }
     }
-  }, [recipient])
+  }, [recipient, verifierName])
 
   // This should never happen
   if (!contact) {
@@ -478,6 +518,12 @@ const styles = StyleSheet.create({
     gap: Spacing.Smallest8,
     alignItems: 'center',
   },
+  reviewSummaryItemSecondaryValueContent: {
+    flexDirection: 'row',
+    gap: Spacing.Tiny4,
+    alignItems: 'center',
+    flexShrink: 1,
+  },
   reviewDetails: {
     gap: Spacing.Regular16,
     width: '100%',

package/src/icons/VerifiedBadge.tsx

@@ -0,0 +1,27 @@
+import * as React from 'react'
+import Svg, { Path } from 'react-native-svg'
+import colors, { ColorValue } from 'src/styles/colors'
+
+interface Props {
+  size?: number
+  color?: ColorValue
+  testID?: string
+}
+
+function VerifiedBadge({ size = 14, color = colors.contentSecondary, testID }: Props) {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 22 22" fill="none" testID={testID}>
+      <Path
+        d="M20.396 11c-.018-.646-.215-1.275-.57-1.816-.354-.54-.852-.972-1.438-1.246.223-.607.27-1.264.14-1.897-.131-.634-.437-1.218-.882-1.687-.47-.445-1.053-.75-1.687-.882-.633-.13-1.29-.083-1.897.14-.273-.587-.704-1.086-1.245-1.44S11.647 1.62 11 1.604c-.646.017-1.273.213-1.813.568s-.969.854-1.24 1.44c-.608-.223-1.267-.272-1.902-.14-.635.13-1.22.436-1.69.882-.445.47-.749 1.055-.878 1.688-.13.633-.08 1.29.144 1.896-.587.274-1.087.705-1.443 1.245-.356.54-.555 1.17-.574 1.817.02.647.218 1.276.574 1.817.356.54.856.972 1.443 1.245-.224.606-.274 1.263-.144 1.896.13.634.433 1.218.877 1.688.47.443 1.054.747 1.687.878.633.132 1.29.084 1.897-.138.274.586.705 1.084 1.246 1.439.54.354 1.17.551 1.816.569.647-.016 1.276-.213 1.817-.567s.972-.854 1.245-1.44c.604.239 1.266.296 1.903.164.636-.132 1.22-.447 1.68-.907.46-.46.776-1.044.908-1.681s.075-1.299-.165-1.903c.586-.274 1.084-.705 1.439-1.246.354-.54.551-1.17.569-1.816Z"
+        stroke={color}
+        strokeWidth="1.2"
+      />
+      <Path
+        d="M9.662 14.85 6.233 11.42l1.293-1.302 2.072 2.072 4.4-4.794 1.347 1.246-5.683 6.208Z"
+        fill={color}
+      />
+    </Svg>
+  )
+}
+
+export default React.memo(VerifiedBadge)

package/src/identity/actions.ts

@@ -15,7 +15,6 @@ export enum Actions {
   CANCEL_IMPORT_CONTACTS = 'IDENTITY/CANCEL_IMPORT_CONTACTS',
   END_IMPORT_CONTACTS = 'IDENTITY/END_IMPORT_CONTACTS',
   FETCH_ADDRESS_VERIFICATION_STATUS = 'IDENTITY/FETCH_ADDRESS_VERIFICATION_STATUS',
-  ADDRESS_VERIFICATION_STATUS_RECEIVED = 'IDENTITY/ADDRESS_VERIFICATION_STATUS_RECEIVED',
   CONTACTS_SAVED = 'IDENTITY/CONTACTS_SAVED',
   STORED_PASSWORD_REFRESHED = 'IDENTITY/STORED_PASSWORD_REFRESHED',
 }
@@ -58,12 +57,6 @@ export interface FetchAddressVerificationAction {
   address: string
 }
 
-export interface AddressVerificationStatusReceivedAction {
-  type: Actions.ADDRESS_VERIFICATION_STATUS_RECEIVED
-  address: string
-  addressVerified: boolean
-}
-
 interface ContactsSavedAction {
   type: Actions.CONTACTS_SAVED
   hash: string
@@ -81,7 +74,6 @@ export type ActionTypes =
   | EndImportContactsAction
   | FetchAddressesAndValidateAction
   | FetchAddressVerificationAction
-  | AddressVerificationStatusReceivedAction
   | ContactsSavedAction
   | StoredPasswordRefreshedAction
 
@@ -90,15 +82,6 @@ export const fetchAddressesAndValidate = (e164Number: string): FetchAddressesAnd
   e164Number,
 })
 
-export const addressVerificationStatusReceived = (
-  address: string,
-  addressVerified: boolean
-): AddressVerificationStatusReceivedAction => ({
-  type: Actions.ADDRESS_VERIFICATION_STATUS_RECEIVED,
-  address,
-  addressVerified,
-})
-
 export const fetchAddressVerification = (address: string): FetchAddressVerificationAction => ({
   type: Actions.FETCH_ADDRESS_VERIFICATION_STATUS,
   address,

package/src/identity/contactMapping.test.ts

@@ -6,13 +6,12 @@ import { call, select } from 'redux-saga/effects'
 import { setUserContactDetails } from 'src/account/actions'
 import { defaultCountryCodeSelector, e164NumberSelector } from 'src/account/selectors'
 import { showError, showErrorOrFallback } from 'src/alert/actions'
-import { IdentityEvents } from 'src/analytics/Events'
 import AppAnalytics from 'src/analytics/AppAnalytics'
+import { IdentityEvents } from 'src/analytics/Events'
 import { ErrorMessages } from 'src/app/ErrorMessages'
 import { phoneNumberVerifiedSelector } from 'src/app/selectors'
 import {
   Actions,
-  addressVerificationStatusReceived,
   contactsSaved,
   fetchAddressVerification,
   fetchAddressesAndValidate,
@@ -25,7 +24,9 @@ import {
   saveContacts,
 } from 'src/identity/contactMapping'
 import {
-  addressToVerificationStatusSelector,
+  addressToE164NumberSelector,
+  addressToVerifiedBySelector,
+  e164NumberToAddressSelector,
   lastSavedContactsHashSelector,
 } from 'src/identity/selectors'
 import { retrieveSignedMessage } from 'src/pincode/authentication'
@@ -93,12 +94,19 @@ describe('Fetch Addresses Saga', () => {
       mockFetch.resetMocks()
     })
 
+    const emptyMappingProviders: [any, any][] = [
+      [select(e164NumberToAddressSelector), {}],
+      [select(addressToE164NumberSelector), {}],
+      [select(addressToVerifiedBySelector), {}],
+    ]
+
     it('fetches and caches addresses correctly', async () => {
       const updatedAccount = '0xAbC'
       mockFetch.mockResponseOnce(JSON.stringify({ data: { addresses: [updatedAccount] } }))
 
       await expectSaga(fetchAddressesAndValidateSaga, fetchAddressesAndValidate(mockE164Number))
         .provide([
+          ...emptyMappingProviders,
           [select(walletAddressSelector), '0xxyz'],
           [call(retrieveSignedMessage), 'some signed message'],
         ])
@@ -131,6 +139,7 @@ describe('Fetch Addresses Saga', () => {
 
       await expectSaga(fetchAddressesAndValidateSaga, fetchAddressesAndValidate(mockE164Number))
         .provide([
+          ...emptyMappingProviders,
           [select(walletAddressSelector), '0xxyz'],
           [call(retrieveSignedMessage), 'some signed message'],
         ])
@@ -162,6 +171,7 @@ describe('Fetch Addresses Saga', () => {
 
       await expectSaga(fetchAddressesAndValidateSaga, fetchAddressesAndValidate(mockE164Number))
         .provide([
+          ...emptyMappingProviders,
           [select(walletAddressSelector), '0xxyz'],
           [call(retrieveSignedMessage), 'some signed message'],
         ])
@@ -176,11 +186,44 @@ describe('Fetch Addresses Saga', () => {
         .run()
     })
 
+    it('prunes stale address mappings no longer returned by the fresh lookup', async () => {
+      mockFetch.mockResponseOnce(
+        JSON.stringify({
+          data: {
+            addresses: ['0xkept'],
+            verifiedAddresses: [{ address: '0xkept', verifiedBy: 'valora' }],
+          },
+        })
+      )
+
+      await expectSaga(fetchAddressesAndValidateSaga, fetchAddressesAndValidate(mockE164Number))
+        .provide([
+          [select(e164NumberToAddressSelector), { [mockE164Number]: ['0xstale', '0xkept'] }],
+          [
+            select(addressToE164NumberSelector),
+            { '0xstale': mockE164Number, '0xkept': mockE164Number },
+          ],
+          [select(addressToVerifiedBySelector), { '0xstale': 'valora', '0xkept': 'valora' }],
+          [select(walletAddressSelector), '0xxyz'],
+          [call(retrieveSignedMessage), 'some signed message'],
+        ])
+        .put(updateE164PhoneNumberAddresses({ [mockE164Number]: undefined }, {}))
+        .put(
+          updateE164PhoneNumberAddresses(
+            { [mockE164Number]: ['0xkept'] },
+            { '0xstale': null, '0xkept': mockE164Number },
+            { '0xstale': null, '0xkept': 'valora' }
+          )
+        )
+        .run()
+    })
+
     it('handles lookup errors correctly', async () => {
       mockFetch.mockReject()
 
       await expectSaga(fetchAddressesAndValidateSaga, fetchAddressesAndValidate(mockE164Number))
         .provide([
+          ...emptyMappingProviders,
           [select(walletAddressSelector), '0xxyz'],
           [call(retrieveSignedMessage), 'some signed message'],
         ])
@@ -195,48 +238,64 @@ describe('Fetch Address Verification Saga', () => {
     mockFetch.resetMocks()
   })
 
-  it('fetches and stores verified address', async () => {
-    mockFetch.mockResponseOnce(JSON.stringify({ data: { addressVerified: true } }))
+  it('records the `verifiedBy` value returned by the backend', async () => {
+    mockFetch.mockResponseOnce(
+      JSON.stringify({ data: { addressVerified: true, verifiedBy: 'minipay' } })
+    )
 
     await expectSaga(fetchAddressVerificationSaga, fetchAddressVerification(mockAccount))
       .provide([
-        [select(addressToVerificationStatusSelector), {}],
         [select(walletAddressSelector), '0xxyz'],
         [call(retrieveSignedMessage), 'some signed message'],
       ])
-      .put(addressVerificationStatusReceived(mockAccount, true))
+      .put(updateE164PhoneNumberAddresses({}, {}, { [mockAccount.toLowerCase()]: 'minipay' }))
       .run()
 
     expect(mockFetch).toHaveBeenCalledTimes(1)
     expect(mockFetch).toHaveBeenCalledWith(
-      `${networkConfig.checkAddressVerifiedUrl}?address=${mockAccount}&clientPlatform=android&clientVersion=0.0.1`,
-      {
+      `${networkConfig.checkAddressVerifiedUrl}?address=${mockAccount.toLowerCase()}&clientPlatform=android&clientVersion=0.0.1`,
+      expect.objectContaining({
         method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
+        headers: expect.objectContaining({
           authorization: `${networkConfig.authHeaderIssuer} 0xxyz:some signed message`,
-        },
-        signal: expect.any(AbortSignal),
-      }
+        }),
+      })
     )
   })
 
-  it('skips fetching if address already known', async () => {
+  it('falls back to `valora` when the backend confirms the address without a `verifiedBy` field', async () => {
+    mockFetch.mockResponseOnce(JSON.stringify({ data: { addressVerified: true } }))
+
     await expectSaga(fetchAddressVerificationSaga, fetchAddressVerification(mockAccount))
-      .provide([[select(addressToVerificationStatusSelector), { [mockAccount]: true }]])
+      .provide([
+        [select(walletAddressSelector), '0xxyz'],
+        [call(retrieveSignedMessage), 'some signed message'],
+      ])
+      .put(updateE164PhoneNumberAddresses({}, {}, { [mockAccount.toLowerCase()]: 'valora' }))
       .run()
+  })
 
-    expect(mockFetch).toHaveBeenCalledTimes(0)
+  it('records `null` (checked, not verified) when the backend returns false', async () => {
+    mockFetch.mockResponseOnce(JSON.stringify({ data: { addressVerified: false } }))
+
+    await expectSaga(fetchAddressVerificationSaga, fetchAddressVerification(mockAccount))
+      .provide([
+        [select(walletAddressSelector), '0xxyz'],
+        [call(retrieveSignedMessage), 'some signed message'],
+      ])
+      .put(updateE164PhoneNumberAddresses({}, {}, { [mockAccount.toLowerCase()]: null }))
+      .run()
   })
 
-  it('handles errors gracefully', async () => {
+  it('does not touch `addressToVerifiedBy` on network errors — the check is inconclusive, not negative', async () => {
     mockFetch.mockReject()
     await expectSaga(fetchAddressVerificationSaga, fetchAddressVerification(mockAccount))
       .provide([
-        [select(addressToVerificationStatusSelector), {}],
         [select(walletAddressSelector), '0xxyz'],
         [call(retrieveSignedMessage), 'some signed message'],
       ])
+      .not.put.actionType(Actions.UPDATE_E164_PHONE_NUMBER_ADDRESSES)
+      .put(showErrorOrFallback(expect.anything(), ErrorMessages.ADDRESS_LOOKUP_FAILURE))
       .run()
     expect(AppAnalytics.track).toHaveBeenCalledWith(IdentityEvents.address_lookup_error, {
       error: 'Unable to fetch verification status for this address',

package/src/identity/contactMapping.ts

@@ -11,15 +11,20 @@ import {
   Actions,
   FetchAddressVerificationAction,
   FetchAddressesAndValidateAction,
-  addressVerificationStatusReceived,
   contactsSaved,
   endImportContacts,
   updateE164PhoneNumberAddresses,
   updateImportContactsProgress,
 } from 'src/identity/actions'
-import { AddressToE164NumberType, E164NumberToAddressType } from 'src/identity/reducer'
 import {
-  addressToVerificationStatusSelector,
+  AddressToE164NumberType,
+  AddressToVerifiedByType,
+  E164NumberToAddressType,
+} from 'src/identity/reducer'
+import {
+  addressToE164NumberSelector,
+  addressToVerifiedBySelector,
+  e164NumberToAddressSelector,
   lastSavedContactsHashSelector,
 } from 'src/identity/selectors'
 import { ImportContactsStatus } from 'src/identity/types'
@@ -139,6 +144,13 @@ export function* fetchAddressesAndValidateSaga({ e164Number }: FetchAddressesAnd
   try {
     Logger.debug(TAG + '@fetchAddressesAndValidate', `Fetching addresses for number`)
 
+    // Snapshot the previous mappings before we clear them so we can prune stale entries
+    // after the fresh response arrives (see the pruning block below).
+    const prevE164NumberToAddress = yield* select(e164NumberToAddressSelector)
+    const prevAddressToE164Number = yield* select(addressToE164NumberSelector)
+    const prevAddressToVerifiedBy = yield* select(addressToVerifiedBySelector)
+    const prevAddresses = prevE164NumberToAddress[e164Number] ?? []
+
     // Clear existing entries for those numbers so our mapping consumers know new status is pending.
     yield* put(updateE164PhoneNumberAddresses({ [e164Number]: undefined }, {}))
 
@@ -148,10 +160,26 @@ export function* fetchAddressesAndValidateSaga({ e164Number }: FetchAddressesAnd
     // it includes addresses verified by both CPV and SocialConnect.
     // The `addresses` field is used for backward compatibility.
     const walletAddresses = verifiedAddresses ? verifiedAddresses.map((v) => v.address) : addresses
+    const walletAddressSet = new Set(walletAddresses)
 
     const e164NumberToAddressUpdates: E164NumberToAddressType = {}
     const addressToE164NumberUpdates: AddressToE164NumberType = {}
-    const addressToVerifiedByUpdates: Record<string, string> = {}
+    const addressToVerifiedByUpdates: AddressToVerifiedByType = {}
+
+    // Prune addresses previously associated with this phone number but no longer present
+    // in the fresh response.
+    for (const prevAddress of prevAddresses) {
+      if (!walletAddressSet.has(prevAddress)) {
+        // Clear the reverse mapping for this number.
+        if (prevAddressToE164Number[prevAddress] === e164Number) {
+          addressToE164NumberUpdates[prevAddress] = null
+        }
+        // Clear verifier info.
+        if (prevAddress in prevAddressToVerifiedBy) {
+          addressToVerifiedByUpdates[prevAddress] = null
+        }
+      }
+    }
 
     if (verifiedAddresses) {
       for (const { address, verifiedBy } of verifiedAddresses) {
@@ -188,14 +216,20 @@ export function* fetchAddressesAndValidateSaga({ e164Number }: FetchAddressesAnd
 }
 
 export function* fetchAddressVerificationSaga({ address }: FetchAddressVerificationAction) {
+  const normalizedAddress = address.toLowerCase()
   try {
-    const addressToVerificationStatus = yield* select(addressToVerificationStatusSelector)
-    if (!(address in addressToVerificationStatus && addressToVerificationStatus[address])) {
-      AppAnalytics.track(IdentityEvents.address_lookup_start)
-      const addressVerified = yield* call(fetchAddressVerification, address)
-      yield* put(addressVerificationStatusReceived(address, addressVerified))
-      AppAnalytics.track(IdentityEvents.address_lookup_complete)
-    }
+    AppAnalytics.track(IdentityEvents.address_lookup_start)
+    const { addressVerified, verifiedBy } = yield* call(fetchAddressVerification, normalizedAddress)
+    // Older backend responses omit `verifiedBy` and only signal Valora-verified addresses,
+    // so fall back to 'valora' when verification is confirmed without a verifier.
+    yield* put(
+      updateE164PhoneNumberAddresses(
+        {},
+        {},
+        { [normalizedAddress]: addressVerified ? (verifiedBy ?? 'valora') : null }
+      )
+    )
+    AppAnalytics.track(IdentityEvents.address_lookup_complete)
   } catch (err) {
     const error = ensureError(err)
     Logger.debug(
@@ -203,13 +237,8 @@ export function* fetchAddressVerificationSaga({ address }: FetchAddressVerificat
       `Error fetching address verification`,
       error
     )
-    AppAnalytics.track(IdentityEvents.address_lookup_error, {
-      error: error.message,
-    })
-    // Setting this address to "false" does not mean that the address
-    // if definitely unverified; we set it to false to indicate that
-    // the request is finished, and possibly unverified.
-    yield* put(addressVerificationStatusReceived(address, false))
+    yield* put(showErrorOrFallback(error, ErrorMessages.ADDRESS_LOOKUP_FAILURE))
+    AppAnalytics.track(IdentityEvents.address_lookup_error, { error: error.message })
   }
 }
 
@@ -291,8 +320,9 @@ function* fetchAddressVerification(address: string) {
       )
     }
 
-    const { data }: { data: { addressVerified: boolean } } = yield* call([response, 'json'])
-    return data.addressVerified
+    const { data }: { data: { addressVerified: boolean; verifiedBy?: string | null } } =
+      yield* call([response, 'json'])
+    return { addressVerified: data.addressVerified, verifiedBy: data.verifiedBy }
   } catch (error) {
     Logger.warn(`${TAG}/fetchAddressVerification`, 'Unable to look up address', error)
     throw new Error('Unable to fetch verification status for this address')