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

package/src/identity/saga.ts

@@ -1,94 +1,16 @@
-import { showErrorInline } from 'src/alert/actions'
-import { SendEvents } from 'src/analytics/Events'
-import AppAnalytics from 'src/analytics/AppAnalytics'
-import { ErrorMessages } from 'src/app/ErrorMessages'
-import {
-  Actions,
-  ValidateRecipientAddressAction,
-  validateRecipientAddressSuccess,
-} from 'src/identity/actions'
 import {
   doImportContactsWrapper,
   fetchAddressVerificationSaga,
   fetchAddressesAndValidateSaga,
   saveContacts,
 } from 'src/identity/contactMapping'
-import { AddressValidationType } from 'src/identity/reducer'
-import { validateAndReturnMatch } from 'src/identity/secureSend'
-import { e164NumberToAddressSelector } from 'src/identity/selectors'
-import { recipientHasNumber } from 'src/recipients/recipient'
+import { Actions } from 'src/identity/actions'
 import Logger from 'src/utils/Logger'
-import { ensureError } from 'src/utils/ensureError'
 import { safely } from 'src/utils/safely'
-import { currentAccountSelector } from 'src/web3/selectors'
-import { cancelled, put, select, spawn, takeEvery, takeLatest, takeLeading } from 'typed-redux-saga'
+import { cancelled, spawn, takeEvery, takeLatest, takeLeading } from 'typed-redux-saga'
 
 const TAG = 'identity/saga'
 
-export function* validateRecipientAddressSaga({
-  userInputOfFullAddressOrLastFourDigits,
-  addressValidationType,
-  recipient,
-  requesterAddress,
-}: ValidateRecipientAddressAction) {
-  Logger.debug(TAG, 'Starting Recipient Address Validation')
-  try {
-    if (!recipientHasNumber(recipient)) {
-      throw Error(`Invalid recipient type for Secure Send, does not have e164Number`)
-    }
-
-    const userAddress = yield* select(currentAccountSelector)
-    if (!userAddress) {
-      // This should never happen
-      throw Error(`No userAddress set`)
-    }
-    const e164NumberToAddress = yield* select(e164NumberToAddressSelector)
-    const { e164PhoneNumber } = recipient
-    const possibleRecievingAddresses = e164NumberToAddress[e164PhoneNumber]
-
-    // Should never happen - Secure Send is initiated to deal with
-    // there being several possible addresses
-    if (!possibleRecievingAddresses) {
-      throw Error('There are no possible recipient addresses to validate against')
-    }
-
-    // E164NumberToAddress in redux store only holds verified addresses
-    // Need to add the requester address to the option set in the event
-    // a request is coming from an unverified account
-    if (requesterAddress && !possibleRecievingAddresses.includes(requesterAddress)) {
-      possibleRecievingAddresses.push(requesterAddress)
-    }
-
-    const validatedAddress = validateAndReturnMatch(
-      userInputOfFullAddressOrLastFourDigits,
-      possibleRecievingAddresses,
-      userAddress,
-      addressValidationType
-    )
-
-    AppAnalytics.track(SendEvents.send_secure_complete, {
-      confirmByScan: false,
-      partialAddressValidation: addressValidationType === AddressValidationType.PARTIAL,
-    })
-
-    yield* put(validateRecipientAddressSuccess(e164PhoneNumber, validatedAddress))
-  } catch (err) {
-    const error = ensureError(err)
-    AppAnalytics.track(SendEvents.send_secure_incorrect, {
-      confirmByScan: false,
-      partialAddressValidation: addressValidationType === AddressValidationType.PARTIAL,
-      error: error.message,
-    })
-
-    Logger.error(TAG, 'validateRecipientAddressSaga/Address validation error: ', error)
-    if (Object.values(ErrorMessages).includes(error.message as ErrorMessages)) {
-      yield* put(showErrorInline(error.message as ErrorMessages))
-    } else {
-      yield* put(showErrorInline(ErrorMessages.ADDRESS_VALIDATION_ERROR))
-    }
-  }
-}
-
 function* watchContactMapping() {
   yield* takeLeading(Actions.IMPORT_CONTACTS, safely(doImportContactsWrapper))
   yield* takeLatest(
@@ -97,10 +19,6 @@ function* watchContactMapping() {
   )
 }
 
-export function* watchValidateRecipientAddress() {
-  yield* takeLatest(Actions.VALIDATE_RECIPIENT_ADDRESS, safely(validateRecipientAddressSaga))
-}
-
 function* watchFetchAddressVerification() {
   yield* takeEvery(Actions.FETCH_ADDRESS_VERIFICATION_STATUS, safely(fetchAddressVerificationSaga))
 }
@@ -109,7 +27,6 @@ export function* identitySaga() {
   Logger.debug(TAG, 'Initializing identity sagas')
   try {
     yield* spawn(watchContactMapping)
-    yield* spawn(watchValidateRecipientAddress)
     yield* spawn(watchFetchAddressVerification)
     yield* spawn(saveContacts) // save contacts on app start
   } catch (error) {

package/src/identity/selectors.ts

@@ -5,8 +5,6 @@ export const addressToVerificationStatusSelector = (state: RootState) =>
   state.identity.addressToVerificationStatus
 export const addressToE164NumberSelector = (state: RootState) => state.identity.addressToE164Number
 export const addressToVerifiedBySelector = (state: RootState) => state.identity.addressToVerifiedBy
-export const secureSendPhoneNumberMappingSelector = (state: RootState) =>
-  state.identity.secureSendPhoneNumberMapping
 export const importContactsProgressSelector = (state: RootState) =>
   state.identity.importContactsProgress
 export const addressToDisplayNameSelector = (state: RootState) =>

package/src/images/Images.ts

@@ -16,7 +16,9 @@ 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 miniPay = require('src/images/assets/minipay.png')
 export const pointsCardBackground = require('src/images/assets/points-card-background.png')
 export const pointsIllustration = require('src/images/assets/points-illustration.png')
+export const valora = require('src/images/assets/valora.png')
 export const walletSafe = require('src/images/assets/wallet-safe.png')
 export const earnCardBackground = require('src/images/assets/earn-card-background.png')

package/src/index.d.ts

@@ -6,7 +6,6 @@ declare module '*.json' {
 declare module '*.png'
 declare module '*.jpg'
 
-declare module 'dot-prop-immutable'
 declare module 'svgs'
 declare module 'react-native-languages'
 declare module 'react-native-version-check'

package/src/navigator/Navigator.tsx

@@ -102,16 +102,11 @@ import PointsIntro from 'src/points/PointsIntro'
 import { NavigatorScreen } from 'src/public/navigate'
 import { RootState } from 'src/redux/reducers'
 import { store } from 'src/redux/store'
+import SelectRecipientAddress from 'src/send/SelectRecipientAddress'
 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,
-} from 'src/send/ValidateRecipientAccount'
-import ValidateRecipientIntro, {
-  validateRecipientIntroScreenNavOptions,
-} from 'src/send/ValidateRecipientIntro'
 import { getFeatureGate } from 'src/statsig'
 import { StatsigFeatureGates } from 'src/statsig/types'
 import styles from 'src/styles/styles'
@@ -243,14 +238,9 @@ const sendScreens = (Navigator: typeof Stack) => (
       options={sendConfirmationScreenNavOptions as NativeStackNavigationOptions}
     />
     <Navigator.Screen
-      name={Screens.ValidateRecipientIntro}
-      component={ValidateRecipientIntro}
-      options={validateRecipientIntroScreenNavOptions}
-    />
-    <Navigator.Screen
-      name={Screens.ValidateRecipientAccount}
-      component={ValidateRecipientAccount}
-      options={validateRecipientAccountScreenNavOptions}
+      name={Screens.SelectRecipientAddress}
+      component={SelectRecipientAddress}
+      options={SelectRecipientAddress.navigationOptions as NativeStackNavigationOptions}
     />
     <Navigator.Screen
       name={Screens.SendEnterAmount}

package/src/navigator/Screens.tsx

@@ -76,6 +76,7 @@ export enum Screens {
   SelectLocalCurrency = 'SelectLocalCurrency',
   SelectProvider = 'SelectProvider',
   SendInvite = 'SendInvite',
+  SelectRecipientAddress = 'SelectRecipientAddress',
   SendSelectRecipient = 'SendSelectRecipient',
   SendConfirmation = 'SendConfirmation',
   SendEnterAmount = 'SendEnterAmount',
@@ -95,8 +96,6 @@ export enum Screens {
   TokenImport = 'TokenImport',
   TransactionDetailsScreen = 'TransactionDetailsScreen',
   UpgradeScreen = 'UpgradeScreen',
-  ValidateRecipientAccount = 'ValidateRecipientAccount',
-  ValidateRecipientIntro = 'ValidateRecipientIntro',
   VerificationCodeInputScreen = 'VerificationCodeInputScreen',
   VerificationStartScreen = 'VerificationStartScreen',
   WalletConnectRequest = 'WalletConnectRequest',

package/src/navigator/types.tsx

@@ -9,7 +9,7 @@ import { KeylessBackupFlow, KeylessBackupOrigin } from 'src/keylessBackup/types'
 import { Screens } from 'src/navigator/Screens'
 import { Nft } from 'src/nfts/types'
 import { EarnPosition } from 'src/positions/types'
-import { Recipient } from 'src/recipients/recipient'
+import { MobileRecipient, Recipient } from 'src/recipients/recipient'
 import { QrCode, TransactionDataInput } from 'src/send/types'
 import type { SwapTransaction } from 'src/swap/types'
 import type { SerializedTokenBalance } from 'src/tokens/slice'
@@ -45,10 +45,9 @@ type SendEnterAmountParams = {
   isMiniPayRecipient?: boolean
 }
 
-interface ValidateRecipientParams {
-  requesterAddress?: string
+interface SelectRecipientAddressParams {
+  recipient: MobileRecipient
   origin: SendOrigin
-  recipient: Recipient
   forceTokenId?: boolean
   defaultTokenIdOverride?: string
 }
@@ -262,6 +261,7 @@ export type StackParamList = {
     }
   }
   [Screens.SendInvite]: { recipient: Recipient; shareUrl: string }
+  [Screens.SelectRecipientAddress]: SelectRecipientAddressParams
   [Screens.SendSelectRecipient]:
     | {
         forceTokenId?: boolean
@@ -301,8 +301,6 @@ export type StackParamList = {
     transaction: TokenTransaction
   }
   [Screens.UpgradeScreen]: undefined
-  [Screens.ValidateRecipientIntro]: ValidateRecipientParams
-  [Screens.ValidateRecipientAccount]: ValidateRecipientParams
   [Screens.VerificationStartScreen]:
     | {
         hasOnboarded?: boolean

package/src/qrcode/utils.test.tsx

@@ -3,45 +3,32 @@ import * as React from 'react'
 import 'react-native'
 import { View } from 'react-native'
 import { expectSaga } from 'redux-saga-test-plan'
-import { call, select } from 'redux-saga-test-plan/matchers'
+import { select } from 'redux-saga-test-plan/matchers'
 import { showError } from 'src/alert/actions'
 import AppAnalytics from 'src/analytics/AppAnalytics'
 import { QrScreenEvents } from 'src/analytics/Events'
 import { HooksEnablePreviewOrigin, SendOrigin } from 'src/analytics/types'
 import { ErrorMessages } from 'src/app/ErrorMessages'
 import { DEEP_LINK_URL_SCHEME } from 'src/config'
-import {
-  e164NumberToAddressSelector,
-  secureSendPhoneNumberMappingSelector,
-} from 'src/identity/selectors'
+import { e164NumberToAddressSelector } from 'src/identity/selectors'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import { handleEnableHooksPreviewDeepLink } from 'src/positions/saga'
 import { allowHooksPreviewSelector } from 'src/positions/selectors'
 import { urlFromUriData } from 'src/qrcode/schema'
-import {
-  QRCodeTypes,
-  handleQRCodeDefault,
-  handleQRCodeSecureSend,
-  handleSecureSend,
-  useQRContent,
-} from 'src/qrcode/utils'
+import { QRCodeTypes, handleQRCodeDefault, useQRContent } from 'src/qrcode/utils'
 import { RecipientType } from 'src/recipients/recipient'
 import { recipientInfoSelector } from 'src/recipients/reducer'
-import { handleQRCodeDetected, handleQRCodeDetectedSecureSend } from 'src/send/actions'
+import { handleQRCodeDetected } from 'src/send/actions'
 import { QrCode } from 'src/send/types'
 import { createMockStore } from 'test/utils'
 import {
   mockAccount,
-  mockAccount2,
   mockAccount3,
   mockE164Number,
   mockE164Number3,
-  mockE164NumberToAddress,
-  mockEthTokenId,
   mockName,
   mockQrCodeData,
-  mockRecipient,
   mockRecipientInfo,
 } from 'test/values'
 
@@ -212,82 +199,3 @@ describe('handleQRCodeDefault', () => {
     expect(AppAnalytics.track).toHaveBeenCalledWith(QrScreenEvents.qr_scanned, qrCode)
   })
 })
-
-describe('handleQRCodeSecureSend', () => {
-  it('handles a valid address and navigates to send enter amount when there is no transaction data', async () => {
-    const data: QrCode = { type: QRCodeTypes.QR_CODE, data: mockAccount }
-    await expectSaga(
-      handleQRCodeSecureSend,
-      handleQRCodeDetectedSecureSend(data, mockRecipient, mockAccount2, false, mockEthTokenId)
-    )
-      .provide([
-        [select(e164NumberToAddressSelector), mockE164NumberToAddress],
-        [
-          select(secureSendPhoneNumberMappingSelector),
-          {
-            [mockRecipient.e164PhoneNumber]: {
-              address: mockAccount,
-              addressValidationType: undefined,
-            },
-          },
-        ],
-        [
-          call(
-            handleSecureSend,
-            mockAccount.toLowerCase(),
-            mockE164NumberToAddress,
-            mockRecipient,
-            mockAccount2
-          ),
-          true,
-        ],
-      ])
-      .run()
-    expect(navigate).toHaveBeenCalledWith(Screens.SendEnterAmount, {
-      origin: SendOrigin.AppSendFlow,
-      recipient: {
-        ...mockRecipient,
-        address: mockAccount,
-      },
-      isFromScan: true,
-      forceTokenId: false,
-      defaultTokenIdOverride: mockEthTokenId,
-    })
-    expect(AppAnalytics.track).toHaveBeenCalledWith(QrScreenEvents.qr_scanned, data)
-  })
-  it('handles an invalid address', async () => {
-    const data: QrCode = { type: QRCodeTypes.QR_CODE, data: 'invalid-address' }
-    await expectSaga(
-      handleQRCodeSecureSend,
-      handleQRCodeDetectedSecureSend(data, mockRecipient, mockAccount2)
-    )
-      .provide([[select(e164NumberToAddressSelector), mockE164NumberToAddress]])
-      .put(showError(ErrorMessages.QR_FAILED_INVALID_ADDRESS))
-      .run()
-    expect(navigate).not.toHaveBeenCalled()
-    expect(AppAnalytics.track).toHaveBeenCalledWith(QrScreenEvents.qr_scanned, data)
-  })
-  it('handles failed address lookup', async () => {
-    const data: QrCode = { type: QRCodeTypes.QR_CODE, data: mockAccount }
-    await expectSaga(
-      handleQRCodeSecureSend,
-      handleQRCodeDetectedSecureSend(data, mockRecipient, mockAccount2)
-    )
-      .provide([
-        [select(e164NumberToAddressSelector), mockE164NumberToAddress],
-        [
-          call(
-            handleSecureSend,
-            mockAccount.toLowerCase(),
-            mockE164NumberToAddress,
-            mockRecipient,
-            mockAccount2
-          ),
-          false,
-        ],
-      ])
-      .run()
-    expect(navigate).not.toHaveBeenCalled()
-    expect(AppAnalytics.track).toHaveBeenCalledWith(QrScreenEvents.qr_scanned, data)
-  })
-})

package/src/qrcode/utils.ts

@@ -1,40 +1,18 @@
 import * as RNFS from '@valora/react-native-fs'
 import { useMemo } from 'react'
 import Share from 'react-native-share'
-import { showError, showMessage } from 'src/alert/actions'
+import { showError } from 'src/alert/actions'
 import AppAnalytics from 'src/analytics/AppAnalytics'
-import { QrScreenEvents, SendEvents } from 'src/analytics/Events'
-import {
-  HooksEnablePreviewOrigin,
-  SendOrigin,
-  WalletConnectPairingOrigin,
-} from 'src/analytics/types'
+import { QrScreenEvents } from 'src/analytics/Events'
+import { HooksEnablePreviewOrigin, WalletConnectPairingOrigin } from 'src/analytics/types'
 import { ErrorMessages } from 'src/app/ErrorMessages'
 import { DEEP_LINK_URL_SCHEME } from 'src/config'
-import { validateRecipientAddressSuccess } from 'src/identity/actions'
-import { E164NumberToAddressType } from 'src/identity/reducer'
-import { getSecureSendAddress } from 'src/identity/secureSend'
-import {
-  e164NumberToAddressSelector,
-  secureSendPhoneNumberMappingSelector,
-} from 'src/identity/selectors'
-import { navigate } from 'src/navigator/NavigationService'
-import { Screens } from 'src/navigator/Screens'
 import { handleEnableHooksPreviewDeepLink } from 'src/positions/saga'
 import { allowHooksPreviewSelector } from 'src/positions/selectors'
 import { UriData, uriDataFromUrl } from 'src/qrcode/schema'
-import {
-  Recipient,
-  RecipientInfo,
-  getRecipientFromAddress,
-  recipientHasNumber,
-} from 'src/recipients/recipient'
+import { RecipientInfo, getRecipientFromAddress } from 'src/recipients/recipient'
 import { recipientInfoSelector } from 'src/recipients/reducer'
-import {
-  HandleQRCodeDetectedAction,
-  HandleQRCodeDetectedSecureSendAction,
-  SVG,
-} from 'src/send/actions'
+import { HandleQRCodeDetectedAction, SVG } from 'src/send/actions'
 import { QrCode } from 'src/send/types'
 import { handleSendPaymentData } from 'src/send/utils'
 import Logger from 'src/utils/Logger'
@@ -85,48 +63,6 @@ export async function shareSVGImage(svg: SVG) {
   })
 }
 
-export function* handleSecureSend(
-  address: string,
-  e164NumberToAddress: E164NumberToAddressType,
-  recipient: Recipient,
-  requesterAddress?: string
-) {
-  if (!recipientHasNumber(recipient)) {
-    throw Error('Invalid recipient type for Secure Send, has no mobile number')
-  }
-
-  const userScannedAddress = address.toLowerCase()
-  const { e164PhoneNumber } = recipient
-  const possibleReceivingAddresses = e164NumberToAddress[e164PhoneNumber]
-  // This should never happen. Secure Send is triggered when there are
-  // multiple addresses for a given phone number
-  if (!possibleReceivingAddresses) {
-    throw Error("No addresses associated with recipient's phone number")
-  }
-
-  // Need to add the requester address to the option set in the event
-  // a request is coming from an unverified account
-  if (requesterAddress && !possibleReceivingAddresses.includes(requesterAddress)) {
-    possibleReceivingAddresses.push(requesterAddress)
-  }
-  const possibleReceivingAddressesFormatted = possibleReceivingAddresses.map((addr) =>
-    addr.toLowerCase()
-  )
-  if (!possibleReceivingAddressesFormatted.includes(userScannedAddress)) {
-    const error = ErrorMessages.QR_FAILED_INVALID_RECIPIENT
-    AppAnalytics.track(SendEvents.send_secure_incorrect, {
-      confirmByScan: true,
-      error,
-    })
-    yield* put(showMessage(error))
-    return false
-  }
-
-  AppAnalytics.track(SendEvents.send_secure_complete, { confirmByScan: true })
-  yield* put(validateRecipientAddressSuccess(e164PhoneNumber, userScannedAddress))
-  return true
-}
-
 function* extractQRAddressData(qrCode: QrCode) {
   // strip network prefix if present
   const qrAddress = qrCode.data.split(':').at(-1) || qrCode.data
@@ -183,48 +119,3 @@ export function* handleQRCodeDefault({
     defaultTokenIdOverride,
   })
 }
-
-export function* handleQRCodeSecureSend({
-  qrCode,
-  requesterAddress,
-  recipient,
-  forceTokenId,
-  defaultTokenIdOverride,
-}: HandleQRCodeDetectedSecureSendAction) {
-  const e164NumberToAddress = yield* select(e164NumberToAddressSelector)
-  AppAnalytics.track(QrScreenEvents.qr_scanned, qrCode)
-
-  const qrData = yield* call(extractQRAddressData, qrCode)
-  if (!qrData) {
-    return
-  }
-
-  const success: boolean = yield* call(
-    handleSecureSend,
-    qrData.address,
-    e164NumberToAddress,
-    recipient,
-    requesterAddress
-  )
-  if (!success) {
-    return
-  }
-
-  const secureSendPhoneNumberMapping = yield* select(secureSendPhoneNumberMappingSelector)
-  const address = getSecureSendAddress(recipient, secureSendPhoneNumberMapping)
-  if (!address) {
-    // should never happen b/c if handleSecureSend succeeds then address should be there
-    Logger.error(TAG, `No secure send address found for recipient ${recipient}`)
-    return
-  }
-  navigate(Screens.SendEnterAmount, {
-    origin: SendOrigin.AppSendFlow,
-    recipient: {
-      ...recipient,
-      address,
-    },
-    isFromScan: true,
-    forceTokenId,
-    defaultTokenIdOverride,
-  })
-}

package/src/redux/migrations.test.ts

@@ -68,6 +68,7 @@ import {
   v251Schema,
   v253Schema,
   v254Schema,
+  v255Schema,
   v28Schema,
   v2Schema,
   v35Schema,
@@ -1946,4 +1947,16 @@ describe('Redux persist migrations', () => {
     const migratedSchema = migrations[255](oldSchema)
     expect(migratedSchema.identity.addressToVerifiedBy).toStrictEqual({})
   })
+
+  it('works from 255 to 256', () => {
+    const oldSchema = {
+      ...v255Schema,
+      identity: {
+        ...v255Schema.identity,
+        secureSendPhoneNumberMapping: { '+14155550000': {} },
+      },
+    }
+    const migratedSchema = migrations[256](oldSchema)
+    expect(migratedSchema.identity.secureSendPhoneNumberMapping).toBeUndefined()
+  })
 })

package/src/redux/migrations.ts

@@ -2077,4 +2077,8 @@ export const migrations = {
       addressToVerifiedBy: {},
     },
   }),
+  256: (state: any) => ({
+    ...state,
+    identity: _.omit(state.identity, 'secureSendPhoneNumberMapping'),
+  }),
 }

package/src/redux/store.test.ts

@@ -143,7 +143,7 @@ describe('store state', () => {
       {
         "_persist": {
           "rehydrated": true,
-          "version": 255,
+          "version": 256,
         },
         "account": {
           "acceptedTerms": false,
@@ -254,7 +254,6 @@ describe('store state', () => {
             "total": 0,
           },
           "lastSavedContactsHash": null,
-          "secureSendPhoneNumberMapping": {},
           "shouldRefreshStoredPasswordHash": true,
         },
         "imports": {

package/src/redux/store.ts

@@ -30,7 +30,7 @@ const persistConfig: PersistConfig<ReducersRootState> = {
   key: 'root',
   // default is -1, increment as we make migrations
   // See https://github.com/valora-xyz/wallet/tree/main/WALLET.md#redux-state-migration
-  version: 255,
+  version: 256,
   keyPrefix: `reduxStore-`, // the redux-persist default is `persist:` which doesn't work with some file systems.
   storage: FSStorage(),
   blacklist: ['networkInfo', 'alert', 'imports', 'keylessBackup', transactionFeedV2Api.reducerPath],