chore: add remote config variable for decentralised phone verification paths

src/account/Settings.tsx

@@ -40,6 +40,7 @@ import {
 } from 'src/app/actions'
 import {
   hapticFeedbackEnabledSelector,
+  odisV1EOLSelector,
   phoneNumberVerifiedSelector,
   sessionIdSelector,
   supportedBiometryTypeSelector,
@@ -100,6 +101,7 @@ interface StateProps {
   supportedBiometryType: BIOMETRY_TYPE | null
   shouldShowRecoveryPhraseInSettings: boolean
   hapticFeedbackEnabled: boolean
+  odisV1EOL: boolean
 }
 
 type OwnProps = NativeStackScreenProps<StackParamList, Screens.Settings>
@@ -125,6 +127,7 @@ const mapStateToProps = (state: RootState): StateProps => {
     supportedBiometryType: supportedBiometryTypeSelector(state),
     shouldShowRecoveryPhraseInSettings: shouldShowRecoveryPhraseInSettingsSelector(state),
     hapticFeedbackEnabled: hapticFeedbackEnabledSelector(state),
+    odisV1EOL: odisV1EOLSelector(state),
   }
 }
 
@@ -248,11 +251,13 @@ export class Account extends React.Component<Props, State> {
               )}
             </RevokePhoneNumber>
           </View>
-          <View style={styles.devSettingsItem}>
-            <TouchableOpacity onPress={this.showConfirmRevokeModal}>
-              <Text>Revoke Number Verification (on-chain)</Text>
-            </TouchableOpacity>
-          </View>
+          {!this.props.odisV1EOL && (
+            <View style={styles.devSettingsItem}>
+              <TouchableOpacity onPress={this.showConfirmRevokeModal}>
+                <Text>Revoke Number Verification (on-chain)</Text>
+              </TouchableOpacity>
+            </View>
+          )}
           <View style={styles.devSettingsItem}>
             <TouchableOpacity onPress={this.resetAppOpenedState}>
               <Text>Reset app opened state</Text>

src/app/reducers.ts

@@ -54,6 +54,7 @@ export interface State {
   networkTimeoutSeconds: number
   celoNews: CeloNewsConfig
   hapticFeedbackEnabled: boolean
+  odisV1EOL: boolean
 }
 
 const initialState = {
@@ -101,6 +102,7 @@ const initialState = {
   networkTimeoutSeconds: REMOTE_CONFIG_VALUES_DEFAULTS.networkTimeoutSeconds,
   celoNews: JSON.parse(REMOTE_CONFIG_VALUES_DEFAULTS.celoNews),
   hapticFeedbackEnabled: true,
+  odisV1EOL: REMOTE_CONFIG_VALUES_DEFAULTS.odisV1EOL,
 }
 
 export const appReducer = (

src/app/saga.test.ts

@@ -26,6 +26,7 @@ import {
   getLastTimeBackgrounded,
   getRequirePinOnAppOpen,
   inviterAddressSelector,
+  odisV1EOLSelector,
   shouldRunVerificationMigrationSelector,
 } from 'src/app/selectors'
 import { handleDappkitDeepLink } from 'src/dappkit/dappkit'
@@ -408,6 +409,7 @@ describe('runCentralPhoneVerificationMigration', () => {
 
     await expectSaga(runCentralPhoneVerificationMigration)
       .provide([
+        [select(odisV1EOLSelector), false],
         [select(dataEncryptionKeySelector), 'someDEK'],
         [select(shouldRunVerificationMigrationSelector), true],
         [select(inviterAddressSelector), '0x123'],
@@ -439,6 +441,7 @@ describe('runCentralPhoneVerificationMigration', () => {
 
     await expectSaga(runCentralPhoneVerificationMigration)
       .provide([
+        [select(odisV1EOLSelector), false],
         [select(dataEncryptionKeySelector), 'someDEK'],
         [select(shouldRunVerificationMigrationSelector), true],
         [select(inviterAddressSelector), undefined],
@@ -469,12 +472,22 @@ describe('runCentralPhoneVerificationMigration', () => {
   it('should not run if migration conditions are not met', async () => {
     await expectSaga(runCentralPhoneVerificationMigration)
       .provide([
+        [select(odisV1EOLSelector), false],
         [select(dataEncryptionKeySelector), 'someDEK'],
         [select(shouldRunVerificationMigrationSelector), false],
       ])
       .not.put(phoneNumberVerificationMigrated())
       .run()
 
+    await expectSaga(runCentralPhoneVerificationMigration)
+      .provide([
+        [select(odisV1EOLSelector), true],
+        [select(dataEncryptionKeySelector), 'someDEK'],
+        [select(shouldRunVerificationMigrationSelector), true],
+      ])
+      .not.put(phoneNumberVerificationMigrated())
+      .run()
+
     expect(mockFetch).not.toHaveBeenCalled()
   })
 
@@ -483,6 +496,7 @@ describe('runCentralPhoneVerificationMigration', () => {
   it('should not run if migration conditions there is no signed message', async () => {
     await expectSaga(runCentralPhoneVerificationMigration)
       .provide([
+        [select(odisV1EOLSelector), false],
         [select(dataEncryptionKeySelector), 'someDEK'],
         [select(shouldRunVerificationMigrationSelector), true],
         [select(inviterAddressSelector), undefined],
@@ -500,6 +514,7 @@ describe('runCentralPhoneVerificationMigration', () => {
   it('should not run if no DEK can be found', async () => {
     await expectSaga(runCentralPhoneVerificationMigration)
       .provide([
+        [select(odisV1EOLSelector), false],
         [select(dataEncryptionKeySelector), null],
         [select(shouldRunVerificationMigrationSelector), true],
       ])

src/app/saga.ts

@@ -41,6 +41,7 @@ import {
   googleMobileServicesAvailableSelector,
   huaweiMobileServicesAvailableSelector,
   inviterAddressSelector,
+  odisV1EOLSelector,
   sentryNetworkErrorsSelector,
   shouldRunVerificationMigrationSelector,
 } from 'src/app/selectors'
@@ -212,6 +213,7 @@ export interface RemoteConfigValues {
   dappsFilterEnabled: boolean
   dappsSearchEnabled: boolean
   requireCPV: boolean
+  odisV1EOL: boolean
 }
 
 export function* appRemoteFeatureFlagSaga() {
@@ -384,8 +386,9 @@ export function* handleSetAppState(action: SetAppState) {
 }
 
 export function* runCentralPhoneVerificationMigration() {
+  const odisV1EOL = yield select(odisV1EOLSelector)
   const shouldRunVerificationMigration = yield select(shouldRunVerificationMigrationSelector)
-  if (!shouldRunVerificationMigration) {
+  if (odisV1EOL || !shouldRunVerificationMigration) {
     return
   }
 

src/app/selectors.ts

@@ -111,3 +111,5 @@ export const networkTimeoutSecondsSelector = (state: RootState) => state.app.net
 export const celoNewsConfigSelector = (state: RootState) => state.app.celoNews
 
 export const hapticFeedbackEnabledSelector = (state: RootState) => state.app.hapticFeedbackEnabled
+
+export const odisV1EOLSelector = (state: RootState) => state.app.odisV1EOL

src/firebase/firebase.ts

@@ -308,6 +308,7 @@ export async function fetchRemoteConfigValues(): Promise<RemoteConfigValues | nu
     dappsFilterEnabled: flags.dappsFilterEnabled.asBoolean(),
     dappsSearchEnabled: flags.dappsSearchEnabled.asBoolean(),
     requireCPV: flags.requireCPV.asBoolean(),
+    odisV1EOL: flags.odisV1EOL.asBoolean(),
   }
 }
 

src/firebase/remoteConfigValuesDefaults.e2e.ts

@@ -70,4 +70,5 @@ export const REMOTE_CONFIG_VALUES_DEFAULTS: Omit<
   dappsFilterEnabled: false,
   dappsSearchEnabled: false,
   requireCPV: false,
+  odisV1EOL: false,
 }

src/firebase/remoteConfigValuesDefaults.ts

@@ -74,4 +74,5 @@ export const REMOTE_CONFIG_VALUES_DEFAULTS: Omit<
   dappsFilterEnabled: false,
   dappsSearchEnabled: false,
   requireCPV: false,
+  odisV1EOL: false,
 }

src/identity/contactMapping.ts

@@ -15,6 +15,7 @@ import { showErrorOrFallback } from 'src/alert/actions'
 import { IdentityEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import { ErrorMessages } from 'src/app/ErrorMessages'
+import { odisV1EOLSelector } from 'src/app/selectors'
 import { fetchLostAccounts } from 'src/firebase/firebase'
 import {
   Actions,
@@ -221,6 +222,12 @@ function* getAccountAddresses(e164Number: string) {
 }
 
 export function* fetchWalletAddressesDecentralized(e164Number: string) {
+  // once odis v1 is EOL'ed, we can remove this whole path for fetching wallet addresses
+  const odisV1EOL = yield select(odisV1EOLSelector)
+  if (odisV1EOL) {
+    return []
+  }
+
   const contractKit = yield call(getContractKit)
   const accountsWrapper: AccountsWrapper = yield call([
     contractKit.contracts,

src/redux/migrations.ts

@@ -1097,4 +1097,5 @@ export const migrations = {
     },
   }),
   119: (state: any) => state,
+  120: (state: any) => state,
 }

src/redux/store.test.ts

@@ -99,7 +99,7 @@ describe('store state', () => {
       Object {
         "_persist": Object {
           "rehydrated": true,
-          "version": 119,
+          "version": 120,
         },
         "account": Object {
           "acceptedTerms": false,
@@ -155,6 +155,7 @@ describe('store state', () => {
           "minVersion": null,
           "networkTimeoutSeconds": 30,
           "numberVerified": false,
+          "odisV1EOL": false,
           "paymentDeepLinkHandler": "",
           "phoneNumberVerified": false,
           "pincodeUseExpandedBlocklist": false,

src/redux/store.ts

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

test/RootStateSchema.json

@@ -2464,6 +2464,9 @@
                 "numberVerified": {
                     "type": "boolean"
                 },
+                "odisV1EOL": {
+                    "type": "boolean"
+                },
                 "paymentDeepLinkHandler": {
                     "$ref": "#/definitions/PaymentDeepLinkHandler"
                 },
@@ -2565,6 +2568,7 @@
                 "minVersion",
                 "networkTimeoutSeconds",
                 "numberVerified",
+                "odisV1EOL",
                 "paymentDeepLinkHandler",
                 "phoneNumberVerified",
                 "pincodeUseExpandedBlocklist",

test/schemas.ts

@@ -2148,6 +2148,18 @@ export const v119Schema = {
   },
 }
 
+export const v120Schema = {
+  ...v119Schema,
+  _persist: {
+    ...v119Schema._persist,
+    version: 120,
+  },
+  app: {
+    ...v119Schema.app,
+    odisV1EOL: false,
+  },
+}
+
 export function getLatestSchema(): Partial<RootState> {
-  return v119Schema as Partial<RootState>
+  return v120Schema as Partial<RootState>
 }