fix: Initiate Multi Sig from FullPageScanner button

cardano-foundation · May 8, 2024 · 1c0295a · 1c0295a
1 parent f58cf8b
commit 1c0295a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/ui/components/Scanner/Scanner.tsx b/src/ui/components/Scanner/Scanner.tsx
@@ -27,7 +27,10 @@ import { Agent } from "../../../core/agent/agent";
 import { ScannerProps } from "./Scanner.types";
 import { KeriConnectionType } from "../../../core/agent/agent.types";
 import { CreateIdentifier } from "../CreateIdentifier";
-import { setMultiSigGroupCache } from "../../../store/reducers/identifiersCache";
+import {
+  getMultiSigGroupCache,
+  setMultiSigGroupCache,
+} from "../../../store/reducers/identifiersCache";
 import { MultiSigGroup } from "../../../store/reducers/identifiersCache/identifiersCache.types";
 import { PageFooter } from "../PageFooter";
 import { ResponsiveModal } from "../layout/ResponsiveModal";
@@ -38,6 +41,7 @@ const Scanner = forwardRef(
   ({ setIsValueCaptured, handleReset }: ScannerProps, ref) => {
     const componentId = "scanner";
     const dispatch = useAppDispatch();
+    const multiSigGroupCache = useAppSelector(getMultiSigGroupCache);
     const currentOperation = useAppSelector(getCurrentOperation);
     const currentToastMsg = useAppSelector(getToastMsg);
     const currentRoute = useAppSelector(getCurrentRoute);
@@ -176,7 +180,7 @@ const Scanner = forwardRef(
             pageId={componentId}
             primaryButtonText={`${i18n.t("createidentifier.scan.initiate")}`}
             primaryButtonAction={handlePrimaryButtonAction}
-            primaryButtonDisabled={false} // @TODO: sdisalvo - Get list of scanned QR codes to check if we can enable this button
+            primaryButtonDisabled={!multiSigGroupCache?.connections.length}
             secondaryButtonText={`${i18n.t(
               "createidentifier.scan.pasteoobi"
             )}`}

diff --git a/src/ui/pages/FullPageScanner/FullPageScanner.tsx b/src/ui/pages/FullPageScanner/FullPageScanner.tsx
@@ -30,14 +30,19 @@ const FullPageScanner = ({ showScan, setShowScan }: FullPageScannerProps) => {
       ?.classList.add("hide");
   };
 
+  const handleCloseButton = () => {
+    handleReset();
+    dispatch(setCurrentOperation(OperationType.IDLE));
+  };
+
   return (
     <ResponsivePageLayout
       pageId={pageId}
       activeStatus={showScan}
       header={
         <PageHeader
           closeButton={true}
-          closeButtonAction={handleReset}
+          closeButtonAction={handleCloseButton}
           closeButtonIcon={arrowBackOutline}
         />
       }