From 323cc37269b67c4672d48ed284726b889083657a Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Wed, 12 Jun 2024 10:23:40 -0600
Subject: [PATCH 1/9] feat(onboarding): Keyless Backup Setup Fail in Onboarding
 Flow

---
 locales/base/translation.json               |  3 +-
 src/analytics/Events.tsx                    |  2 ++
 src/analytics/Properties.tsx                |  2 ++
 src/analytics/docs.ts                       |  2 ++
 src/keylessBackup/KeylessBackupProgress.tsx | 33 ++++++++++++++++++---
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/locales/base/translation.json b/locales/base/translation.json
index 9456eed2c7..f59c1baaeb 100644
--- a/locales/base/translation.json
+++ b/locales/base/translation.json
@@ -129,7 +129,8 @@
         "title": "Backup unavailable",
         "body": "You can set up wallet backup later or protect your account now by saving your recovery phrase.",
         "later": "I'll set up backup later",
-        "manual": "Save recovery phrase"
+        "manual": "Save recovery phrase",
+        "skip": "Skip (not recommended)"
       }
     },
     "restore": {
diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index 82e710a80c..d82fa0e831 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -112,6 +112,8 @@ export enum KeylessBackupEvents {
   cab_progress_completed_continue = 'cab_progress_completed_continue',
   cab_progress_failed_later = 'cab_progress_failed_later',
   cab_progress_failed_manual = 'cab_progress_failed_manual',
+  cab_progress_failed_manual_onboarding = 'cab_progress_failed_manual_onboarding',
+  cab_progress_failed_skip_onboarding = 'cab_progress_failed_skip_onboarding',
   cab_post_encrypted_mnemonic_failed = 'cab_post_encrypted_mnemonic_failed',
   cab_torus_keyshare_timeout = 'cab_torus_keyshare_timeout',
   cab_handle_keyless_backup_failed = 'cab_handle_keyless_backup_failed',
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 7b22f7d793..0e0300de7f 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -265,6 +265,8 @@ interface KeylessBackupEventsProperties {
   [KeylessBackupEvents.cab_progress_completed_continue]: undefined
   [KeylessBackupEvents.cab_progress_failed_later]: undefined
   [KeylessBackupEvents.cab_progress_failed_manual]: undefined
+  [KeylessBackupEvents.cab_progress_failed_manual_onboarding]: undefined
+  [KeylessBackupEvents.cab_progress_failed_skip_onboarding]: undefined
   [KeylessBackupEvents.cab_post_encrypted_mnemonic_failed]: {
     backupAlreadyExists: boolean
   }
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index 2e3039957c..ecb06a996a 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -144,6 +144,8 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [KeylessBackupEvents.cab_progress_completed_continue]: ``,
   [KeylessBackupEvents.cab_progress_failed_later]: ``,
   [KeylessBackupEvents.cab_progress_failed_manual]: ``,
+  [KeylessBackupEvents.cab_progress_failed_manual_onboarding]: ``,
+  [KeylessBackupEvents.cab_progress_failed_skip_onboarding]: ``,
   [KeylessBackupEvents.cab_post_encrypted_mnemonic_failed]: ``,
   [KeylessBackupEvents.cab_torus_keyshare_timeout]: ``,
   [KeylessBackupEvents.cab_handle_keyless_backup_failed]: `When keyless backup fails to generate store encrypted mnemonic for setup or fails to retrieve and decrypt mnemonic for restore`,
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index 3bb2083b04..6aa7245bc7 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -32,6 +32,11 @@ import Logger from 'src/utils/Logger'
 
 const TAG = 'keylessBackup/KeylessBackupProgress'
 
+export enum Origin {
+  Onboarding = 'Onboarding',
+  Settings = 'Settings',
+}
+
 function KeylessBackupProgress({
   route,
   navigation,
@@ -254,6 +259,8 @@ function Setup() {
   const keylessBackupStatus = useSelector(keylessBackupStatusSelector)
   const { t } = useTranslation()
 
+  const navigatedFromSettings = true // use prop to determine
+
   const onPressContinue = () => {
     ValoraAnalytics.track(KeylessBackupEvents.cab_progress_completed_continue)
     navigateHome()
@@ -276,6 +283,16 @@ function Setup() {
     navigate(Screens.Settings)
   }
 
+  const onPressManualOnboarding = () => {
+    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_manual_onboarding)
+    navigate(Screens.AccountKeyEducation)
+  }
+
+  const onPressSkip = () => {
+    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_skip_onboarding)
+    navigate(Screens.ChooseYourAdventure)
+  }
+
   switch (keylessBackupStatus) {
     case KeylessBackupStatus.InProgress: {
       return renderInProgressState(t('keylessBackupStatus.setup.inProgress.title'))
@@ -312,8 +329,12 @@ function Setup() {
           </View>
           <Button
             testID="KeylessBackupProgress/Later"
-            onPress={onPressLater}
-            text={t('keylessBackupStatus.setup.failed.later')}
+            onPress={navigatedFromSettings ? onPressLater : onPressManualOnboarding}
+            text={t(
+              navigatedFromSettings
+                ? 'keylessBackupStatus.setup.failed.later'
+                : 'keylessBackupStatus.setup.failed.manual'
+            )}
             size={BtnSizes.FULL}
             type={BtnTypes.PRIMARY}
             style={styles.button}
@@ -321,8 +342,12 @@ function Setup() {
           />
           <Button
             testID="KeylessBackupProgress/Manual"
-            onPress={onPressManual}
-            text={t('keylessBackupStatus.setup.failed.manual')}
+            onPress={navigatedFromSettings ? onPressManual : onPressSkip}
+            text={t(
+              navigatedFromSettings
+                ? 'keylessBackupStatus.setup.failed.manual'
+                : 'keylessBackupStatus.setup.failed.skip'
+            )}
             size={BtnSizes.FULL}
             type={BtnTypes.SECONDARY}
             style={styles.button}

From 3a9577ebafdcba4a8050dcdceb9ecf6238350ac8 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Wed, 12 Jun 2024 10:51:00 -0600
Subject: [PATCH 2/9] Add nav param

---
 src/keylessBackup/KeylessBackupIntro.tsx          |  6 +++++-
 src/keylessBackup/KeylessBackupPhoneCodeInput.tsx |  1 +
 src/keylessBackup/KeylessBackupPhoneInput.tsx     |  2 ++
 src/keylessBackup/KeylessBackupProgress.test.tsx  |  3 ++-
 src/keylessBackup/KeylessBackupProgress.tsx       | 10 +++++-----
 src/keylessBackup/SignInWithEmail.tsx             |  2 +-
 src/navigator/types.tsx                           |  5 +++++
 src/onboarding/registration/ImportSelect.tsx      |  6 +++++-
 8 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/keylessBackup/KeylessBackupIntro.tsx b/src/keylessBackup/KeylessBackupIntro.tsx
index 41c04c3cf8..3bc80756b8 100644
--- a/src/keylessBackup/KeylessBackupIntro.tsx
+++ b/src/keylessBackup/KeylessBackupIntro.tsx
@@ -10,6 +10,7 @@ import CancelButton from 'src/components/CancelButton'
 import Card from 'src/components/Card'
 import TextButton from 'src/components/TextButton'
 import EnvelopeIcon from 'src/keylessBackup/EnvelopeIcon'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import SmartphoneIcon from 'src/keylessBackup/SmartphoneIcon'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { emptyHeader } from 'src/navigator/Headers'
@@ -84,7 +85,10 @@ function KeylessBackupIntro({ route }: Props) {
         testID="keylessBackupIntro/Continue"
         onPress={() => {
           ValoraAnalytics.track(KeylessBackupEvents.cab_intro_continue, { keylessBackupFlow })
-          navigate(Screens.SignInWithEmail, { keylessBackupFlow })
+          navigate(Screens.SignInWithEmail, {
+            keylessBackupFlow,
+            origin: KeylessBackupOrigin.Settings,
+          })
         }}
         text={isSetup ? t('continue') : t('next')}
         size={BtnSizes.FULL}
diff --git a/src/keylessBackup/KeylessBackupPhoneCodeInput.tsx b/src/keylessBackup/KeylessBackupPhoneCodeInput.tsx
index 941685c4ee..51e43969d7 100644
--- a/src/keylessBackup/KeylessBackupPhoneCodeInput.tsx
+++ b/src/keylessBackup/KeylessBackupPhoneCodeInput.tsx
@@ -116,6 +116,7 @@ function KeylessBackupPhoneCodeInput({
         onSuccess={() => {
           navigate(Screens.KeylessBackupProgress, {
             keylessBackupFlow: route.params.keylessBackupFlow,
+            origin: route.params.origin,
           })
         }}
         title={<Text style={styles.title}>{t('phoneVerificationInput.title')}</Text>}
diff --git a/src/keylessBackup/KeylessBackupPhoneInput.tsx b/src/keylessBackup/KeylessBackupPhoneInput.tsx
index f30f11ceec..d9ba331f8e 100644
--- a/src/keylessBackup/KeylessBackupPhoneInput.tsx
+++ b/src/keylessBackup/KeylessBackupPhoneInput.tsx
@@ -78,6 +78,7 @@ function KeylessBackupPhoneInput({ route }: Props) {
         navigate(Screens.KeylessBackupPhoneInput, {
           keylessBackupFlow,
           selectedCountryCodeAlpha2: countryCodeAlpha2,
+          origin: route.params.origin,
         })
       },
     })
@@ -90,6 +91,7 @@ function KeylessBackupPhoneInput({ route }: Props) {
     navigate(Screens.KeylessBackupPhoneCodeInput, {
       keylessBackupFlow,
       e164Number: phoneNumberInfo.e164Number,
+      origin: route.params.origin,
     })
   }
 
diff --git a/src/keylessBackup/KeylessBackupProgress.test.tsx b/src/keylessBackup/KeylessBackupProgress.test.tsx
index 652fe1ff84..febb144eeb 100644
--- a/src/keylessBackup/KeylessBackupProgress.test.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.test.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import { Provider } from 'react-redux'
 import { KeylessBackupEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
-import KeylessBackupProgress from 'src/keylessBackup/KeylessBackupProgress'
+import KeylessBackupProgress, { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { keylessBackupAcceptZeroBalance, keylessBackupBail } from 'src/keylessBackup/slice'
 import { KeylessBackupFlow, KeylessBackupStatus } from 'src/keylessBackup/types'
 import { ensurePincode, navigate, navigateHome } from 'src/navigator/NavigationService'
@@ -43,6 +43,7 @@ function createStore(keylessBackupStatus: KeylessBackupStatus, zeroBalance = fal
 function getProps(flow: KeylessBackupFlow = KeylessBackupFlow.Setup) {
   return getMockStackScreenProps(Screens.KeylessBackupProgress, {
     keylessBackupFlow: flow,
+    origin: KeylessBackupOrigin.Settings,
   })
 }
 
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index 6aa7245bc7..eab837fe01 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -32,7 +32,7 @@ import Logger from 'src/utils/Logger'
 
 const TAG = 'keylessBackup/KeylessBackupProgress'
 
-export enum Origin {
+export enum KeylessBackupOrigin {
   Onboarding = 'Onboarding',
   Settings = 'Settings',
 }
@@ -44,6 +44,8 @@ function KeylessBackupProgress({
   const keylessBackupStatus = useSelector(keylessBackupStatusSelector)
   const { t } = useTranslation()
 
+  const navigatedFromSettings = route.params.origin === KeylessBackupOrigin.Settings
+
   const onPressHelp = () => {
     ValoraAnalytics.track(KeylessBackupEvents.cab_restore_failed_help)
     navigate(Screens.SupportContact)
@@ -74,7 +76,7 @@ function KeylessBackupProgress({
   if (route.params.keylessBackupFlow === KeylessBackupFlow.Restore) {
     return <Restore />
   } else {
-    return <Setup />
+    return <Setup navigatedFromSettings={navigatedFromSettings} />
   }
 }
 
@@ -255,12 +257,10 @@ function Restore() {
   }
 }
 
-function Setup() {
+function Setup({ navigatedFromSettings }: { navigatedFromSettings: boolean }) {
   const keylessBackupStatus = useSelector(keylessBackupStatusSelector)
   const { t } = useTranslation()
 
-  const navigatedFromSettings = true // use prop to determine
-
   const onPressContinue = () => {
     ValoraAnalytics.track(KeylessBackupEvents.cab_progress_completed_continue)
     navigateHome()
diff --git a/src/keylessBackup/SignInWithEmail.tsx b/src/keylessBackup/SignInWithEmail.tsx
index 3405f9cd71..78a186f90a 100644
--- a/src/keylessBackup/SignInWithEmail.tsx
+++ b/src/keylessBackup/SignInWithEmail.tsx
@@ -57,7 +57,7 @@ function SignInWithEmail({ route }: Props) {
       if (!credentials.idToken) {
         throw new Error('got an empty token from auth0')
       }
-      navigate(Screens.KeylessBackupPhoneInput, { keylessBackupFlow })
+      navigate(Screens.KeylessBackupPhoneInput, { keylessBackupFlow, origin: route.params.origin })
       dispatch(googleSignInCompleted({ idToken: credentials.idToken }))
       ValoraAnalytics.track(KeylessBackupEvents.cab_sign_in_with_google_success, {
         keylessBackupFlow,
diff --git a/src/navigator/types.tsx b/src/navigator/types.tsx
index bc64f309e0..892852dc1a 100644
--- a/src/navigator/types.tsx
+++ b/src/navigator/types.tsx
@@ -8,6 +8,7 @@ import FiatConnectQuote from 'src/fiatExchanges/quotes/FiatConnectQuote'
 import { CICOFlow, FiatExchangeFlow, SimplexQuote } from 'src/fiatExchanges/utils'
 import { Props as KycLandingProps } from 'src/fiatconnect/KycLanding'
 import { FiatAccount } from 'src/fiatconnect/slice'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { Screens } from 'src/navigator/Screens'
 import { Nft } from 'src/nfts/types'
@@ -136,13 +137,16 @@ export type StackParamList = {
   [Screens.KeylessBackupPhoneCodeInput]: {
     keylessBackupFlow: KeylessBackupFlow
     e164Number: string
+    origin: KeylessBackupOrigin
   }
   [Screens.KeylessBackupPhoneInput]: {
     keylessBackupFlow: KeylessBackupFlow
     selectedCountryCodeAlpha2?: string
+    origin: KeylessBackupOrigin
   }
   [Screens.KeylessBackupProgress]: {
     keylessBackupFlow: KeylessBackupFlow
+    origin: KeylessBackupOrigin
   }
   [Screens.KeylessBackupIntro]: {
     keylessBackupFlow: KeylessBackupFlow
@@ -260,6 +264,7 @@ export type StackParamList = {
   [Screens.Settings]: { promptConfirmRemovalModal?: boolean } | undefined
   [Screens.SignInWithEmail]: {
     keylessBackupFlow: KeylessBackupFlow
+    origin: KeylessBackupOrigin
   }
   [Screens.Spend]: undefined
   [Screens.StoreWipeRecoveryScreen]: undefined
diff --git a/src/onboarding/registration/ImportSelect.tsx b/src/onboarding/registration/ImportSelect.tsx
index 070f2b296e..d385cf3dd3 100644
--- a/src/onboarding/registration/ImportSelect.tsx
+++ b/src/onboarding/registration/ImportSelect.tsx
@@ -11,6 +11,7 @@ import Card from 'src/components/Card'
 import Touchable from 'src/components/Touchable'
 import CloudCheck from 'src/icons/CloudCheck'
 import Lock from 'src/icons/Lock'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { nuxNavigationOptions } from 'src/navigator/Headers'
 import { navigate, navigateClearingStack } from 'src/navigator/NavigationService'
@@ -91,7 +92,10 @@ export default function ImportSelect({ navigation }: Props) {
             description={t('importSelect.emailAndPhone.description')}
             icon={<CloudCheck color={colors.successDark} />}
             onPress={() =>
-              navigate(Screens.SignInWithEmail, { keylessBackupFlow: KeylessBackupFlow.Restore })
+              navigate(Screens.SignInWithEmail, {
+                keylessBackupFlow: KeylessBackupFlow.Restore,
+                origin: KeylessBackupOrigin.Onboarding,
+              })
             }
             testID="ImportSelect/CloudBackup"
           />

From 8e76cdf997d261a20fb2d56a09c4f51ea4ae3b72 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Wed, 12 Jun 2024 11:02:46 -0600
Subject: [PATCH 3/9] fix tests

---
 src/keylessBackup/KeylessBackupIntro.test.tsx     | 3 +++
 src/onboarding/registration/ImportSelect.test.tsx | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/keylessBackup/KeylessBackupIntro.test.tsx b/src/keylessBackup/KeylessBackupIntro.test.tsx
index 0246dc86cc..4e0f168dfd 100644
--- a/src/keylessBackup/KeylessBackupIntro.test.tsx
+++ b/src/keylessBackup/KeylessBackupIntro.test.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 import { KeylessBackupEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
 import KeylessBackupIntro from 'src/keylessBackup/KeylessBackupIntro'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -30,6 +31,7 @@ describe('KeylessBackupIntro', () => {
       })
       expect(navigate).toHaveBeenCalledWith(Screens.SignInWithEmail, {
         keylessBackupFlow: KeylessBackupFlow.Setup,
+        origin: KeylessBackupOrigin.Settings,
       })
     })
 
@@ -68,6 +70,7 @@ describe('KeylessBackupIntro', () => {
       })
       expect(navigate).toHaveBeenCalledWith(Screens.SignInWithEmail, {
         keylessBackupFlow: KeylessBackupFlow.Restore,
+        origin: KeylessBackupOrigin.Settings,
       })
     })
   })
diff --git a/src/onboarding/registration/ImportSelect.test.tsx b/src/onboarding/registration/ImportSelect.test.tsx
index abac180549..f8653a68dc 100644
--- a/src/onboarding/registration/ImportSelect.test.tsx
+++ b/src/onboarding/registration/ImportSelect.test.tsx
@@ -2,6 +2,7 @@ import { fireEvent, render } from '@testing-library/react-native'
 import * as React from 'react'
 import 'react-native'
 import { Provider } from 'react-redux'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow } from 'src/keylessBackup/types'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
@@ -37,6 +38,7 @@ describe('ImportSelect', () => {
     fireEvent.press(getByTestId('ImportSelect/CloudBackup'))
     expect(navigate).toHaveBeenCalledWith(Screens.SignInWithEmail, {
       keylessBackupFlow: KeylessBackupFlow.Restore,
+      origin: KeylessBackupOrigin.Onboarding,
     })
   })
 

From b3818487a936c88e745e4b14a526e706e533712e Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Wed, 12 Jun 2024 11:51:34 -0600
Subject: [PATCH 4/9] add unit tests

---
 .../KeylessBackupProgress.test.tsx            | 47 ++++++++++++++++++-
 src/keylessBackup/KeylessBackupProgress.tsx   | 10 +++-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/keylessBackup/KeylessBackupProgress.test.tsx b/src/keylessBackup/KeylessBackupProgress.test.tsx
index febb144eeb..986116c2b9 100644
--- a/src/keylessBackup/KeylessBackupProgress.test.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.test.tsx
@@ -40,10 +40,13 @@ function createStore(keylessBackupStatus: KeylessBackupStatus, zeroBalance = fal
   })
 }
 
-function getProps(flow: KeylessBackupFlow = KeylessBackupFlow.Setup) {
+function getProps(
+  flow: KeylessBackupFlow = KeylessBackupFlow.Setup,
+  origin: KeylessBackupOrigin = KeylessBackupOrigin.Settings
+) {
   return getMockStackScreenProps(Screens.KeylessBackupProgress, {
     keylessBackupFlow: flow,
-    origin: KeylessBackupOrigin.Settings,
+    origin,
   })
 }
 
@@ -119,6 +122,46 @@ describe('KeylessBackupProgress', () => {
         KeylessBackupEvents.cab_progress_failed_manual
       )
     })
+    it('navigates to recovery phrase on failure when coming from onboarding', async () => {
+      jest.mocked(ensurePincode).mockResolvedValueOnce(true)
+      const { getByTestId } = render(
+        <Provider store={createStore(KeylessBackupStatus.Failed)}>
+          <KeylessBackupProgress
+            {...getProps(KeylessBackupFlow.Setup, KeylessBackupOrigin.Onboarding)}
+          />
+        </Provider>
+      )
+      expect(getByTestId('KeylessBackupProgress/ManualOnboarding')).toBeTruthy()
+      fireEvent.press(getByTestId('KeylessBackupProgress/ManualOnboarding'))
+
+      await waitFor(() => expect(navigate).toHaveBeenCalledTimes(1))
+      expect(navigate).toHaveBeenCalledWith(Screens.AccountKeyEducation)
+
+      expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1)
+      expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+        KeylessBackupEvents.cab_progress_failed_manual_onboarding
+      )
+    })
+    it('navigates to recovery phrase on failure when coming from onboarding', async () => {
+      jest.mocked(ensurePincode).mockResolvedValueOnce(true)
+      const { getByTestId } = render(
+        <Provider store={createStore(KeylessBackupStatus.Failed)}>
+          <KeylessBackupProgress
+            {...getProps(KeylessBackupFlow.Setup, KeylessBackupOrigin.Onboarding)}
+          />
+        </Provider>
+      )
+      expect(getByTestId('KeylessBackupProgress/Skip')).toBeTruthy()
+      fireEvent.press(getByTestId('KeylessBackupProgress/Skip'))
+
+      await waitFor(() => expect(navigate).toHaveBeenCalledTimes(1))
+      expect(navigate).toHaveBeenCalledWith(Screens.ChooseYourAdventure)
+
+      expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1)
+      expect(ValoraAnalytics.track).toHaveBeenCalledWith(
+        KeylessBackupEvents.cab_progress_failed_skip_onboarding
+      )
+    })
   })
   describe('Restore', () => {
     it('Logs error when not started', async () => {
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index eab837fe01..f18efc9b0a 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -328,7 +328,11 @@ function Setup({ navigatedFromSettings }: { navigatedFromSettings: boolean }) {
             <Text style={styles.body}>{t('keylessBackupStatus.setup.failed.body')}</Text>
           </View>
           <Button
-            testID="KeylessBackupProgress/Later"
+            testID={
+              navigatedFromSettings
+                ? 'KeylessBackupProgress/Later'
+                : 'KeylessBackupProgress/ManualOnboarding'
+            }
             onPress={navigatedFromSettings ? onPressLater : onPressManualOnboarding}
             text={t(
               navigatedFromSettings
@@ -341,7 +345,9 @@ function Setup({ navigatedFromSettings }: { navigatedFromSettings: boolean }) {
             touchableStyle={styles.buttonTouchable}
           />
           <Button
-            testID="KeylessBackupProgress/Manual"
+            testID={
+              navigatedFromSettings ? 'KeylessBackupProgress/Manual' : 'KeylessBackupProgress/Skip'
+            }
             onPress={navigatedFromSettings ? onPressManual : onPressSkip}
             text={t(
               navigatedFromSettings

From 544efdf0c84332c581b8b4fe722f37b7df7665db Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Wed, 12 Jun 2024 12:08:10 -0600
Subject: [PATCH 5/9] fix test name

---
 src/keylessBackup/KeylessBackupProgress.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/keylessBackup/KeylessBackupProgress.test.tsx b/src/keylessBackup/KeylessBackupProgress.test.tsx
index 986116c2b9..c4ab0132fb 100644
--- a/src/keylessBackup/KeylessBackupProgress.test.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.test.tsx
@@ -142,7 +142,7 @@ describe('KeylessBackupProgress', () => {
         KeylessBackupEvents.cab_progress_failed_manual_onboarding
       )
     })
-    it('navigates to recovery phrase on failure when coming from onboarding', async () => {
+    it('navigates to CYA on failure when coming from onboarding', async () => {
       jest.mocked(ensurePincode).mockResolvedValueOnce(true)
       const { getByTestId } = render(
         <Provider store={createStore(KeylessBackupStatus.Failed)}>

From b9adcea207be080b20bf58448f1d48b7e28607ac Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Thu, 13 Jun 2024 12:13:55 -0600
Subject: [PATCH 6/9] feedback pt. 1

---
 src/analytics/Events.tsx                         |  1 -
 src/analytics/Properties.tsx                     |  4 ++--
 src/analytics/docs.ts                            |  1 -
 src/keylessBackup/KeylessBackupProgress.test.tsx |  2 +-
 src/keylessBackup/KeylessBackupProgress.tsx      | 12 ++++++------
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
index d82fa0e831..e1ce5e963b 100644
--- a/src/analytics/Events.tsx
+++ b/src/analytics/Events.tsx
@@ -112,7 +112,6 @@ export enum KeylessBackupEvents {
   cab_progress_completed_continue = 'cab_progress_completed_continue',
   cab_progress_failed_later = 'cab_progress_failed_later',
   cab_progress_failed_manual = 'cab_progress_failed_manual',
-  cab_progress_failed_manual_onboarding = 'cab_progress_failed_manual_onboarding',
   cab_progress_failed_skip_onboarding = 'cab_progress_failed_skip_onboarding',
   cab_post_encrypted_mnemonic_failed = 'cab_post_encrypted_mnemonic_failed',
   cab_torus_keyshare_timeout = 'cab_torus_keyshare_timeout',
diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
index 0e0300de7f..a125e92037 100644
--- a/src/analytics/Properties.tsx
+++ b/src/analytics/Properties.tsx
@@ -64,6 +64,7 @@ import { SerializableRewardsInfo } from 'src/earn/types'
 import { ProviderSelectionAnalyticsData } from 'src/fiatExchanges/types'
 import { CICOFlow, FiatExchangeFlow, PaymentMethod } from 'src/fiatExchanges/utils'
 import { HomeActionName, NotificationBannerCTATypes, NotificationType } from 'src/home/types'
+import { KeylessBackupOrigin } from 'src/keylessBackup/KeylessBackupProgress'
 import { KeylessBackupFlow, KeylessBackupStatus } from 'src/keylessBackup/types'
 import { LocalCurrencyCode } from 'src/localCurrency/consts'
 import { NftOrigin } from 'src/nfts/types'
@@ -264,8 +265,7 @@ interface KeylessBackupEventsProperties {
   [KeylessBackupEvents.cab_issue_valora_keyshare_error]: CommonKeylessBackupProps
   [KeylessBackupEvents.cab_progress_completed_continue]: undefined
   [KeylessBackupEvents.cab_progress_failed_later]: undefined
-  [KeylessBackupEvents.cab_progress_failed_manual]: undefined
-  [KeylessBackupEvents.cab_progress_failed_manual_onboarding]: undefined
+  [KeylessBackupEvents.cab_progress_failed_manual]: { origin: KeylessBackupOrigin }
   [KeylessBackupEvents.cab_progress_failed_skip_onboarding]: undefined
   [KeylessBackupEvents.cab_post_encrypted_mnemonic_failed]: {
     backupAlreadyExists: boolean
diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
index ecb06a996a..f66107d86e 100644
--- a/src/analytics/docs.ts
+++ b/src/analytics/docs.ts
@@ -144,7 +144,6 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [KeylessBackupEvents.cab_progress_completed_continue]: ``,
   [KeylessBackupEvents.cab_progress_failed_later]: ``,
   [KeylessBackupEvents.cab_progress_failed_manual]: ``,
-  [KeylessBackupEvents.cab_progress_failed_manual_onboarding]: ``,
   [KeylessBackupEvents.cab_progress_failed_skip_onboarding]: ``,
   [KeylessBackupEvents.cab_post_encrypted_mnemonic_failed]: ``,
   [KeylessBackupEvents.cab_torus_keyshare_timeout]: ``,
diff --git a/src/keylessBackup/KeylessBackupProgress.test.tsx b/src/keylessBackup/KeylessBackupProgress.test.tsx
index c4ab0132fb..d68a5e5d6d 100644
--- a/src/keylessBackup/KeylessBackupProgress.test.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.test.tsx
@@ -139,7 +139,7 @@ describe('KeylessBackupProgress', () => {
 
       expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1)
       expect(ValoraAnalytics.track).toHaveBeenCalledWith(
-        KeylessBackupEvents.cab_progress_failed_manual_onboarding
+        KeylessBackupEvents.cab_progress_failed_manual
       )
     })
     it('navigates to CYA on failure when coming from onboarding', async () => {
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index f18efc9b0a..765b6d2d67 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -44,8 +44,6 @@ function KeylessBackupProgress({
   const keylessBackupStatus = useSelector(keylessBackupStatusSelector)
   const { t } = useTranslation()
 
-  const navigatedFromSettings = route.params.origin === KeylessBackupOrigin.Settings
-
   const onPressHelp = () => {
     ValoraAnalytics.track(KeylessBackupEvents.cab_restore_failed_help)
     navigate(Screens.SupportContact)
@@ -76,7 +74,7 @@ function KeylessBackupProgress({
   if (route.params.keylessBackupFlow === KeylessBackupFlow.Restore) {
     return <Restore />
   } else {
-    return <Setup navigatedFromSettings={navigatedFromSettings} />
+    return <Setup origin={route.params.origin} />
   }
 }
 
@@ -257,17 +255,19 @@ function Restore() {
   }
 }
 
-function Setup({ navigatedFromSettings }: { navigatedFromSettings: boolean }) {
+function Setup({ origin }: { origin: KeylessBackupOrigin }) {
   const keylessBackupStatus = useSelector(keylessBackupStatusSelector)
   const { t } = useTranslation()
 
+  const navigatedFromSettings = origin === KeylessBackupOrigin.Settings
+
   const onPressContinue = () => {
     ValoraAnalytics.track(KeylessBackupEvents.cab_progress_completed_continue)
     navigateHome()
   }
 
   const onPressManual = async () => {
-    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_manual)
+    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_manual, { origin })
     try {
       const pinIsCorrect = await ensurePincode()
       if (pinIsCorrect) {
@@ -284,7 +284,7 @@ function Setup({ navigatedFromSettings }: { navigatedFromSettings: boolean }) {
   }
 
   const onPressManualOnboarding = () => {
-    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_manual_onboarding)
+    ValoraAnalytics.track(KeylessBackupEvents.cab_progress_failed_manual, { origin })
     navigate(Screens.AccountKeyEducation)
   }
 

From 35c10e7e249c59a8003211e4e96acd695f1d0454 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Thu, 13 Jun 2024 12:16:04 -0600
Subject: [PATCH 7/9] feedback pt. 2

---
 src/keylessBackup/KeylessBackupPhoneInput.tsx | 4 ++--
 src/keylessBackup/SignInWithEmail.tsx         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/keylessBackup/KeylessBackupPhoneInput.tsx b/src/keylessBackup/KeylessBackupPhoneInput.tsx
index d9ba331f8e..24fb517717 100644
--- a/src/keylessBackup/KeylessBackupPhoneInput.tsx
+++ b/src/keylessBackup/KeylessBackupPhoneInput.tsx
@@ -28,7 +28,7 @@ type Props = NativeStackScreenProps<StackParamList, Screens.KeylessBackupPhoneIn
 
 function KeylessBackupPhoneInput({ route }: Props) {
   const { t } = useTranslation()
-  const { selectedCountryCodeAlpha2, keylessBackupFlow } = route.params
+  const { selectedCountryCodeAlpha2, keylessBackupFlow, origin } = route.params
   const cachedNumber = useSelector(e164NumberSelector)
   const cachedCountryCallingCode = useSelector(defaultCountryCodeSelector)
   const countries = useMemo(() => new Countries(i18n.language), [i18n.language])
@@ -78,7 +78,7 @@ function KeylessBackupPhoneInput({ route }: Props) {
         navigate(Screens.KeylessBackupPhoneInput, {
           keylessBackupFlow,
           selectedCountryCodeAlpha2: countryCodeAlpha2,
-          origin: route.params.origin,
+          origin,
         })
       },
     })
diff --git a/src/keylessBackup/SignInWithEmail.tsx b/src/keylessBackup/SignInWithEmail.tsx
index 78a186f90a..1d56a77a23 100644
--- a/src/keylessBackup/SignInWithEmail.tsx
+++ b/src/keylessBackup/SignInWithEmail.tsx
@@ -28,7 +28,7 @@ function SignInWithEmail({ route }: Props) {
   const { t } = useTranslation()
   const dispatch = useDispatch()
   const { authorize, getCredentials, clearCredentials } = useAuth0()
-  const { keylessBackupFlow } = route.params
+  const { keylessBackupFlow, origin } = route.params
   const [loading, setLoading] = useState(false)
 
   const onPressGoogle = async () => {
@@ -57,7 +57,7 @@ function SignInWithEmail({ route }: Props) {
       if (!credentials.idToken) {
         throw new Error('got an empty token from auth0')
       }
-      navigate(Screens.KeylessBackupPhoneInput, { keylessBackupFlow, origin: route.params.origin })
+      navigate(Screens.KeylessBackupPhoneInput, { keylessBackupFlow, origin })
       dispatch(googleSignInCompleted({ idToken: credentials.idToken }))
       ValoraAnalytics.track(KeylessBackupEvents.cab_sign_in_with_google_success, {
         keylessBackupFlow,

From 6b710fd2d06239733f76684681d12d7489fafa01 Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Thu, 13 Jun 2024 13:27:00 -0600
Subject: [PATCH 8/9] fix tests

---
 src/keylessBackup/KeylessBackupProgress.test.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/keylessBackup/KeylessBackupProgress.test.tsx b/src/keylessBackup/KeylessBackupProgress.test.tsx
index d68a5e5d6d..5a62c90d31 100644
--- a/src/keylessBackup/KeylessBackupProgress.test.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.test.tsx
@@ -119,7 +119,8 @@ describe('KeylessBackupProgress', () => {
 
       expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1)
       expect(ValoraAnalytics.track).toHaveBeenCalledWith(
-        KeylessBackupEvents.cab_progress_failed_manual
+        KeylessBackupEvents.cab_progress_failed_manual,
+        { origin: KeylessBackupOrigin.Settings }
       )
     })
     it('navigates to recovery phrase on failure when coming from onboarding', async () => {
@@ -139,7 +140,8 @@ describe('KeylessBackupProgress', () => {
 
       expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1)
       expect(ValoraAnalytics.track).toHaveBeenCalledWith(
-        KeylessBackupEvents.cab_progress_failed_manual
+        KeylessBackupEvents.cab_progress_failed_manual,
+        { origin: KeylessBackupOrigin.Onboarding }
       )
     })
     it('navigates to CYA on failure when coming from onboarding', async () => {

From 3e2131940f4db0effab2a83185a3b320d47eaedf Mon Sep 17 00:00:00 2001
From: Finnian Jacobson-Schulte
 <140328381+finnian0826@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:45:38 -0600
Subject: [PATCH 9/9] nits

---
 src/keylessBackup/KeylessBackupPhoneInput.tsx | 2 +-
 src/keylessBackup/KeylessBackupProgress.tsx   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/keylessBackup/KeylessBackupPhoneInput.tsx b/src/keylessBackup/KeylessBackupPhoneInput.tsx
index 24fb517717..a721262545 100644
--- a/src/keylessBackup/KeylessBackupPhoneInput.tsx
+++ b/src/keylessBackup/KeylessBackupPhoneInput.tsx
@@ -91,7 +91,7 @@ function KeylessBackupPhoneInput({ route }: Props) {
     navigate(Screens.KeylessBackupPhoneCodeInput, {
       keylessBackupFlow,
       e164Number: phoneNumberInfo.e164Number,
-      origin: route.params.origin,
+      origin,
     })
   }
 
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index 765b6d2d67..32a0100da2 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -43,6 +43,7 @@ function KeylessBackupProgress({
 }: NativeStackScreenProps<StackParamList, Screens.KeylessBackupProgress>) {
   const keylessBackupStatus = useSelector(keylessBackupStatusSelector)
   const { t } = useTranslation()
+  const { keylessBackupFlow, origin } = route.params
 
   const onPressHelp = () => {
     ValoraAnalytics.track(KeylessBackupEvents.cab_restore_failed_help)
@@ -60,7 +61,7 @@ function KeylessBackupProgress({
     navigation.setOptions({
       headerRight: () =>
         keylessBackupStatus === KeylessBackupStatus.Failed &&
-        route.params.keylessBackupFlow === KeylessBackupFlow.Restore && (
+        keylessBackupFlow === KeylessBackupFlow.Restore && (
           <TopBarTextButton
             title={t('keylessBackupStatus.restore.failed.help')}
             testID="KeylessBackupRestoreHelp"
@@ -71,10 +72,10 @@ function KeylessBackupProgress({
     })
   })
 
-  if (route.params.keylessBackupFlow === KeylessBackupFlow.Restore) {
+  if (keylessBackupFlow === KeylessBackupFlow.Restore) {
     return <Restore />
   } else {
-    return <Setup origin={route.params.origin} />
+    return <Setup origin={origin} />
   }
 }