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

package/locales/base/translation.json

@@ -2169,6 +2169,11 @@
     "importSuccess": "Successfully imported {{tokenSymbol}} token",
     "importButton": "Import"
   },
+  "selectRecipientAddress": {
+    "header": "Select wallet",
+    "recipient": "Recipient",
+    "explanation": "<0>{{name}}</0> has more than one wallet linked to the phone number. Choose which one to send to."
+  },
   "sendSelectRecipient": {
     "searchText": "Search by name, phone, wallet...",
     "searchInputLabel": "To",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wallet-stack",
-  "version": "1.0.0-alpha.132",
+  "version": "1.0.0-alpha.134",
   "author": "Valora Inc",
   "license": "Apache-2.0",
   "repository": {
@@ -148,7 +148,6 @@
     "bignumber.js": "^9.1.2",
     "country-data": "^0.0.31",
     "date-fns": "^4.1.0",
-    "dot-prop-immutable": "^2.1.1",
     "expo": "^53.0.22",
     "expo-image": "~2.4.0",
     "fast-levenshtein": "^3.0.0",

package/src/analytics/Events.tsx

@@ -269,16 +269,6 @@ export enum SendEvents {
   send_confirm_back = 'send_confirm_back',
   send_confirm_send = 'send_confirm_send',
 
-  send_secure_start = 'send_secure_start',
-  send_secure_back = 'send_secure_back',
-  send_secure_cancel = 'send_secure_cancel',
-
-  send_secure_info = 'send_secure_info',
-  send_secure_info_dismissed = 'send_secure_info_dismissed',
-  send_secure_submit = 'send_secure_submit',
-  send_secure_incorrect = 'send_secure_incorrect',
-  send_secure_complete = 'send_secure_complete',
-
   send_tx_start = 'send_tx_start',
   send_tx_complete = 'send_tx_complete',
   send_tx_error = 'send_tx_error',
@@ -305,6 +295,9 @@ export enum SendEvents {
   send_select_recipient_invite_press = 'send_select_recipient_invite_press',
   send_select_recipient_send_press = 'send_select_recipient_send_press',
   send_select_recipient_recent_press = 'send_select_recipient_recent_press',
+  send_select_recipient_address_open = 'send_select_recipient_address_open',
+  send_select_recipient_address_select = 'send_select_recipient_address_select',
+  send_select_recipient_address_back = 'send_select_recipient_address_back',
 }
 
 export enum QrScreenEvents {

package/src/analytics/Properties.tsx

@@ -71,6 +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/recipients/verifier'
 import { AmountEnteredIn, QrCode } from 'src/send/types'
 import { Field, SwapType } from 'src/swap/types'
 import { TokenActionName } from 'src/tokens/types'
@@ -521,31 +522,6 @@ interface SendEventsProperties {
         isTokenManuallyImported: boolean
       }
 
-  [SendEvents.send_secure_start]: {
-    confirmByScan: boolean
-  }
-  [SendEvents.send_secure_back]: undefined
-  [SendEvents.send_secure_cancel]: undefined
-  [SendEvents.send_secure_submit]: {
-    partialAddressValidation: boolean
-    address: string
-  }
-  [SendEvents.send_secure_complete]: {
-    confirmByScan: boolean
-    partialAddressValidation?: boolean
-  }
-  [SendEvents.send_secure_incorrect]: {
-    confirmByScan: boolean
-    partialAddressValidation?: boolean
-    error: string
-  }
-  [SendEvents.send_secure_info]: {
-    partialAddressValidation: boolean
-  }
-  [SendEvents.send_secure_info_dismissed]: {
-    partialAddressValidation: boolean
-  }
-
   [SendEvents.send_tx_start]: undefined
   [SendEvents.send_tx_complete]: {
     txId: string
@@ -605,6 +581,14 @@ interface SendEventsProperties {
   [SendEvents.send_select_recipient_recent_press]: {
     recipientType: RecipientType
   }
+
+  [SendEvents.send_select_recipient_address_open]: {
+    addressCount: number
+  }
+  [SendEvents.send_select_recipient_address_select]: {
+    verifier: Verifier
+  }
+  [SendEvents.send_select_recipient_address_back]: undefined
 }
 
 interface FeeEventsProperties {

package/src/analytics/docs.ts

@@ -259,14 +259,6 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [SendEvents.send_amount_continue]: `when next button pressed on amount enter page`,
   [SendEvents.send_confirm_back]: `when back button pressed on send confirmation screen`,
   [SendEvents.send_confirm_send]: `when send button pressed on send confirmation screen`,
-  [SendEvents.send_secure_start]: `when either secure send scan or manual confirm button pressed`,
-  [SendEvents.send_secure_back]: `when back button is pressed during secure send`,
-  [SendEvents.send_secure_cancel]: `when secure send flow is canceled`,
-  [SendEvents.send_secure_info]: `when "help" button is pressed`,
-  [SendEvents.send_secure_info_dismissed]: `when "help" button is dismissed`,
-  [SendEvents.send_secure_submit]: `when an account is submitted for validation`,
-  [SendEvents.send_secure_incorrect]: `when there's been an error validating the account`,
-  [SendEvents.send_secure_complete]: `when an account has been validated`,
   [SendEvents.send_tx_start]: `issued from the sendPayment saga, after a user confirms their intent to send and right before we build and send the transaction to the network`,
   [SendEvents.send_tx_complete]: `when a send transaction has successfully completed`,
   [SendEvents.send_tx_error]: `when there is an error sending a transaction`,
@@ -292,6 +284,9 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [SendEvents.send_select_recipient_send_press]: `When the send button is pressed after selecting a recipient`,
   [SendEvents.send_select_recipient_invite_press]: `When the invite button is pressed after selecting a recipient`,
   [SendEvents.send_select_recipient_recent_press]: `When a recent recipient is pressed`,
+  [SendEvents.send_select_recipient_address_open]: `When the address picker screen is shown (a phone recipient has multiple verified addresses)`,
+  [SendEvents.send_select_recipient_address_select]: `When a verified address is picked from the address picker screen`,
+  [SendEvents.send_select_recipient_address_back]: `When the back button is pressed on the address picker screen`,
   [JumpstartEvents.jumpstart_reclaim_press]:
     'When user taps on "Reclaim" button on the Jumpstart screen',
   [JumpstartEvents.jumpstart_reclaim_start]:
@@ -578,6 +573,14 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
 
   // Legacy event docs
   //  The below events had docs, but are no longer produced by the latest app version.
+  // [SendEvents.send_secure_start]: `when either secure send scan or manual confirm button pressed`,
+  // [SendEvents.send_secure_back]: `when back button is pressed during secure send`,
+  // [SendEvents.send_secure_cancel]: `when secure send flow is canceled`,
+  // [SendEvents.send_secure_info]: `when "help" button is pressed`,
+  // [SendEvents.send_secure_info_dismissed]: `when "help" button is dismissed`,
+  // [SendEvents.send_secure_submit]: `when an account is submitted for validation`,
+  // [SendEvents.send_secure_incorrect]: `when there's been an error validating the account`,
+  // [SendEvents.send_secure_complete]: `when an account has been validated`,
   // [HomeEvents.home_send]: `when "send" button is pressed from home screen send or request bar (NOT from home screen actions)`,
   // [HomeEvents.view_nft_home_assets]: `When "NFTs" is clicked in Home Assets Pages`,
   // [DappExplorerEvents.dapp_open_info]: `when a user taps on the help icon`,

package/src/app/ErrorMessages.ts

@@ -16,13 +16,6 @@ export enum ErrorMessages {
   FIREBASE_FAILED = 'firebaseFailed',
   IMPORT_CONTACTS_FAILED = 'importContactsFailed',
   QR_FAILED_INVALID_ADDRESS = 'qrFailedInvalidAddress',
-  QR_FAILED_INVALID_RECIPIENT = 'qrFailedInvalidRecipient',
-  ADDRESS_VALIDATION_ERROR = 'addressValidationError',
-  ADDRESS_VALIDATION_NO_MATCH = 'addressValidationNoMatch',
-  ADDRESS_VALIDATION_FULL_POORLY_FORMATTED = 'addressValidationFullPoorlyFormatted',
-  ADDRESS_VALIDATION_PARTIAL_POORLY_FORMATTED = 'addressValidationPartialPoorlyFormatted',
-  ADDRESS_VALIDATION_FULL_OWN_ADDRESS = 'addressValidationFullOwnAddress',
-  ADDRESS_VALIDATION_PARTIAL_OWN_ADDRESS = 'addressValidationPartialOwnAddress',
   ACCOUNT_CLEAR_FAILED = 'accountClearFailed',
   KEYCHAIN_FETCH_ACCOUNTS = 'keychainFetchAccounts',
   KEYCHAIN_ACCOUNT_ALREADY_EXISTS = 'keychainAccountAlreadyExists',

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

@@ -2,28 +2,19 @@ import {
   AddressToDisplayNameType,
   AddressToE164NumberType,
   AddressToVerifiedByType,
-  AddressValidationType,
   E164NumberToAddressType,
 } from 'src/identity/reducer'
 import { ImportContactsStatus } from 'src/identity/types'
-import { Recipient } from 'src/recipients/recipient'
-import { type E164Number } from 'src/utils/io'
 
 export enum Actions {
   UPDATE_E164_PHONE_NUMBER_ADDRESSES = 'IDENTITY/UPDATE_E164_PHONE_NUMBER_ADDRESSES',
   UPDATE_KNOWN_ADDRESSES = 'IDENTITY/UPDATE_KNOWN_ADDRESSES',
   FETCH_ADDRESSES_AND_VALIDATION_STATUS = 'IDENTITY/FETCH_ADDRESSES_AND_VALIDATION_STATUS',
-  END_FETCHING_ADDRESSES = 'IDENTITY/END_FETCHING_ADDRESSES',
   IMPORT_CONTACTS = 'IDENTITY/IMPORT_CONTACTS',
   UPDATE_IMPORT_CONTACT_PROGRESS = 'IDENTITY/UPDATE_IMPORT_CONTACT_PROGRESS',
   CANCEL_IMPORT_CONTACTS = 'IDENTITY/CANCEL_IMPORT_CONTACTS',
   END_IMPORT_CONTACTS = 'IDENTITY/END_IMPORT_CONTACTS',
-  VALIDATE_RECIPIENT_ADDRESS = 'IDENTITY/VALIDATE_RECIPIENT_ADDRESS',
-  VALIDATE_RECIPIENT_ADDRESS_SUCCESS = 'IDENTITY/VALIDATE_RECIPIENT_ADDRESS_SUCCESS',
-  VALIDATE_RECIPIENT_ADDRESS_RESET = 'IDENTITY/VALIDATE_RECIPIENT_ADDRESS_RESET',
-  REQUIRE_SECURE_SEND = 'IDENTITY/REQUIRE_SECURE_SEND',
   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',
 }
@@ -43,13 +34,6 @@ export interface UpdateKnownAddressesAction {
 export interface FetchAddressesAndValidateAction {
   type: Actions.FETCH_ADDRESSES_AND_VALIDATION_STATUS
   e164Number: string
-  requesterAddress?: string
-}
-
-export interface EndFetchingAddressesAction {
-  type: Actions.END_FETCHING_ADDRESSES
-  e164Number: string
-  lastFetchSuccessful: boolean
 }
 
 export interface ImportContactsAction {
@@ -68,42 +52,11 @@ export interface EndImportContactsAction {
   success: boolean
 }
 
-export interface ValidateRecipientAddressAction {
-  type: Actions.VALIDATE_RECIPIENT_ADDRESS
-  userInputOfFullAddressOrLastFourDigits: string
-  addressValidationType: AddressValidationType
-  recipient: Recipient
-  requesterAddress?: string
-}
-
-export interface ValidateRecipientAddressSuccessAction {
-  type: Actions.VALIDATE_RECIPIENT_ADDRESS_SUCCESS
-  e164Number: string
-  validatedAddress: string
-}
-
-export interface ValidateRecipientAddressResetAction {
-  type: Actions.VALIDATE_RECIPIENT_ADDRESS_RESET
-  e164Number: string
-}
-
-export interface RequireSecureSendAction {
-  type: Actions.REQUIRE_SECURE_SEND
-  e164Number: E164Number
-  addressValidationType: AddressValidationType
-}
-
 export interface FetchAddressVerificationAction {
   type: Actions.FETCH_ADDRESS_VERIFICATION_STATUS
   address: string
 }
 
-export interface AddressVerificationStatusReceivedAction {
-  type: Actions.ADDRESS_VERIFICATION_STATUS_RECEIVED
-  address: string
-  addressVerified: boolean
-}
-
 interface ContactsSavedAction {
   type: Actions.CONTACTS_SAVED
   hash: string
@@ -119,33 +72,14 @@ export type ActionTypes =
   | ImportContactsAction
   | UpdateImportContactProgress
   | EndImportContactsAction
-  | ValidateRecipientAddressAction
-  | ValidateRecipientAddressSuccessAction
-  | ValidateRecipientAddressResetAction
-  | RequireSecureSendAction
   | FetchAddressesAndValidateAction
-  | EndFetchingAddressesAction
   | FetchAddressVerificationAction
-  | AddressVerificationStatusReceivedAction
   | ContactsSavedAction
   | StoredPasswordRefreshedAction
 
-export const fetchAddressesAndValidate = (
-  e164Number: string,
-  requesterAddress?: string
-): FetchAddressesAndValidateAction => ({
+export const fetchAddressesAndValidate = (e164Number: string): FetchAddressesAndValidateAction => ({
   type: Actions.FETCH_ADDRESSES_AND_VALIDATION_STATUS,
   e164Number,
-  requesterAddress,
-})
-
-export const addressVerificationStatusReceived = (
-  address: string,
-  addressVerified: boolean
-): AddressVerificationStatusReceivedAction => ({
-  type: Actions.ADDRESS_VERIFICATION_STATUS_RECEIVED,
-  address,
-  addressVerified,
 })
 
 export const fetchAddressVerification = (address: string): FetchAddressVerificationAction => ({
@@ -153,15 +87,6 @@ export const fetchAddressVerification = (address: string): FetchAddressVerificat
   address,
 })
 
-export const endFetchingAddresses = (
-  e164Number: string,
-  lastFetchSuccessful: boolean
-): EndFetchingAddressesAction => ({
-  type: Actions.END_FETCHING_ADDRESSES,
-  e164Number,
-  lastFetchSuccessful,
-})
-
 export const updateE164PhoneNumberAddresses = (
   e164NumberToAddress: E164NumberToAddressType,
   addressToE164Number: AddressToE164NumberType,
@@ -200,44 +125,6 @@ export const endImportContacts = (success: boolean): EndImportContactsAction =>
   success,
 })
 
-export const validateRecipientAddress = (
-  userInputOfFullAddressOrLastFourDigits: string,
-  addressValidationType: AddressValidationType,
-  recipient: Recipient,
-  requesterAddress?: string
-): ValidateRecipientAddressAction => ({
-  type: Actions.VALIDATE_RECIPIENT_ADDRESS,
-  userInputOfFullAddressOrLastFourDigits,
-  addressValidationType,
-  recipient,
-  requesterAddress,
-})
-
-export const validateRecipientAddressSuccess = (
-  e164Number: E164Number,
-  validatedAddress: string
-): ValidateRecipientAddressSuccessAction => ({
-  type: Actions.VALIDATE_RECIPIENT_ADDRESS_SUCCESS,
-  e164Number,
-  validatedAddress,
-})
-
-export const validateRecipientAddressReset = (
-  e164Number: E164Number
-): ValidateRecipientAddressResetAction => ({
-  type: Actions.VALIDATE_RECIPIENT_ADDRESS_RESET,
-  e164Number,
-})
-
-export const requireSecureSend = (
-  e164Number: E164Number,
-  addressValidationType: AddressValidationType
-): RequireSecureSendAction => ({
-  type: Actions.REQUIRE_SECURE_SEND,
-  e164Number,
-  addressValidationType,
-})
-
 export const contactsSaved = (hash: string): ContactsSavedAction => ({
   type: Actions.CONTACTS_SAVED,
   hash,