diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
index 63c96fcf1..4e89fb3ee 100644
--- a/app/ios/Podfile.lock
+++ b/app/ios/Podfile.lock
@@ -445,7 +445,7 @@ PODS:
   - React-jsinspector (0.72.5)
   - React-logger (0.72.5):
     - glog
-  - "react-native-attestation (1.0.0-alpha.281+60a3a6ad)":
+  - "react-native-attestation (1.0.0-alpha.284+ed80d848)":
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-config (1.5.0):
@@ -931,7 +931,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a
   React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba
   React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4
-  react-native-attestation: 3673b5d74e1d457143cf9d0bd8f1fca1466e6175
+  react-native-attestation: 80e20ec3aa7351076489302a7f06017abbf635fb
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-encrypted-storage: db300a3f2f0aba1e818417c1c0a6be549038deb7
   react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
diff --git a/app/package.json b/app/package.json
index c512f52d8..bde559afb 100644
--- a/app/package.json
+++ b/app/package.json
@@ -61,11 +61,11 @@
     "@formatjs/intl-relativetimeformat": "9.3.1",
     "@hyperledger/anoncreds-react-native": "0.2.2",
     "@hyperledger/aries-askar-react-native": "0.2.3",
-    "@hyperledger/aries-bifold-core": "1.0.0-alpha.281",
-    "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.281",
-    "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.281",
-    "@hyperledger/aries-oca": "1.0.0-alpha.281",
-    "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.281",
+    "@hyperledger/aries-bifold-core": "1.0.0-alpha.284",
+    "@hyperledger/aries-bifold-remote-logs": "1.0.0-alpha.284",
+    "@hyperledger/aries-bifold-verifier": "1.0.0-alpha.284",
+    "@hyperledger/aries-oca": "1.0.0-alpha.284",
+    "@hyperledger/aries-react-native-attestation": "1.0.0-alpha.284",
     "@hyperledger/indy-vdr-react-native": "0.2.2",
     "@hyperledger/indy-vdr-shared": "0.2.2",
     "@react-native-async-storage/async-storage": "1.15.11",
diff --git a/app/src/screens/Splash.tsx b/app/src/screens/Splash.tsx
index 533925320..38b763026 100644
--- a/app/src/screens/Splash.tsx
+++ b/app/src/screens/Splash.tsx
@@ -121,7 +121,7 @@ const Splash = () => {
   const { t } = useTranslation()
   const [store, dispatch] = useStore<BCState>()
   const navigation = useNavigation()
-  const { getWalletCredentials } = useAuth()
+  const { walletSecret } = useAuth()
   const { ColorPallet, Assets } = useTheme()
   const { showPreface, enablePushNotifications } = useConfiguration()
   const [mounted, setMounted] = useState(false)
@@ -314,6 +314,8 @@ const Splash = () => {
           !mounted ||
           !store.authentication.didAuthenticate ||
           !store.onboarding.didConsiderBiometry ||
+          !walletSecret?.id ||
+          !walletSecret.key ||
           store.onboarding.postAuthScreens.length > 0
         ) {
           return
@@ -322,12 +324,6 @@ const Splash = () => {
         setStep(3)
 
         await ocaBundleResolver.checkForUpdates()
-        const credentials = await getWalletCredentials()
-
-        if (!credentials?.id || !credentials.key) {
-          // Cannot find wallet id/secret
-          return
-        }
 
         setStep(4)
         const cachedLedgers = await loadCachedLedgers()
@@ -337,8 +333,8 @@ const Splash = () => {
           config: {
             label: store.preferences.walletName || 'BC Wallet',
             walletConfig: {
-              id: credentials.id,
-              key: credentials.key,
+              id: walletSecret.id,
+              key: walletSecret.key,
             },
             logger,
             mediatorPickupStrategy: MediatorPickupStrategy.Implicit,
@@ -371,7 +367,7 @@ const Splash = () => {
         if (!didMigrateToAskar(store.migration)) {
           logger.debug('Agent not updated to Aries Askar, updating...')
 
-          await migrateToAskar(credentials.id, credentials.key, newAgent)
+          await migrateToAskar(walletSecret.id, walletSecret.key, newAgent)
 
           logger.debug('Successfully finished updating agent to Aries Askar')
           // Store that we migrated to askar.
@@ -455,6 +451,7 @@ const Splash = () => {
     store.authentication.didAuthenticate,
     store.onboarding.postAuthScreens.length,
     store.onboarding.didConsiderBiometry,
+    walletSecret,
     initAgentCount,
   ])
 
diff --git a/yarn.lock b/yarn.lock
index 322711652..c632bbd13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3079,9 +3079,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.281":
-  version: 1.0.0-alpha.281
-  resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.281"
+"@hyperledger/aries-bifold-core@npm:1.0.0-alpha.284":
+  version: 1.0.0-alpha.284
+  resolution: "@hyperledger/aries-bifold-core@npm:1.0.0-alpha.284"
   peerDependencies:
     "@credo-ts/anoncreds": 0.5.9
     "@credo-ts/askar": 0.5.9
@@ -3155,13 +3155,13 @@ __metadata:
     uuid: ^9.0.0
   bin:
     bifold: bin/bifold
-  checksum: 2d1857aab0bb224040b58fb69172611a9e63b3a426f5cb58cf78b53389d2792ecf4188bea7ea162fa5a53b2abee2163f699a4271c17bb4fb386686bd1cfa8e1b
+  checksum: 795d0a5a17ba89f687df31542d2dbe784532ee34024d45d2494af5b33382facc12f711706078156d70357706576fc3657c7993be2f805aa04d87c6de7361cc7f
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.281":
-  version: 1.0.0-alpha.281
-  resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.281"
+"@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.284":
+  version: 1.0.0-alpha.284
+  resolution: "@hyperledger/aries-bifold-remote-logs@npm:1.0.0-alpha.284"
   peerDependencies:
     "@credo-ts/core": 0.5.9
     axios: ^1.4.0
@@ -3169,43 +3169,43 @@ __metadata:
     react: ^18.2.0
     react-native: ^0.72.5
     react-native-logs: ^5.1.0
-  checksum: 7b19c327ecac6bfb491bab08ceb3cc6f35bd7888af4630d8cf591c601d7fe9d90c7b6b5d68861358b11d11a8f963ec714e15bf085f20b78f3d8f43f61ca151d0
+  checksum: 381fc2b4c9ab46ff51f61f0ef5c2e120651c61d9bb41ee4553edcec4413d2e17b4fd50c12571745380bbbe0021a7eb1a29f7b8ea689fe008b57236f820c04ba0
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.281":
-  version: 1.0.0-alpha.281
-  resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.281"
+"@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.284":
+  version: 1.0.0-alpha.284
+  resolution: "@hyperledger/aries-bifold-verifier@npm:1.0.0-alpha.284"
   peerDependencies:
     "@credo-ts/anoncreds": 0.5.9
     "@credo-ts/core": 0.5.9
     "@credo-ts/react-hooks": ^0.6.0
     "@hyperledger/anoncreds-shared": 0.2.2
     react: ^18.2.0
-  checksum: 37d08f5606f4dd4e578a56dbe09c532d7e3552e7bad6b61615b647a4fd6963232c3dcad73abcf49eab54e952c11fa9f85df9e8042426724e78d1141d7cceda37
+  checksum: a2b783a1415596aed464df2c218d9f01f823dcd4de4bcff17e3184a05d55fd92e6a06ecad132c7613945c0b80bcb6c08c6b6d5c451bc83f1fc12fb6f3636fa29
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-oca@npm:1.0.0-alpha.281":
-  version: 1.0.0-alpha.281
-  resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.281"
+"@hyperledger/aries-oca@npm:1.0.0-alpha.284":
+  version: 1.0.0-alpha.284
+  resolution: "@hyperledger/aries-oca@npm:1.0.0-alpha.284"
   dependencies:
     "@credo-ts/anoncreds": "npm:0.5.9"
     "@credo-ts/core": "npm:0.5.9"
     axios: "npm:^1.4.0"
     lodash.startcase: "npm:^4.4.0"
     react-native-fs: "npm:^2.16.6"
-  checksum: 5520cd800b50622f4f1dc327f352c7522831c2d2805af7af489790e1350aa1d641db9cc015e3ccf1768998e494ba5ebc08249c41ef2d07c0ac972d3a58f7691e
+  checksum: e4543725ec90abf0230967c35a002a7b27f4d96686b73184d4d3398bf0f69e2f869bcb20c13ca7df7b6a02dd19ae8f173f80e0f64db2ec0cd04ce767ed1180eb
   languageName: node
   linkType: hard
 
-"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.281":
-  version: 1.0.0-alpha.281
-  resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.281"
+"@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.284":
+  version: 1.0.0-alpha.284
+  resolution: "@hyperledger/aries-react-native-attestation@npm:1.0.0-alpha.284"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: d8191410771f7a1701344a1393e9b4ab9b3e29e77bce5319d812380c83f84da7fac27881e27b8d96fc7765cf26548365e3a3495542cbdae1b2f7c584c51d0db0
+  checksum: 60f90f3ac4e2adc83962f39f9cb4eb5456b387168ee91e66bd5bfbc5f06e0e65827e0f0c12bf25448a421a24186c27f5f68605eeae1e723e6607d94b8537df78
   languageName: node
   linkType: hard
 
@@ -7821,11 +7821,11 @@ __metadata:
     "@formatjs/intl-relativetimeformat": "npm:9.3.1"
     "@hyperledger/anoncreds-react-native": "npm:0.2.2"
     "@hyperledger/aries-askar-react-native": "npm:0.2.3"
-    "@hyperledger/aries-bifold-core": "npm:1.0.0-alpha.281"
-    "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.281"
-    "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.281"
-    "@hyperledger/aries-oca": "npm:1.0.0-alpha.281"
-    "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.281"
+    "@hyperledger/aries-bifold-core": "npm:1.0.0-alpha.284"
+    "@hyperledger/aries-bifold-remote-logs": "npm:1.0.0-alpha.284"
+    "@hyperledger/aries-bifold-verifier": "npm:1.0.0-alpha.284"
+    "@hyperledger/aries-oca": "npm:1.0.0-alpha.284"
+    "@hyperledger/aries-react-native-attestation": "npm:1.0.0-alpha.284"
     "@hyperledger/indy-vdr-react-native": "npm:0.2.2"
     "@hyperledger/indy-vdr-shared": "npm:0.2.2"
     "@react-native-async-storage/async-storage": "npm:1.15.11"