fix: fix scan qrcode the app crash

helium · Oct 8, 2024 · 75d2bc3 · 75d2bc3
1 parent 874b80a
commit 75d2bc3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 deletions.
diff --git a/src/features/keystone/ScanQrCodeScreen.tsx b/src/features/keystone/ScanQrCodeScreen.tsx
@@ -5,28 +5,48 @@ import { URDecoder } from '@ngraveio/bc-ur'
 import KeystoneSDK, { MultiAccounts, UR } from '@keystonehq/keystone-sdk'
 import { RootNavigationProp } from 'src/navigation/rootTypes'
 import { useNavigation } from '@react-navigation/native'
+import { Alert } from 'react-native'
+import { useTranslation } from 'react-i18next'
 import { KeystoneAccountType } from './SelectKeystoneAccountsScreen'
 
 const ScanQrCodeScreen = () => {
+  const { t } = useTranslation()
   const navigation = useNavigation<RootNavigationProp>()
   const [multiAccounts, setMultiAccounts] = useState<MultiAccounts>()
   const decoder = useMemo(() => new URDecoder(), [])
   const [isScanQrCodeComplete, setIsScanQrCodeComplete] = useState(false)
   const [progress, setProgress] = useState<number>(0)
+  const [isUnexpectedQrCode, setIsUnexpectedQrCode] = useState(false)
   const handleBarCodeScanned = (qrString: string) => {
-    decoder.receivePart(qrString.toLowerCase())
-    setProgress(Number((decoder.getProgress() * 100).toFixed(0)))
-    if (decoder.isComplete()) {
-      const ur = decoder.resultUR()
-      const qrCodeDataRes: MultiAccounts = new KeystoneSDK().parseMultiAccounts(
-        new UR(Buffer.from(ur.cbor.toString('hex'), 'hex'), ur.type),
-      )
-      setProgress(100)
-      setIsScanQrCodeComplete(true)
-      setMultiAccounts(qrCodeDataRes)
+    // fix unexpected qrcode string
+    try {
+      decoder.receivePart(qrString.toLowerCase())
+      setProgress(Number((decoder.getProgress() * 100).toFixed(0)))
+      if (decoder.isComplete()) {
+        const ur = decoder.resultUR()
+        const qrCodeDataRes: MultiAccounts =
+          new KeystoneSDK().parseMultiAccounts(
+            new UR(Buffer.from(ur.cbor.toString('hex'), 'hex'), ur.type),
+          )
+        setProgress(100)
+        setIsScanQrCodeComplete(true)
+        setMultiAccounts(qrCodeDataRes)
+      }
+    } catch (error) {
+      setIsUnexpectedQrCode(true)
     }
   }
 
+  useEffect(() => {
+    if (isUnexpectedQrCode) {
+      Alert.alert(
+        t('keystone.connectKeystoneStart.unexpectedQrCodeTitle'),
+        t('keystone.connectKeystoneStart.unexpectedQrCodeContent'),
+      )
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isUnexpectedQrCode])
+
   useEffect(() => {
     if (isScanQrCodeComplete) {
       const derivationAccounts: KeystoneAccountType[] = []

diff --git a/src/locales/en.ts b/src/locales/en.ts
@@ -771,6 +771,9 @@ export default {
       scanQrCode: 'Scan QR Code',
       warning: 'Please enable your camera permission via [Settings]',
       ok: 'OK',
+      unexpectedQrCodeContent:
+        'The QR code you scanned is not valid. Please try again.',
+      unexpectedQrCodeTitle: 'Unexpected QR Code',
     },
     selectKeystoneAccounts: {
       subtitle: