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

package/src/send/SelectRecipientAddress.test.tsx

@@ -0,0 +1,146 @@
+import { fireEvent, render } from '@testing-library/react-native'
+import * as React from 'react'
+import { Provider } from 'react-redux'
+import AppAnalytics from 'src/analytics/AppAnalytics'
+import { SendEvents } from 'src/analytics/Events'
+import { SendOrigin } from 'src/analytics/types'
+import { navigate } from 'src/navigator/NavigationService'
+import { Screens } from 'src/navigator/Screens'
+import { RecipientType } from 'src/recipients/recipient'
+import SelectRecipientAddress from 'src/send/SelectRecipientAddress'
+import { createMockStore, getMockStackScreenProps } from 'test/utils'
+import { mockAccount2, mockAccount3, mockE164Number3 } from 'test/values'
+
+const mockRecipient = {
+  e164PhoneNumber: mockE164Number3,
+  displayNumber: '(415) 555-0123',
+  recipientType: RecipientType.PhoneNumber,
+} as const
+
+function renderScreen(storeOverrides: any) {
+  const store = createMockStore({
+    identity: {
+      e164NumberToAddress: {
+        [mockE164Number3]: [mockAccount2.toLowerCase(), mockAccount3.toLowerCase()],
+      },
+      addressToVerifiedBy: {
+        [mockAccount2.toLowerCase()]: 'valora',
+        [mockAccount3.toLowerCase()]: 'minipay',
+      },
+      ...storeOverrides?.identity,
+    },
+  })
+
+  const props = getMockStackScreenProps(Screens.SelectRecipientAddress, {
+    recipient: mockRecipient,
+    origin: SendOrigin.AppSendFlow,
+  })
+
+  return render(
+    <Provider store={store}>
+      <SelectRecipientAddress {...props} />
+    </Provider>
+  )
+}
+
+describe('SelectRecipientAddress', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
+
+  it('renders a row per verified address with its verifier label', () => {
+    const { getByText, getByTestId } = renderScreen({})
+
+    expect(getByTestId(`SelectRecipientAddress/Row/${mockAccount2.toLowerCase()}`)).toBeTruthy()
+    expect(getByTestId(`SelectRecipientAddress/Row/${mockAccount3.toLowerCase()}`)).toBeTruthy()
+    expect(getByText('Valora')).toBeTruthy()
+    expect(getByText('MiniPay')).toBeTruthy()
+    expect(
+      getByText(`selectRecipientAddress.explanation, {"name":"${mockRecipient.displayNumber}"}`)
+    ).toBeTruthy()
+  })
+
+  it('tracks the screen-open event with the number of verified addresses', () => {
+    renderScreen({})
+
+    expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_address_open, {
+      addressCount: 2,
+    })
+  })
+
+  it('filters out addresses without a verifier entry', () => {
+    const { queryByTestId } = renderScreen({
+      identity: {
+        e164NumberToAddress: {
+          [mockE164Number3]: [mockAccount2.toLowerCase(), mockAccount3.toLowerCase()],
+        },
+        addressToVerifiedBy: {
+          [mockAccount2.toLowerCase()]: 'valora',
+          // mockAccount3 intentionally omitted
+        },
+      },
+    })
+
+    expect(queryByTestId(`SelectRecipientAddress/Row/${mockAccount2.toLowerCase()}`)).toBeTruthy()
+    expect(queryByTestId(`SelectRecipientAddress/Row/${mockAccount3.toLowerCase()}`)).toBeNull()
+  })
+
+  it('filters out addresses with an unknown verifier', () => {
+    const { queryByTestId } = renderScreen({
+      identity: {
+        e164NumberToAddress: {
+          [mockE164Number3]: [mockAccount2.toLowerCase(), mockAccount3.toLowerCase()],
+        },
+        addressToVerifiedBy: {
+          [mockAccount2.toLowerCase()]: 'valora',
+          [mockAccount3.toLowerCase()]: 'somethingNew',
+        },
+      },
+    })
+
+    expect(queryByTestId(`SelectRecipientAddress/Row/${mockAccount2.toLowerCase()}`)).toBeTruthy()
+    expect(queryByTestId(`SelectRecipientAddress/Row/${mockAccount3.toLowerCase()}`)).toBeNull()
+  })
+
+  it('navigates to SendEnterAmount on Valora row tap with isMiniPayRecipient=false', () => {
+    const { getByTestId } = renderScreen({})
+    fireEvent.press(getByTestId(`SelectRecipientAddress/Row/${mockAccount2.toLowerCase()}`))
+
+    expect(navigate).toHaveBeenCalledWith(Screens.SendEnterAmount, {
+      isFromScan: false,
+      defaultTokenIdOverride: undefined,
+      forceTokenId: undefined,
+      recipient: {
+        ...mockRecipient,
+        address: mockAccount2.toLowerCase(),
+      },
+      origin: SendOrigin.AppSendFlow,
+      isMiniPayRecipient: false,
+    })
+    expect(AppAnalytics.track).toHaveBeenCalledWith(
+      SendEvents.send_select_recipient_address_select,
+      { verifier: 'valora' }
+    )
+  })
+
+  it('navigates to SendEnterAmount on MiniPay row tap with isMiniPayRecipient=true', () => {
+    const { getByTestId } = renderScreen({})
+    fireEvent.press(getByTestId(`SelectRecipientAddress/Row/${mockAccount3.toLowerCase()}`))
+
+    expect(navigate).toHaveBeenCalledWith(Screens.SendEnterAmount, {
+      isFromScan: false,
+      defaultTokenIdOverride: undefined,
+      forceTokenId: undefined,
+      recipient: {
+        ...mockRecipient,
+        address: mockAccount3.toLowerCase(),
+      },
+      origin: SendOrigin.AppSendFlow,
+      isMiniPayRecipient: true,
+    })
+    expect(AppAnalytics.track).toHaveBeenCalledWith(
+      SendEvents.send_select_recipient_address_select,
+      { verifier: 'minipay' }
+    )
+  })
+})

package/src/send/SelectRecipientAddress.tsx

@@ -0,0 +1,166 @@
+import { NativeStackScreenProps } from '@react-navigation/native-stack'
+import React, { useEffect } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { Image, ScrollView, StyleSheet, Text, View } from 'react-native'
+import { SafeAreaView } from 'react-native-safe-area-context'
+import { formatShortenedAddress } from 'src/account/utils'
+import AppAnalytics from 'src/analytics/AppAnalytics'
+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 { 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 { useSelector } from 'src/redux/hooks'
+import Colors from 'src/styles/colors'
+import { typeScale } from 'src/styles/fonts'
+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" />
+}
+
+function SelectRecipientAddress({ route }: Props) {
+  const { t } = useTranslation()
+  const { recipient, origin, forceTokenId, defaultTokenIdOverride } = route.params
+
+  const e164NumberToAddress = useSelector(e164NumberToAddressSelector)
+  const addressToVerifiedBy = useSelector(addressToVerifiedBySelector)
+
+  const addresses = e164NumberToAddress[recipient.e164PhoneNumber] || []
+  const verifiedEntries = addresses
+    .map((address) => ({ address, verifier: addressToVerifiedBy[address] }))
+    .filter((entry): entry is { address: string; verifier: Verifier } =>
+      isKnownVerifier(entry.verifier)
+    )
+
+  useEffect(() => {
+    AppAnalytics.track(SendEvents.send_select_recipient_address_open, {
+      addressCount: verifiedEntries.length,
+    })
+  }, [])
+
+  const onSelectAddress = (address: string, verifier: Verifier) => {
+    AppAnalytics.track(SendEvents.send_select_recipient_address_select, {
+      verifier,
+    })
+    navigate(Screens.SendEnterAmount, {
+      isFromScan: false,
+      defaultTokenIdOverride,
+      forceTokenId,
+      recipient: {
+        ...recipient,
+        address,
+      },
+      origin,
+      isMiniPayRecipient: verifier === 'minipay',
+    })
+  }
+
+  return (
+    <SafeAreaView style={styles.container} edges={['top']}>
+      <CustomHeader
+        style={styles.customHeader}
+        left={<BackButton eventName={SendEvents.send_select_recipient_address_back} />}
+      />
+      <ScrollView contentContainerStyle={styles.scrollContent}>
+        <Text style={styles.title}>{t('selectRecipientAddress.header')}</Text>
+        <Text style={styles.explanation}>
+          <Trans
+            i18nKey="selectRecipientAddress.explanation"
+            tOptions={{ name: getDisplayName(recipient, t) }}
+          >
+            <Text style={styles.explanationName} />
+          </Trans>
+        </Text>
+        {verifiedEntries.map(({ address, verifier }) => (
+          <Touchable
+            key={address}
+            onPress={() => onSelectAddress(address, verifier)}
+            testID={`SelectRecipientAddress/Row/${address}`}
+          >
+            <View style={styles.row}>
+              <VerifierIcon verifier={verifier} />
+              <View style={styles.rowContent}>
+                <Text style={styles.address}>{formatShortenedAddress(address)}</Text>
+                <Text style={styles.verifier}>{VERIFIERS[verifier].name}</Text>
+              </View>
+            </View>
+          </Touchable>
+        ))}
+      </ScrollView>
+    </SafeAreaView>
+  )
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  customHeader: {
+    paddingHorizontal: Spacing.Thick24,
+  },
+  scrollContent: {
+    paddingBottom: Spacing.Smallest8,
+  },
+  title: {
+    ...typeScale.titleMedium,
+    paddingHorizontal: Spacing.Regular16,
+    paddingTop: Spacing.Thick24,
+    marginBottom: Spacing.Smallest8,
+  },
+  explanation: {
+    ...typeScale.bodySmall,
+    color: Colors.contentSecondary,
+    paddingHorizontal: Spacing.Regular16,
+    paddingBottom: Spacing.Regular16,
+  },
+  explanationName: {
+    fontWeight: 'bold',
+  },
+  icon: {
+    width: ICON_SIZE,
+    height: ICON_SIZE,
+  },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: Spacing.Regular16,
+    paddingVertical: Spacing.Regular16,
+  },
+  rowContent: {
+    flex: 1,
+    marginLeft: Spacing.Small12,
+  },
+  address: {
+    ...typeScale.labelMedium,
+  },
+  verifier: {
+    ...typeScale.bodySmall,
+    color: Colors.contentSecondary,
+  },
+})
+
+SelectRecipientAddress.navigationOptions = noHeader
+
+export default SelectRecipientAddress

package/src/send/SendSelectRecipient.test.tsx

@@ -7,7 +7,6 @@ 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 { AddressValidationType } from 'src/identity/reducer'
 import { RecipientVerificationStatus } from 'src/identity/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -476,9 +475,6 @@ describe('SendSelectRecipient', () => {
     const store = createMockStore({
       ...storeWithPhoneVerified,
       identity: {
-        secureSendPhoneNumberMapping: {
-          [mockE164Number3]: { addressValidationType: AddressValidationType.NONE },
-        },
         e164NumberToAddress: { [mockE164Number3]: [mockAccount3] },
       },
     })
@@ -522,9 +518,6 @@ describe('SendSelectRecipient', () => {
     const store = createMockStore({
       ...storeWithPhoneVerified,
       identity: {
-        secureSendPhoneNumberMapping: {
-          [mockE164Number3]: { addressValidationType: AddressValidationType.NONE },
-        },
         e164NumberToAddress: { [mockE164Number3]: [mockAccount3] },
         addressToVerifiedBy: { [mockAccount3]: 'minipay' },
       },
@@ -558,7 +551,7 @@ describe('SendSelectRecipient', () => {
       isMiniPayRecipient: true,
     })
   })
-  it('navigates to secure send flow when phone recipient has multiple addresses, first time seeing it', async () => {
+  it('navigates to address picker when phone number recipient has multiple verified addresses', async () => {
     jest
       .mocked(getRecipientVerificationStatus)
       .mockReturnValue(RecipientVerificationStatus.VERIFIED)
@@ -566,9 +559,6 @@ describe('SendSelectRecipient', () => {
     const store = createMockStore({
       ...storeWithPhoneVerified,
       identity: {
-        secureSendPhoneNumberMapping: {
-          [mockE164Number3]: { addressValidationType: AddressValidationType.PARTIAL },
-        },
         e164NumberToAddress: {
           [mockE164Number3]: [mockAccount2.toLowerCase(), mockAccount3.toLowerCase()],
         },
@@ -576,6 +566,10 @@ describe('SendSelectRecipient', () => {
           [mockAccount2.toLowerCase()]: mockE164Number3,
           [mockAccount3.toLowerCase()]: mockE164Number3,
         },
+        addressToVerifiedBy: {
+          [mockAccount2.toLowerCase()]: 'valora',
+          [mockAccount3.toLowerCase()]: 'minipay',
+        },
       },
     })
 
@@ -596,14 +590,14 @@ describe('SendSelectRecipient', () => {
     expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
       recipientType: RecipientType.PhoneNumber,
     })
-    expect(navigate).toHaveBeenCalledWith(Screens.ValidateRecipientIntro, {
+    expect(navigate).toHaveBeenCalledWith(Screens.SelectRecipientAddress, {
       defaultTokenIdOverride: undefined,
       forceTokenId: undefined,
       recipient: expect.any(Object),
       origin: SendOrigin.AppSendFlow,
     })
   })
-  it('navigates to send amount when phone recipient has multiple addresses and secure send was already done', async () => {
+  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)
@@ -611,12 +605,6 @@ describe('SendSelectRecipient', () => {
     const store = createMockStore({
       ...storeWithPhoneVerified,
       identity: {
-        secureSendPhoneNumberMapping: {
-          [mockE164Number3]: {
-            addressValidationType: AddressValidationType.NONE,
-            address: mockAccount3,
-          },
-        },
         e164NumberToAddress: {
           [mockE164Number3]: [mockAccount2.toLowerCase(), mockAccount3.toLowerCase()],
         },
@@ -624,6 +612,9 @@ describe('SendSelectRecipient', () => {
           [mockAccount2.toLowerCase()]: mockE164Number3,
           [mockAccount3.toLowerCase()]: mockE164Number3,
         },
+        addressToVerifiedBy: {
+          [mockAccount3.toLowerCase()]: 'valora',
+        },
       },
     })
 
@@ -649,7 +640,7 @@ describe('SendSelectRecipient', () => {
       defaultTokenIdOverride: undefined,
       forceTokenId: undefined,
       recipient: {
-        address: mockAccount3,
+        address: mockAccount3.toLowerCase(),
         displayNumber: '(415) 555-0123',
         e164PhoneNumber: mockE164Number3,
         recipientType: 'PhoneNumber',
@@ -659,7 +650,7 @@ describe('SendSelectRecipient', () => {
     })
   })
   it.each([{ searchAddress: mockAccount2 }, { searchAddress: mockAccount3 }])(
-    'navigates to send enter amount with correct address if a an address is entered which also has a phone number with secure send not done',
+    '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)
@@ -668,11 +659,6 @@ describe('SendSelectRecipient', () => {
       const store = createMockStore({
         ...storeWithPhoneVerified,
         identity: {
-          secureSendPhoneNumberMapping: {
-            [mockE164Number3]: {
-              addressValidationType: AddressValidationType.PARTIAL,
-            },
-          },
           e164NumberToAddress: {
             [mockE164Number3]: [mockAccount2.toLowerCase(), mockAccount3.toLowerCase()],
           },
@@ -680,66 +666,9 @@ describe('SendSelectRecipient', () => {
             [mockAccount2.toLowerCase()]: mockE164Number3,
             [mockAccount3.toLowerCase()]: mockE164Number3,
           },
-        },
-      })
-
-      const { getByTestId } = render(
-        <Provider store={store}>
-          <SendSelectRecipient {...mockScreenProps({})} />
-        </Provider>
-      )
-      const searchInput = getByTestId('SendSelectRecipientSearchInput')
-
-      await act(() => {
-        fireEvent.changeText(searchInput, searchAddress)
-      })
-      await act(() => {
-        fireEvent.press(getByTestId('RecipientItem'))
-      })
-
-      expect(AppAnalytics.track).toHaveBeenCalledWith(SendEvents.send_select_recipient_send_press, {
-        recipientType: RecipientType.Address,
-      })
-      expect(navigate).toHaveBeenCalledWith(Screens.SendEnterAmount, {
-        isFromScan: false,
-        defaultTokenIdOverride: undefined,
-        forceTokenId: undefined,
-        recipient: {
-          address: searchAddress.toLowerCase(),
-          e164PhoneNumber: mockE164Number3,
-          recipientType: RecipientType.Address,
-          contactId: undefined,
-          displayNumber: undefined,
-          name: undefined,
-          thumbnailPath: undefined,
-        },
-        origin: SendOrigin.AppSendFlow,
-        isMiniPayRecipient: false,
-      })
-    }
-  )
-  it.each([{ searchAddress: mockAccount2 }, { searchAddress: mockAccount3 }])(
-    'navigates to send enter amount with correct address if a an address is entered which also has a phone number with secure send done with different address',
-    async ({ searchAddress }) => {
-      jest
-        .mocked(getRecipientVerificationStatus)
-        .mockReturnValue(RecipientVerificationStatus.VERIFIED)
-
-      const store = createMockStore({
-        ...storeWithPhoneVerified,
-        identity: {
-          secureSendPhoneNumberMapping: {
-            [mockE164Number3]: {
-              addressValidationType: AddressValidationType.NONE,
-              address: mockAccount3,
-            },
-          },
-          e164NumberToAddress: {
-            [mockE164Number3]: [mockAccount2.toLowerCase(), mockAccount3.toLowerCase()],
-          },
-          addressToE164Number: {
-            [mockAccount2.toLowerCase()]: mockE164Number3,
-            [mockAccount3.toLowerCase()]: mockE164Number3,
+          addressToVerifiedBy: {
+            [mockAccount2.toLowerCase()]: 'valora',
+            [mockAccount3.toLowerCase()]: 'minipay',
           },
         },
       })
@@ -775,7 +704,7 @@ describe('SendSelectRecipient', () => {
           thumbnailPath: undefined,
         },
         origin: SendOrigin.AppSendFlow,
-        isMiniPayRecipient: false,
+        isMiniPayRecipient: searchAddress.toLowerCase() === mockAccount3.toLowerCase(),
       })
     }
   )

package/src/send/SendSelectRecipient.tsx

@@ -14,14 +14,7 @@ import KeyboardAwareScrollView from 'src/components/KeyboardAwareScrollView'
 import CustomHeader from 'src/components/header/CustomHeader'
 import CircledIcon from 'src/icons/CircledIcon'
 import { importContacts } from 'src/identity/actions'
-import { getAddressFromPhoneNumber } from 'src/identity/contactMapping'
-import { AddressValidationType } from 'src/identity/reducer'
-import { getAddressValidationType } from 'src/identity/secureSend'
-import {
-  addressToVerifiedBySelector,
-  e164NumberToAddressSelector,
-  secureSendPhoneNumberMappingSelector,
-} from 'src/identity/selectors'
+import { addressToVerifiedBySelector, e164NumberToAddressSelector } from 'src/identity/selectors'
 import { RecipientVerificationStatus } from 'src/identity/types'
 import { noHeader } from 'src/navigator/Headers'
 import { navigate } from 'src/navigator/NavigationService'
@@ -171,7 +164,6 @@ enum SelectRecipientView {
 function SendSelectRecipient({ route }: Props) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
-  const secureSendPhoneNumberMapping = useSelector(secureSendPhoneNumberMappingSelector)
   const e164NumberToAddress = useSelector(e164NumberToAddressSelector)
   const addressToVerifiedBy = useSelector(addressToVerifiedBySelector)
   const shareUrl = getAppConfig().experimental?.inviteFriends?.shareUrl ?? null
@@ -241,35 +233,28 @@ function SendSelectRecipient({ route }: Props) {
     // use the address from the recipient object
     let address: string | null | undefined = selectedRecipient.address
 
-    // if not present there must be a phone number, route through secure send or get
-    // the secure send mapped address
+    // if not present there must be a phone number, route through the address picker
+    // when multiple verified addresses exist, otherwise go directly to amount entry
     if (!address && recipientHasNumber(selectedRecipient)) {
-      const addressValidationType: AddressValidationType = getAddressValidationType(
-        selectedRecipient,
-        secureSendPhoneNumberMapping
-      )
-      if (addressValidationType !== AddressValidationType.NONE) {
-        navigate(Screens.ValidateRecipientIntro, {
-          defaultTokenIdOverride,
+      const phoneAddresses = e164NumberToAddress[selectedRecipient.e164PhoneNumber] ?? []
+      const verifiedAddresses = phoneAddresses.filter((a) => !!addressToVerifiedBy[a])
+
+      if (verifiedAddresses.length > 1) {
+        navigate(Screens.SelectRecipientAddress, {
           forceTokenId,
+          defaultTokenIdOverride,
           recipient: selectedRecipient,
           origin: SendOrigin.AppSendFlow,
         })
         return
       }
-      address = getAddressFromPhoneNumber(
-        selectedRecipient.e164PhoneNumber,
-        e164NumberToAddress,
-        secureSendPhoneNumberMapping,
-        undefined
-      )
+
+      address = verifiedAddresses[0] ?? phoneAddresses[0]
     }
 
     if (!address) {
       // this should never happen
-      throw new Error(
-        'No address found, this should never happen. Should have routed to invite or secure send.'
-      )
+      throw new Error('No address found, this should never happen. Should have routed to invite.')
     }
 
     navigate(Screens.SendEnterAmount, {

package/src/send/actions.ts

@@ -9,7 +9,6 @@ export type SVG = typeof Svg
 
 export enum Actions {
   BARCODE_DETECTED = 'SEND/BARCODE_DETECTED',
-  BARCODE_DETECTED_SECURE_SEND = 'SEND/BARCODE_DETECTED_SECURE_SEND',
   QRCODE_SHARE = 'SEND/QRCODE_SHARE',
   SEND_PAYMENT = 'SEND/SEND_PAYMENT',
   SEND_PAYMENT_SUCCESS = 'SEND/SEND_PAYMENT_SUCCESS',
@@ -23,15 +22,6 @@ export interface HandleQRCodeDetectedAction {
   defaultTokenIdOverride?: string
 }
 
-export interface HandleQRCodeDetectedSecureSendAction {
-  type: Actions.BARCODE_DETECTED_SECURE_SEND
-  qrCode: QrCode
-  requesterAddress?: string
-  recipient: Recipient
-  forceTokenId?: boolean
-  defaultTokenIdOverride?: string
-}
-
 export interface ShareQRCodeAction {
   type: Actions.QRCODE_SHARE
   qrCodeSvg: SVG
@@ -64,7 +54,6 @@ export interface UpdateLastUsedCurrencyAction {
 
 export type ActionTypes =
   | HandleQRCodeDetectedAction
-  | HandleQRCodeDetectedSecureSendAction
   | ShareQRCodeAction
   | SendPaymentAction
   | SendPaymentSuccessAction
@@ -83,21 +72,6 @@ export const handleQRCodeDetected = ({
   defaultTokenIdOverride,
 })
 
-export const handleQRCodeDetectedSecureSend = (
-  qrCode: QrCode,
-  recipient: Recipient,
-  requesterAddress?: string,
-  forceTokenId?: boolean,
-  defaultTokenIdOverride?: string
-): HandleQRCodeDetectedSecureSendAction => ({
-  type: Actions.BARCODE_DETECTED_SECURE_SEND,
-  qrCode,
-  requesterAddress,
-  recipient,
-  forceTokenId,
-  defaultTokenIdOverride,
-})
-
 export const shareQRCode = (qrCodeSvg: SVG): ShareQRCodeAction => ({
   type: Actions.QRCODE_SHARE,
   qrCodeSvg,

package/src/send/saga.ts

@@ -3,7 +3,7 @@ import AppAnalytics from 'src/analytics/AppAnalytics'
 import { CeloExchangeEvents, SendEvents } from 'src/analytics/Events'
 import { ErrorMessages } from 'src/app/ErrorMessages'
 import { navigateBack, navigateInitialTab } from 'src/navigator/NavigationService'
-import { handleQRCodeDefault, handleQRCodeSecureSend, shareSVGImage } from 'src/qrcode/utils'
+import { handleQRCodeDefault, shareSVGImage } from 'src/qrcode/utils'
 import {
   Actions,
   SendPaymentAction,
@@ -164,12 +164,7 @@ function* watchQrCodeDetections() {
   yield* takeEvery(Actions.BARCODE_DETECTED, safely(handleQRCodeDefault))
 }
 
-function* watchQrCodeDetectionsSecureSend() {
-  yield* takeEvery(Actions.BARCODE_DETECTED_SECURE_SEND, safely(handleQRCodeSecureSend))
-}
-
 export function* sendSaga() {
-  yield* spawn(watchQrCodeDetectionsSecureSend)
   yield* spawn(watchQrCodeDetections)
   yield* spawn(watchQrCodeShare)
   yield* spawn(watchSendPayment)

package/src/components/AccountNumberCard.tsx

@@ -1,23 +0,0 @@
-import React from 'react'
-import { StyleSheet, ViewStyle } from 'react-native'
-import AccountNumber from 'src/components/AccountNumber'
-import Card from 'src/components/Card'
-
-interface Props {
-  address: string
-  style?: ViewStyle
-}
-
-export default function AccountNumberCard({ address, style }: Props) {
-  return (
-    <Card style={[styles.container, style]} rounded={true}>
-      <AccountNumber address={address} touchDisabled={true} />
-    </Card>
-  )
-}
-
-const styles = StyleSheet.create({
-  container: {
-    justifyContent: 'center',
-  },
-})