fix bug in display errors

minotaur-ergo · Jan 7, 2024 · 58b91f8 · 58b91f8
1 parent 60a82bb
commit 58b91f8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/src/components/qrcode/QrCodeReaderView.tsx b/src/components/qrcode/QrCodeReaderView.tsx
@@ -141,19 +141,29 @@ class QrCodeReaderView extends React.Component<
   };
 
   renderSubComponent = () => {
-    const selectedType = Types.filter((item) => item.type === this.state.type);
-    if (selectedType.length > 0) {
-      return selectedType[0].render(
-        this.state.chunks.join(''),
-        this.props.close,
-        this.props.completed,
-        this.props.wallet
+    try {
+      const selectedType = Types.filter(
+        (item) => item.type === this.state.type
       );
+      if (selectedType.length > 0) {
+        return selectedType[0].render(
+          this.state.chunks.join(''),
+          this.props.close,
+          this.props.completed,
+          this.props.wallet
+        );
+      }
+      Toast.show({
+        text: `No Renderer type detected for ${this.state.type}`,
+      }).then(() => null);
+      return null;
+    } catch (e) {
+      console.warn(e);
+      Toast.show({
+        text: `Invalid Data Scanned`,
+      }).then(() => null);
+      this.props.fail();
     }
-    Toast.show({
-      text: `No Renderer type detected for ${this.state.type}`,
-    }).then(() => null);
-    return null;
   };
 
   render = () => {

diff --git a/src/components/qrcode/qrcode-types/index.tsx b/src/components/qrcode/qrcode-types/index.tsx
@@ -66,13 +66,15 @@ const Types = [
       close: () => unknown,
       completed?: (result: string) => unknown,
       wallet?: Wallet
-    ) => (
-      <TransactionSignRequest
-        completed={completed}
-        tx={JsonBI.parse(param)}
-        closeQrcode={close}
-      />
-    ),
+    ) => {
+      return (
+        <TransactionSignRequest
+          completed={completed}
+          tx={JsonBI.parse(param)}
+          closeQrcode={close}
+        />
+      );
+    },
     type: TxSignR,
     detect: (value: string) => detectPageFromJson(value, TxSignR),
   },