wallet-stack 1.0.0-alpha.131 → 1.0.0-alpha.132

package/locales/base/translation.json

@@ -2229,6 +2229,12 @@
       "invite": "Invite"
     }
   },
+  "sendInvite": {
+    "title": "Invite {{contact}} to {{appName}}",
+    "body": "Send them a link to {{appName}} so they can get a wallet and start receiving crypto.",
+    "cta": "Share invite",
+    "errorRetry": "Couldn't open the share sheet. Please try again."
+  },
   "transactionStatus": {
     "transactionIsCompleted": "Completed",
     "transactionIsPending": "Pending",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wallet-stack",
-  "version": "1.0.0-alpha.131",
+  "version": "1.0.0-alpha.132",
   "author": "Valora Inc",
   "license": "Apache-2.0",
   "repository": {
@@ -18,7 +18,7 @@
     "provenance": true
   },
   "engines": {
-    "node": ">=20.20.2"
+    "node": ">=24.15.0"
   },
   "files": [
     "tsconfig.json",

package/src/app/ErrorMessages.ts

@@ -37,4 +37,5 @@ export enum ErrorMessages {
   KYC_TRY_AGAIN_FAILED = 'fiatConnectKycStatusScreen.tryAgainFailed',
   HOOKS_INVALID_PREVIEW_API_URL = 'hooksPreview.invalidApiUrl',
   SHORTCUT_CLAIM_REWARD_FAILED = 'dappShortcuts.claimRewardFailure',
+  SHARE_INVITE_FAILED = 'sendInvite.errorRetry',
 }

package/src/images/Images.ts

@@ -14,6 +14,7 @@ export const celoEducation4 = require('src/images/assets/celo-education-4.png')
 export const email = require('src/images/assets/email.png')
 export const fiatExchange = require('src/images/assets/fiat-exchange.png')
 export const getVerified = require('src/images/assets/get-verified.png')
+export const inviteModal = require('src/images/assets/invite-modal.png')
 export const learnCelo = require('src/images/assets/learn-celo.png')
 export const pointsCardBackground = require('src/images/assets/points-card-background.png')
 export const pointsIllustration = require('src/images/assets/points-illustration.png')

package/src/navigator/Navigator.tsx

@@ -104,6 +104,7 @@ import { RootState } from 'src/redux/reducers'
 import { store } from 'src/redux/store'
 import SendConfirmation, { sendConfirmationScreenNavOptions } from 'src/send/SendConfirmation'
 import SendEnterAmount from 'src/send/SendEnterAmount'
+import SendInvite from 'src/send/SendInvite'
 import SendSelectRecipient from 'src/send/SendSelectRecipient'
 import ValidateRecipientAccount, {
   validateRecipientAccountScreenNavOptions,
@@ -256,6 +257,11 @@ const sendScreens = (Navigator: typeof Stack) => (
       component={SendEnterAmount}
       options={noHeader}
     />
+    <Navigator.Screen
+      name={Screens.SendInvite}
+      component={SendInvite}
+      options={SendInvite.navigationOptions}
+    />
   </>
 )
 

package/src/navigator/Screens.tsx

@@ -75,6 +75,7 @@ export enum Screens {
   SelectCountry = 'SelectCountry',
   SelectLocalCurrency = 'SelectLocalCurrency',
   SelectProvider = 'SelectProvider',
+  SendInvite = 'SendInvite',
   SendSelectRecipient = 'SendSelectRecipient',
   SendConfirmation = 'SendConfirmation',
   SendEnterAmount = 'SendEnterAmount',

package/src/navigator/types.tsx

@@ -261,6 +261,7 @@ export type StackParamList = {
       fiat: number
     }
   }
+  [Screens.SendInvite]: { recipient: Recipient; shareUrl: string }
   [Screens.SendSelectRecipient]:
     | {
         forceTokenId?: boolean

package/src/send/SendConfirmation.test.tsx

@@ -171,6 +171,34 @@ describe('SendConfirmation', () => {
     expect(getByTestId('ConfirmButton')).toHaveTextContent('send', { exact: false })
   })
 
+  it('shows the unknown address warning when the recipient address is not a known app user', () => {
+    const { getByTestId } = renderScreen(mockSendConfirmationProps, {
+      identity: {
+        addressToVerificationStatus: { [mockAccount]: false },
+      },
+    })
+
+    expect(getByTestId('UnknownAddressInfo')).toBeTruthy()
+  })
+
+  it('does not show the unknown address warning when the recipient address is verified', () => {
+    const { queryByTestId } = renderScreen(mockSendConfirmationProps, {
+      identity: {
+        addressToVerificationStatus: { [mockAccount]: true },
+      },
+    })
+
+    expect(queryByTestId('UnknownAddressInfo')).toBeNull()
+  })
+
+  it('does not show the unknown address warning when the address has not been looked up yet', () => {
+    const { queryByTestId } = renderScreen(mockSendConfirmationProps, {
+      identity: { addressToVerificationStatus: {} },
+    })
+
+    expect(queryByTestId('UnknownAddressInfo')).toBeNull()
+  })
+
   it('does not prepare a transaction on load by default', () => {
     renderScreen(mockSendConfirmationProps)
     expect(mockUsePrepareSendTransactionsOutput.clearPreparedTransactions).not.toHaveBeenCalled()

package/src/send/SendConfirmation.tsx

@@ -10,6 +10,7 @@ import BackButton from 'src/components/BackButton'
 import type { BottomSheetModalRefType } from 'src/components/BottomSheet'
 import Button, { BtnSizes } from 'src/components/Button'
 import InfoBottomSheet, { InfoBottomSheetContentBlock } from 'src/components/InfoBottomSheet'
+import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import {
   buildAmounts,
   ReviewContent,
@@ -23,11 +24,13 @@ import {
 } from 'src/components/ReviewTransaction'
 import { formatValueToDisplay } from 'src/components/TokenDisplay'
 import TokenIcon from 'src/components/TokenIcon'
+import { addressToVerificationStatusSelector } from 'src/identity/selectors'
 import { LocalCurrencySymbol } from 'src/localCurrency/consts'
 import { getLocalCurrencyCode, getLocalCurrencySymbol } from 'src/localCurrency/selectors'
 import { noHeader } from 'src/navigator/Headers'
 import { Screens } from 'src/navigator/Screens'
 import { StackParamList } from 'src/navigator/types'
+import { RecipientType } from 'src/recipients/recipient'
 import { useDispatch, useSelector } from 'src/redux/hooks'
 import { sendPayment } from 'src/send/actions'
 import { isSendingSelector } from 'src/send/selectors'
@@ -36,11 +39,11 @@ import { NETWORK_NAMES } from 'src/shared/conts'
 import { useAmountAsUsd, useTokenInfo, useTokenToLocalAmount } from 'src/tokens/hooks'
 import { feeCurrenciesSelector } from 'src/tokens/selectors'
 import Logger from 'src/utils/Logger'
-import { getFeeCurrencyAndAmounts } from 'src/viem/prepareTransactions'
 import {
   getPreparedTransactionsPossible,
   getSerializablePreparedTransaction,
 } from 'src/viem/preparedTransactionSerialization'
+import { getFeeCurrencyAndAmounts } from 'src/viem/prepareTransactions'
 import { walletAddressSelector } from 'src/web3/selectors'
 
 type Props = NativeStackScreenProps<StackParamList, Screens.SendConfirmation>
@@ -88,6 +91,12 @@ 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 showUnknownAddressInfo =
+    recipient.recipientType === RecipientType.Address &&
+    !!recipient.address &&
+    addressToVerificationStatus[recipient.address] === false
+
   const feeCurrencies = useSelector((state) => feeCurrenciesSelector(state, tokenInfo!.networkId))
   const {
     maxFeeAmount,
@@ -233,6 +242,14 @@ export default function SendConfirmation({ route: { params } }: Props) {
       </ReviewContent>
 
       <ReviewFooter>
+        {showUnknownAddressInfo && (
+          <InLineNotification
+            variant={NotificationVariant.Info}
+            description={t('sendSelectRecipient.unknownAddressInfo')}
+            testID="UnknownAddressInfo"
+          />
+        )}
+
         <Button
           testID="ConfirmButton"
           text={t('send')}

package/src/send/SendInvite.test.tsx

@@ -0,0 +1,107 @@
+import { act, fireEvent, render } from '@testing-library/react-native'
+import * as React from 'react'
+import Share from 'react-native-share'
+import { Provider } from 'react-redux'
+import { showError } from 'src/alert/actions'
+import AppAnalytics from 'src/analytics/AppAnalytics'
+import { SendEvents } from 'src/analytics/Events'
+import { ErrorMessages } from 'src/app/ErrorMessages'
+import { Screens } from 'src/navigator/Screens'
+import { RecipientType } from 'src/recipients/recipient'
+import SendInvite from 'src/send/SendInvite'
+import { createMockStore, getMockStackScreenProps } from 'test/utils'
+import { mockInvitableRecipient3 } from 'test/values'
+
+const shareUrl = 'https://example.test/invite'
+
+const mockScreenProps = () =>
+  getMockStackScreenProps(Screens.SendInvite, {
+    recipient: mockInvitableRecipient3,
+    shareUrl,
+  })
+
+describe('SendInvite', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('opens the share sheet, tracks the press analytic, and stays on the screen after the sheet closes', async () => {
+    jest
+      .mocked(Share.open)
+      .mockResolvedValueOnce({ success: true, dismissedAction: false, message: '' })
+
+    const store = createMockStore({})
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <SendInvite {...mockScreenProps()} />
+      </Provider>
+    )
+
+    await act(async () => {
+      fireEvent.press(getByTestId('SendInvite/ShareButton'))
+    })
+
+    expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_invite_press, {
+      recipientType: RecipientType.PhoneNumber,
+    })
+    expect(Share.open).toHaveBeenCalledWith(
+      expect.objectContaining({
+        message: expect.stringContaining(shareUrl),
+        url: shareUrl,
+        failOnCancel: false,
+      })
+    )
+  })
+
+  it('dispatches an error toast when the share sheet fails', async () => {
+    jest.mocked(Share.open).mockRejectedValueOnce(new Error('no share providers'))
+
+    const store = createMockStore({})
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <SendInvite {...mockScreenProps()} />
+      </Provider>
+    )
+
+    await act(async () => {
+      fireEvent.press(getByTestId('SendInvite/ShareButton'))
+    })
+
+    expect(store.getActions()).toContainEqual(showError(ErrorMessages.SHARE_INVITE_FAILED))
+  })
+
+  it('renders the contact name in the title when the recipient has one', () => {
+    const store = createMockStore({})
+    const { getByText } = render(
+      <Provider store={store}>
+        <SendInvite {...mockScreenProps()} />
+      </Provider>
+    )
+
+    expect(
+      getByText(`sendInvite.title, {"contact":"${mockInvitableRecipient3.name}"}`)
+    ).toBeTruthy()
+  })
+
+  it('falls back to the phone number in the title when the recipient has no name', () => {
+    const namelessRecipient = {
+      displayNumber: mockInvitableRecipient3.displayNumber,
+      e164PhoneNumber: mockInvitableRecipient3.e164PhoneNumber,
+      recipientType: mockInvitableRecipient3.recipientType,
+    }
+    const screenProps = getMockStackScreenProps(Screens.SendInvite, {
+      recipient: namelessRecipient,
+      shareUrl,
+    })
+    const store = createMockStore({})
+    const { getByText } = render(
+      <Provider store={store}>
+        <SendInvite {...screenProps} />
+      </Provider>
+    )
+
+    expect(
+      getByText(`sendInvite.title, {"contact":"${mockInvitableRecipient3.displayNumber}"}`)
+    ).toBeTruthy()
+  })
+})

package/src/send/SendInvite.tsx

@@ -0,0 +1,99 @@
+import { NativeStackScreenProps } from '@react-navigation/native-stack'
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { Image, ScrollView, StyleSheet, Text, View } from 'react-native'
+import { SafeAreaView } from 'react-native-safe-area-context'
+import Share from 'react-native-share'
+import { showError } from 'src/alert/actions'
+import AppAnalytics from 'src/analytics/AppAnalytics'
+import { SendEvents } from 'src/analytics/Events'
+import { ErrorMessages } from 'src/app/ErrorMessages'
+import Button, { BtnSizes } from 'src/components/Button'
+import { inviteModal } from 'src/images/Images'
+import { headerWithBackButton } from 'src/navigator/Headers'
+import { Screens } from 'src/navigator/Screens'
+import { StackParamList } from 'src/navigator/types'
+import { getDisplayName } from 'src/recipients/recipient'
+import { useDispatch } from 'src/redux/hooks'
+import { typeScale } from 'src/styles/fonts'
+import { Spacing } from 'src/styles/styles'
+import Logger from 'src/utils/Logger'
+
+type Props = NativeStackScreenProps<StackParamList, Screens.SendInvite>
+
+function SendInvite({ route }: Props) {
+  const { t } = useTranslation()
+  const dispatch = useDispatch()
+  const { recipient, shareUrl } = route.params
+  const contact = getDisplayName(recipient, t)
+
+  const handleShareInvite = async () => {
+    AppAnalytics.track(SendEvents.send_select_recipient_invite_press, {
+      recipientType: recipient.recipientType,
+    })
+
+    try {
+      await Share.open({
+        message: t('inviteWithSmsMessage.shareMessage', { shareUrl }),
+        url: shareUrl,
+        failOnCancel: false,
+      })
+    } catch (error) {
+      Logger.error('SendInvite', 'Share sheet failed', error)
+      dispatch(showError(ErrorMessages.SHARE_INVITE_FAILED))
+    }
+  }
+
+  return (
+    <SafeAreaView style={styles.container} edges={['bottom']}>
+      <ScrollView contentContainerStyle={styles.scrollContent}>
+        <View style={styles.imageContainer}>
+          <Image source={inviteModal} resizeMode="contain" />
+        </View>
+        <Text style={styles.title}>{t('sendInvite.title', { contact })}</Text>
+        <Text style={styles.body}>{t('sendInvite.body')}</Text>
+      </ScrollView>
+      <Button
+        testID="SendInvite/ShareButton"
+        style={styles.button}
+        onPress={handleShareInvite}
+        text={t('sendInvite.cta')}
+        size={BtnSizes.FULL}
+      />
+    </SafeAreaView>
+  )
+}
+
+SendInvite.navigationOptions = headerWithBackButton
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'space-between',
+  },
+  scrollContent: {
+    padding: Spacing.Thick24,
+  },
+  imageContainer: {
+    alignItems: 'center',
+    paddingTop: Spacing.Thick24,
+    paddingBottom: Spacing.Regular16,
+  },
+  title: {
+    ...typeScale.titleMedium,
+    textAlign: 'center',
+    marginTop: Spacing.Large32,
+    paddingHorizontal: Spacing.Regular16,
+  },
+  body: {
+    ...typeScale.bodyMedium,
+    textAlign: 'center',
+    marginTop: Spacing.Regular16,
+    paddingHorizontal: Spacing.Regular16,
+  },
+  button: {
+    padding: Spacing.Thick24,
+  },
+})
+
+export default SendInvite

package/src/send/SendSelectRecipient.test.tsx

@@ -2,7 +2,6 @@ import Clipboard from '@react-native-clipboard/clipboard'
 import { act, fireEvent, render, waitFor } from '@testing-library/react-native'
 import * as React from 'react'
 import { Provider } from 'react-redux'
-import Share from 'react-native-share'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { SendEvents } from 'src/analytics/Events'
 import { SendOrigin } from 'src/analytics/types'
@@ -204,7 +203,7 @@ describe('SendSelectRecipient', () => {
     })
     expect(getByTestId('SelectRecipient/NoResults')).toBeTruthy()
   })
-  it('navigates to send amount when search result next button is pressed', async () => {
+  it('navigates to send amount when a verified phone recipient is tapped in search results', async () => {
     jest
       .mocked(getRecipientVerificationStatus)
       .mockReturnValue(RecipientVerificationStatus.VERIFIED)
@@ -225,15 +224,6 @@ describe('SendSelectRecipient', () => {
       fireEvent.press(getByTestId('RecipientItem'))
     })
 
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-    expect(getByTestId('SendOrInviteButton')).toHaveTextContent(
-      'sendSelectRecipient.buttons.send',
-      { exact: false }
-    )
-
-    await act(() => {
-      fireEvent.press(getByTestId('SendOrInviteButton'))
-    })
     expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
       recipientType: RecipientType.PhoneNumber,
     })
@@ -247,7 +237,7 @@ describe('SendSelectRecipient', () => {
       isMiniPayRecipient: false,
     })
   })
-  it('navigates to send amount when address recipient is pressed', async () => {
+  it('navigates to send amount when an address is tapped and the user phone number is not verified', async () => {
     const store = createMockStore(defaultStore)
 
     const { getByTestId } = render(
@@ -264,15 +254,6 @@ describe('SendSelectRecipient', () => {
       fireEvent.press(getByTestId('RecipientItem'))
     })
 
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-    expect(getByTestId('SendOrInviteButton')).toHaveTextContent(
-      'sendSelectRecipient.buttons.send',
-      { exact: false }
-    )
-
-    await act(() => {
-      fireEvent.press(getByTestId('SendOrInviteButton'))
-    })
     expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
       recipientType: RecipientType.Address,
     })
@@ -286,14 +267,14 @@ describe('SendSelectRecipient', () => {
     })
   })
 
-  it('does not show unknown address info text when searching for known app address', async () => {
+  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 { getByTestId, queryByTestId } = render(
+    const { getByTestId } = render(
       <Provider store={store}>
         <SendSelectRecipient {...mockScreenProps({})} />
       </Provider>
@@ -317,17 +298,15 @@ describe('SendSelectRecipient', () => {
     })
 
     expect(store.getActions()).toEqual([fetchAddressVerification(mockAccount2.toLowerCase())])
-    expect(queryByTestId('UnknownAddressInfo')).toBeFalsy()
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
   })
-  it('does not show unknown address info text when searching for phone number', async () => {
+  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 { getByTestId, queryByTestId } = render(
+    const { getByTestId } = render(
       <Provider store={store}>
         <SendSelectRecipient {...mockScreenProps({})} />
       </Provider>
@@ -348,11 +327,10 @@ describe('SendSelectRecipient', () => {
     })
 
     expect(store.getActions()).toEqual([fetchAddressesAndValidate(mockE164Number2Invite)])
-    expect(queryByTestId('UnknownAddressInfo')).toBeFalsy()
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
+    expect(navigate).not.toHaveBeenCalled()
   })
 
-  it('opens the platform share sheet and tracks the press analytic before awaiting when inviting an unverified phone number', async () => {
+  it('navigates to the invite screen when an unverified phone number is tapped and share URL is configured', async () => {
     const shareUrl = 'https://example.test/invite'
     jest.mocked(getAppConfig).mockReturnValue({
       displayName: 'Test App',
@@ -367,20 +345,6 @@ describe('SendSelectRecipient', () => {
       .mocked(getRecipientVerificationStatus)
       .mockReturnValue(RecipientVerificationStatus.UNVERIFIED)
 
-    let resolveShare!: (value: {
-      success: boolean
-      dismissedAction: boolean
-      message: string
-    }) => void
-    const sharePromise = new Promise<{
-      success: boolean
-      dismissedAction: boolean
-      message: string
-    }>((resolve) => {
-      resolveShare = resolve
-    })
-    jest.mocked(Share.open).mockReturnValueOnce(sharePromise)
-
     const store = createMockStore(storeWithPhoneVerified)
 
     const { getByTestId } = render(
@@ -397,33 +361,19 @@ describe('SendSelectRecipient', () => {
       fireEvent.press(getByTestId('RecipientItem'))
     })
 
-    const button = getByTestId('SendOrInviteButton')
-    expect(button).toHaveTextContent('sendSelectRecipient.buttons.invite', { exact: false })
-
-    await act(() => {
-      fireEvent.press(button)
+    expect(navigate).toHaveBeenCalledWith(Screens.SendInvite, {
+      recipient: expect.objectContaining({
+        e164PhoneNumber: mockE164Number2Invite,
+        recipientType: RecipientType.PhoneNumber,
+      }),
+      shareUrl,
     })
 
-    // Analytics fires synchronously on tap, before the share sheet resolves
-    expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_invite_press, {
-      recipientType: RecipientType.PhoneNumber,
-    })
-    expect(Share.open).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: expect.stringContaining(shareUrl),
-        url: shareUrl,
-        failOnCancel: false,
-      })
-    )
-    expect(navigate).not.toHaveBeenCalled()
-
-    await act(async () => {
-      resolveShare({ success: true, dismissedAction: false, message: '' })
-      await sharePromise
-    })
+    // Search text is preserved so the user can return to the same picker state.
+    expect(searchInput.props.value).toBe(mockE164Number2Invite)
   })
 
-  it('shows unknown address info text when searching for unknown address after making address verification request', async () => {
+  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)
@@ -455,10 +405,12 @@ describe('SendSelectRecipient', () => {
     })
 
     expect(store.getActions()).toEqual([fetchAddressVerification(mockAccount2.toLowerCase())])
-    expect(getByTestId('UnknownAddressInfo')).toBeTruthy()
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
+    expect(navigate).toHaveBeenCalledWith(
+      Screens.SendEnterAmount,
+      expect.objectContaining({ origin: SendOrigin.AppSendFlow })
+    )
   })
-  it('shows unknown address info text and skips CPV request when searching for any address if PN not verified', async () => {
+  it('skips verification request for an address when the user phone number is not verified', async () => {
     const store = createMockStore(defaultStore)
 
     const { getByTestId } = render(
@@ -486,43 +438,11 @@ describe('SendSelectRecipient', () => {
     })
 
     expect(store.getActions()).toEqual([])
-    expect(getByTestId('UnknownAddressInfo')).toBeTruthy()
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-  })
-  it('shows unknown address info text and send button when searching for address with cached phone number but no longer connected to the phone number', async () => {
-    jest
-      .mocked(getRecipientVerificationStatus)
-      .mockReturnValue(RecipientVerificationStatus.UNVERIFIED)
-
-    const store = createMockStore(storeWithPhoneVerified)
-
-    const { getByTestId } = render(
-      <Provider store={store}>
-        <SendSelectRecipient {...mockScreenProps({})} />
-      </Provider>
+    // Navigation still proceeds — status is treated as UNVERIFIED locally.
+    expect(navigate).toHaveBeenCalledWith(
+      Screens.SendEnterAmount,
+      expect.objectContaining({ origin: SendOrigin.AppSendFlow })
     )
-    await waitFor(() => {
-      expect(getByTestId('SendSelectRecipientSearchInput')).toBeTruthy()
-    })
-    const searchInput = getByTestId('SendSelectRecipientSearchInput')
-
-    await act(() => {
-      fireEvent.changeText(searchInput, mockAccount)
-    })
-
-    expect(getByTestId('RecipientItem')).toHaveTextContent(mockRecipient.name, { exact: false })
-    expect(getByTestId('RecipientItem')).toHaveTextContent(mockRecipient.displayNumber, {
-      exact: false,
-    })
-
-    await act(() => {
-      fireEvent.press(getByTestId('RecipientItem'))
-    })
-
-    expect(store.getActions()).toEqual([fetchAddressVerification(mockAccount)])
-    expect(getByTestId('UnknownAddressInfo')).toBeTruthy()
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-    expect(getByTestId('SendOrInviteButton')).toHaveTextContent('send', { exact: false })
   })
   it('shows paste button if clipboard has address content', async () => {
     const store = createMockStore(defaultStore)
@@ -548,7 +468,7 @@ describe('SendSelectRecipient', () => {
     await expect(pasteButtonAfterPress).rejects.toThrow()
   })
 
-  it('navigates to send amount when phone number recipient with single address', async () => {
+  it('navigates to send amount when a verified phone recipient with a single address is tapped', async () => {
     jest
       .mocked(getRecipientVerificationStatus)
       .mockReturnValue(RecipientVerificationStatus.VERIFIED)
@@ -577,11 +497,6 @@ describe('SendSelectRecipient', () => {
       fireEvent.press(getByTestId('RecipientItem'))
     })
 
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-
-    await act(() => {
-      fireEvent.press(getByTestId('SendOrInviteButton'))
-    })
     expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
       recipientType: RecipientType.PhoneNumber,
     })
@@ -599,7 +514,7 @@ describe('SendSelectRecipient', () => {
       isMiniPayRecipient: false,
     })
   })
-  it('navigates to send amount with isMiniPayRecipient when address is verified by minipay', async () => {
+  it('navigates with isMiniPayRecipient when address is verified by minipay', async () => {
     jest
       .mocked(getRecipientVerificationStatus)
       .mockReturnValue(RecipientVerificationStatus.VERIFIED)
@@ -628,9 +543,6 @@ describe('SendSelectRecipient', () => {
     await act(() => {
       fireEvent.press(getByTestId('RecipientItem'))
     })
-    await act(() => {
-      fireEvent.press(getByTestId('SendOrInviteButton'))
-    })
 
     expect(navigate).toHaveBeenCalledWith(Screens.SendEnterAmount, {
       isFromScan: false,
@@ -646,7 +558,7 @@ describe('SendSelectRecipient', () => {
       isMiniPayRecipient: true,
     })
   })
-  it('navigates to secure send flow when phone number recipient with multiple addresses, first time seeing it', async () => {
+  it('navigates to secure send flow when phone recipient has multiple addresses, first time seeing it', async () => {
     jest
       .mocked(getRecipientVerificationStatus)
       .mockReturnValue(RecipientVerificationStatus.VERIFIED)
@@ -681,11 +593,6 @@ describe('SendSelectRecipient', () => {
       fireEvent.press(getByTestId('RecipientItem'))
     })
 
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-
-    await act(() => {
-      fireEvent.press(getByTestId('SendOrInviteButton'))
-    })
     expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
       recipientType: RecipientType.PhoneNumber,
     })
@@ -696,7 +603,7 @@ describe('SendSelectRecipient', () => {
       origin: SendOrigin.AppSendFlow,
     })
   })
-  it('navigates to send enter amount when phone number recipient with multiple addresses, already done secure send', async () => {
+  it('navigates to send amount when phone recipient has multiple addresses and secure send was already done', async () => {
     jest
       .mocked(getRecipientVerificationStatus)
       .mockReturnValue(RecipientVerificationStatus.VERIFIED)
@@ -734,11 +641,6 @@ describe('SendSelectRecipient', () => {
       fireEvent.press(getByTestId('RecipientItem'))
     })
 
-    expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-
-    await act(() => {
-      fireEvent.press(getByTestId('SendOrInviteButton'))
-    })
     expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
       recipientType: RecipientType.PhoneNumber,
     })
@@ -795,11 +697,6 @@ describe('SendSelectRecipient', () => {
         fireEvent.press(getByTestId('RecipientItem'))
       })
 
-      expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-
-      await act(() => {
-        fireEvent.press(getByTestId('SendOrInviteButton'))
-      })
       expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
         recipientType: RecipientType.Address,
       })
@@ -861,11 +758,6 @@ describe('SendSelectRecipient', () => {
         fireEvent.press(getByTestId('RecipientItem'))
       })
 
-      expect(getByTestId('SendOrInviteButton')).toBeTruthy()
-
-      await act(() => {
-        fireEvent.press(getByTestId('SendOrInviteButton'))
-      })
       expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
         recipientType: RecipientType.Address,
       })

package/src/send/SendSelectRecipient.tsx

@@ -1,18 +1,15 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet, Text, View } from 'react-native'
 import { getFontScaleSync } from 'react-native-device-info'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import Share from 'react-native-share'
 import { isAddressFormat } from 'src/account/utils'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { SendEvents } from 'src/analytics/Events'
 import { SendOrigin } from 'src/analytics/types'
 import { getAppConfig } from 'src/appConfig'
 import BackButton from 'src/components/BackButton'
-import Button, { BtnSizes } from 'src/components/Button'
-import InLineNotification, { NotificationVariant } from 'src/components/InLineNotification'
 import KeyboardAwareScrollView from 'src/components/KeyboardAwareScrollView'
 import CustomHeader from 'src/components/header/CustomHeader'
 import CircledIcon from 'src/icons/CircledIcon'
@@ -42,7 +39,6 @@ import colors from 'src/styles/colors'
 import { typeScale } from 'src/styles/fonts'
 import { Spacing } from 'src/styles/styles'
 import variables from 'src/styles/variables'
-import Logger from 'src/utils/Logger'
 
 type Props = NativeStackScreenProps<StackParamList, Screens.SendSelectRecipient>
 
@@ -167,45 +163,6 @@ const getStartedStyles = StyleSheet.create({
   },
 })
 
-function SendOrInviteButton({
-  recipient,
-  recipientVerificationStatus,
-  shareUrl,
-  onPress,
-}: {
-  recipient: Recipient | null
-  recipientVerificationStatus: RecipientVerificationStatus
-  shareUrl: string | null
-  onPress: (shouldInviteRecipient: boolean) => void
-}) {
-  const { t } = useTranslation()
-
-  const sendOrInviteButtonDisabled =
-    (!!recipient && recipientVerificationStatus === RecipientVerificationStatus.UNKNOWN) ||
-    // If the phone number is present and unverified and no share URL is found, disable the send/invite button
-    (recipient?.recipientType === RecipientType.PhoneNumber &&
-      recipientVerificationStatus === RecipientVerificationStatus.UNVERIFIED &&
-      !shareUrl)
-
-  const shouldInviteRecipient =
-    !sendOrInviteButtonDisabled &&
-    recipient?.recipientType === RecipientType.PhoneNumber &&
-    recipientVerificationStatus === RecipientVerificationStatus.UNVERIFIED
-  return (
-    <Button
-      testID="SendOrInviteButton"
-      style={styles.sendOrInviteButton}
-      onPress={() => onPress(shouldInviteRecipient)}
-      disabled={sendOrInviteButtonDisabled}
-      text={
-        shouldInviteRecipient
-          ? t('sendSelectRecipient.buttons.invite')
-          : t('sendSelectRecipient.buttons.send')
-      }
-      size={BtnSizes.FULL}
-    />
-  )
-}
 enum SelectRecipientView {
   Recent = 'Recent',
   Contacts = 'Contacts',
@@ -222,19 +179,14 @@ function SendSelectRecipient({ route }: Props) {
   const forceTokenId = route.params?.forceTokenId
   const defaultTokenIdOverride = route.params?.defaultTokenIdOverride
 
-  const [showSendOrInviteButton, setShowSendOrInviteButton] = useState(false)
-
   const [showSearchResults, setShowSearchResults] = useState(false)
 
   const [activeView, setActiveView] = useState(SelectRecipientView.Recent)
 
   const onSearch = (searchQuery: string) => {
-    // Always unset the selected recipient and hide the send/invite button
-    // when the search query is changed in order to prevent edge cases
-    // where the button appears but is bound to a recipient that is
-    // not present on the page.
+    // Clear any in-flight selection so a stale recipient can't auto-navigate
+    // once the user starts typing a different query.
     unsetSelectedRecipient()
-    setShowSendOrInviteButton(false)
     setShowSearchResults(!!searchQuery)
   }
   const { contactRecipients, recentRecipients } = useSendRecipients()
@@ -243,17 +195,31 @@ function SendSelectRecipient({ route }: Props) {
   const { recipientVerificationStatus, recipient, setSelectedRecipient, unsetSelectedRecipient } =
     useFetchRecipientVerificationStatus()
 
-  const showUnknownAddressInfo =
-    showSendOrInviteButton &&
-    showSearchResults &&
-    recipient &&
-    recipient.recipientType !== RecipientType.PhoneNumber &&
-    recipientVerificationStatus === RecipientVerificationStatus.UNVERIFIED
+  useEffect(() => {
+    // Auto-navigate once verification resolves. The picker stays mounted so the
+    // user's search text and selection are preserved when they come back.
+    if (!recipient || recipientVerificationStatus === RecipientVerificationStatus.UNKNOWN) {
+      return
+    }
 
-  const setSelectedRecipientWrapper = (selectedRecipient: Recipient) => {
-    setSelectedRecipient(selectedRecipient)
-    setShowSendOrInviteButton(true)
-  }
+    const isUnverifiedPhone =
+      recipient.recipientType === RecipientType.PhoneNumber &&
+      recipientVerificationStatus === RecipientVerificationStatus.UNVERIFIED
+
+    if (isUnverifiedPhone) {
+      if (shareUrl) {
+        navigate(Screens.SendInvite, { recipient, shareUrl })
+      }
+      // Without shareUrl there's no invite flow and no send flow for an
+      // unverified phone — stay on the picker so the user can pick someone else.
+      return
+    }
+
+    AppAnalytics.track(SendEvents.send_select_recipient_send_press, {
+      recipientType: recipient.recipientType,
+    })
+    nextScreen(recipient)
+  }, [recipient, recipientVerificationStatus, shareUrl])
 
   const onContactsPermissionGranted = () => {
     dispatch(importContacts())
@@ -268,7 +234,6 @@ function SendSelectRecipient({ route }: Props) {
     AppAnalytics.track(SendEvents.send_select_recipient_recent_press, {
       recipientType: recentRecipient.recipientType,
     })
-    setSelectedRecipient(recentRecipient)
     nextScreen(recentRecipient)
   }
 
@@ -320,40 +285,6 @@ function SendSelectRecipient({ route }: Props) {
     })
   }
 
-  const onPressSendOrInvite = async (shouldInviteRecipient: boolean) => {
-    if (!recipient) return
-
-    // Invites
-    if (shouldInviteRecipient) {
-      if (!shareUrl) {
-        Logger.warn('SendSelectRecipient', 'No share URL found for invite')
-        return
-      }
-
-      AppAnalytics.track(SendEvents.send_select_recipient_invite_press, {
-        recipientType: recipient.recipientType,
-      })
-
-      try {
-        await Share.open({
-          message: t('inviteWithSmsMessage.shareMessage', { shareUrl }),
-          url: shareUrl,
-          failOnCancel: false,
-        })
-      } catch (error) {
-        Logger.warn('SendSelectRecipient', 'Share sheet failed', error)
-      }
-
-      return
-    }
-
-    // Sends
-    AppAnalytics.track(SendEvents.send_select_recipient_send_press, {
-      recipientType: recipient.recipientType,
-    })
-    nextScreen(recipient)
-  }
-
   const renderSearchResults = () => {
     if (mergedRecipients.length) {
       return (
@@ -362,7 +293,7 @@ function SendSelectRecipient({ route }: Props) {
           <RecipientPicker
             testID={'SelectRecipient/AllRecipientsPicker'}
             recipients={mergedRecipients}
-            onSelectRecipient={setSelectedRecipientWrapper}
+            onSelectRecipient={setSelectedRecipient}
             selectedRecipient={recipient}
             isSelectedRecipientLoading={
               !!recipient && recipientVerificationStatus === RecipientVerificationStatus.UNKNOWN
@@ -409,7 +340,7 @@ function SendSelectRecipient({ route }: Props) {
           <RecipientPicker
             testID={'SelectRecipient/ContactRecipientPicker'}
             recipients={contactRecipients}
-            onSelectRecipient={setSelectedRecipientWrapper}
+            onSelectRecipient={setSelectedRecipient}
             selectedRecipient={recipient}
             isSelectedRecipientLoading={
               !!recipient && recipientVerificationStatus === RecipientVerificationStatus.UNKNOWN
@@ -439,22 +370,6 @@ function SendSelectRecipient({ route }: Props) {
           </>
         )}
       </KeyboardAwareScrollView>
-      {showUnknownAddressInfo && (
-        <InLineNotification
-          variant={NotificationVariant.Info}
-          description={t('sendSelectRecipient.unknownAddressInfo')}
-          testID="UnknownAddressInfo"
-          style={styles.unknownAddressInfo}
-        />
-      )}
-      {showSendOrInviteButton && (
-        <SendOrInviteButton
-          recipient={recipient}
-          recipientVerificationStatus={recipientVerificationStatus}
-          onPress={onPressSendOrInvite}
-          shareUrl={shareUrl}
-        />
-      )}
     </SafeAreaView>
   )
 }
@@ -496,14 +411,6 @@ const styles = StyleSheet.create({
     padding: Spacing.Regular16,
     textAlign: 'center',
   },
-  unknownAddressInfo: {
-    margin: Spacing.Regular16,
-    marginBottom: variables.contentPadding,
-  },
-  sendOrInviteButton: {
-    margin: Spacing.Regular16,
-    marginTop: variables.contentPadding,
-  },
 })
 
 export default SendSelectRecipient