fix: try to fix bootstrap issue.

RabbyHub · Jul 3, 2024 · 77b70ba · 77b70ba
1 parent 39868e2
commit 77b70ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/apps/mobile/src/core/storage/mmkv.ts b/apps/mobile/src/core/storage/mmkv.ts
@@ -3,6 +3,7 @@
 
 import { MMKV, MMKVConfiguration } from 'react-native-mmkv';
 
+import { stringUtils } from '@rabby-wallet/base-utils';
 import { StorageAdapater } from '@rabby-wallet/persist-store';
 import { atomWithStorage, createJSONStorage } from 'jotai/utils';
 import { SyncStorage } from 'jotai/vanilla/utils/atomWithStorage';
@@ -12,7 +13,10 @@ export function makeAppStorage(options?: MMKVConfiguration) {
 
   function getItem<T>(key: string): T | null {
     const value = mmkv.getString(key);
-    return value ? JSON.parse(value) : null;
+
+    return !value
+      ? null
+      : stringUtils.safeParseJSON(value, { defaultValue: null });
   }
 
   function setItem<T>(key: string, value: T): void {

diff --git a/packages/base-utils/src/isomorphic/string.ts b/packages/base-utils/src/isomorphic/string.ts
@@ -21,3 +21,11 @@ export function unSuffix(str = '', suffix = '/') {
 export function isStringOrNumber(data: any) {
   return typeof data === 'string' || typeof data === 'number';
 }
+
+export function safeParseJSON<T = any>(json: string, options?: { defaultValue?: any }): T | null {
+  try {
+    return JSON.parse(json);
+  } catch (error) {
+    return options?.defaultValue ?? null;
+  }
+}