Add reveal mnemonic logic

trilitech · Dec 9, 2024 · 51370df · 51370df
1 parent 013b870
commit 51370df
Show file tree

Hide file tree

Showing 10 changed files with 210 additions and 67 deletions.
diff --git a/apps/desktop/public/electron.js b/apps/desktop/public/electron.js
@@ -1,5 +1,5 @@
 // Module to control the application lifecycle and the native browser window.
-const { app, BrowserWindow, shell, net, ipcMain, protocol } = require("electron");
+const { app, BrowserWindow, shell, net, ipcMain, protocol, clipboard } = require("electron");
 const path = require("path");
 const url = require("url");
 const process = require("process");
@@ -242,6 +242,14 @@ function start() {
 
   // Listen to install-app-update event from UI, start update on getting the event.
   ipcMain.on("install-app-update", () => autoUpdater.quitAndInstall());
+
+  ipcMain.on("clipboard-write", (_, text) => {
+    clipboard.writeText(text);
+  });
+
+  ipcMain.on("clipboard-clear", () => {
+    clipboard.clear();
+  });
 }
 
 start();
diff --git a/apps/desktop/public/preload.js b/apps/desktop/public/preload.js
@@ -17,4 +17,7 @@ contextBridge.exposeInMainWorld("electronAPI", {
 
   // Notify Electron that app update should be installed.
   installAppUpdateAndQuit: () => ipcRenderer.send("install-app-update"),
+
+  clipboardWriteText: text => ipcRenderer.send("clipboard-write", text),
+  clipboardClear: () => ipcRenderer.send("clipboard-clear"),
 });
diff --git a/apps/desktop/src/components/Onboarding/notice/Notice.tsx b/apps/desktop/src/components/Onboarding/notice/Notice.tsx
@@ -14,7 +14,7 @@ export const Notice = ({ goToStep }: { goToStep: (step: OnboardingStep) => void
       content: "Make sure there is no one around you or looking over your shoulder.",
     },
     {
-      content: "Do not copy and paste the Seed Phrase or store it on your device.",
+      content: "Do not store Seed Phrase on your device.",
     },
     {
       content: "Do not take a screenshot of your Seed Phrase.",

diff --git a/apps/desktop/src/components/Onboarding/showSeedphrase/ShowSeedphrase.tsx b/apps/desktop/src/components/Onboarding/showSeedphrase/ShowSeedphrase.tsx
@@ -1,59 +1,134 @@
-import { Button, Flex, Heading, SimpleGrid, Text, VStack } from "@chakra-ui/react";
+import {
+  Button,
+  Flex,
+  Heading,
+  Popover,
+  PopoverArrow,
+  PopoverBody,
+  PopoverContent,
+  PopoverTrigger,
+  SimpleGrid,
+  Text,
+  VStack,
+  useDisclosure,
+} from "@chakra-ui/react";
+import { useState } from "react";
 
-import { KeyIcon } from "../../../assets/icons";
+import { EyeIcon, EyeSlashIcon, FileCopyIcon, KeyIcon } from "../../../assets/icons";
 import colors from "../../../style/colors";
 import { ModalContentWrapper } from "../ModalContentWrapper";
 import { type OnboardingStep, type ShowSeedphraseStep } from "../OnboardingStep";
 
+const COPY_TIMEOUT = 30_000;
+const COPIED_POPUP_DURATION = 2000;
+
 export const ShowSeedphrase = ({
   goToStep,
   account,
 }: {
   goToStep: (step: OnboardingStep) => void;
   account: ShowSeedphraseStep["account"];
-}) => (
-  <ModalContentWrapper
-    icon={<KeyIcon width="24px" height="24px" />}
-    subtitle="Please record the following 24 words in sequence in order to restore it in the future."
-    title="Record Seed Phrase"
-  >
-    <VStack>
-      <SimpleGrid columns={3} spacing={2}>
-        {account.mnemonic.split(" ").map((item, index) => (
-          <Flex
-            key={index}
-            width="126px"
-            padding="6px"
-            border="1px dashed"
-            borderColor={colors.gray[500]}
-            borderRadius="4px"
-          >
-            <Heading
-              width="18px"
-              marginRight="10px"
-              paddingTop="2px"
-              color={colors.gray[450]}
-              textAlign="right"
-              size="sm"
+}) => {
+  const [isHidden, setIsHidden] = useState(false);
+  const {
+    isOpen: isPopoverOpen,
+    onOpen: setIsPopoverOpen,
+    onClose: setIsPopoverClose,
+  } = useDisclosure();
+
+  const handleCopy = () => {
+    // window.electronAPI.clipboardWriteText(account.mnemonic);
+    setIsPopoverOpen();
+
+    setTimeout(() => {
+      setIsPopoverClose();
+    }, COPIED_POPUP_DURATION);
+
+    setTimeout(() => {
+      window.electronAPI.clipboardClear();
+    }, COPY_TIMEOUT);
+  };
+
+  return (
+    <ModalContentWrapper
+      icon={<KeyIcon width="24px" height="24px" />}
+      subtitle="Please record the following 24 words in sequence in order to restore it in the future."
+      title="Record Seed Phrase"
+    >
+      <VStack>
+        <SimpleGrid userSelect="none" columns={3} spacing={2}>
+          {account.mnemonic.split(" ").map((item, index) => (
+            <Flex
+              key={index}
+              width="126px"
+              padding="6px"
+              border="1px dashed"
+              borderColor={colors.gray[500]}
+              borderRadius="4px"
             >
-              {index + 1}
-            </Heading>
-            <Text data-testid={`mnemonic-word-${index}`} size="sm">
-              {item}
-            </Text>
-          </Flex>
-        ))}
-      </SimpleGrid>
-      <Button
-        width="100%"
-        marginTop="20px"
-        onClick={_ => {
-          goToStep({ type: "verifySeedphrase", account });
-        }}
-        size="lg"
-      >
-        OK, I've recorded it
-      </Button>
-    </VStack>
-  </ModalContentWrapper>
-);
+              <Heading
+                width="18px"
+                marginRight="10px"
+                paddingTop="2px"
+                color={colors.gray[450]}
+                textAlign="right"
+                size="sm"
+              >
+                {index + 1}
+              </Heading>
+              <Text
+                sx={{
+                  WebkitTextSecurity: isHidden ? "disc" : "none",
+                }}
+                data-testid={`mnemonic-word-${index}`}
+                size="sm"
+              >
+                {isHidden ? "********" : item}
+              </Text>
+            </Flex>
+          ))}
+        </SimpleGrid>
+        <Flex justifyContent="space-between" gap="16px" width="100%" marginTop="20px">
+          <Button
+            width="100%"
+            leftIcon={isHidden ? <EyeSlashIcon /> : <EyeIcon />}
+            onClick={() => setIsHidden(!isHidden)}
+            variant="outline"
+          >
+            {isHidden ? "Show" : "Hide"} seed phrase
+          </Button>
+          <Popover autoFocus={false} closeOnBlur={false} isOpen={isPopoverOpen}>
+            <PopoverTrigger>
+              <Button
+                width="100%"
+                leftIcon={<FileCopyIcon stroke={colors.gray[450]} />}
+                onClick={handleCopy}
+                variant="outline"
+              >
+                Copy to clipboard
+              </Button>
+            </PopoverTrigger>
+            <PopoverContent maxWidth="max-content" background="white">
+              <PopoverArrow background="white !important" />
+              <PopoverBody padding="8px 12px">
+                <Text color="black" fontWeight="medium" size="sm">
+                  Copied!
+                </Text>
+              </PopoverBody>
+            </PopoverContent>
+          </Popover>
+        </Flex>
+        <Button
+          width="100%"
+          marginTop="8px"
+          onClick={_ => {
+            goToStep({ type: "verifySeedphrase", account });
+          }}
+          size="lg"
+        >
+          OK, I've recorded it
+        </Button>
+      </VStack>
+    </ModalContentWrapper>
+  );
+};
diff --git a/apps/desktop/src/global.d.ts b/apps/desktop/src/global.d.ts
@@ -0,0 +1,13 @@
+export {};
+
+declare global {
+  interface Window {
+    electronAPI: {
+      clipboardWriteText: (text: string) => void;
+      clipboardClear: () => void;
+      onDeeplink: (callback: (url: string) => void) => void;
+      onAppUpdateDownloaded: (callback: () => void) => void;
+      installAppUpdateAndQuit: () => void;
+    };
+  }
+}
diff --git a/apps/web/src/components/CopyButton/CopyButton.tsx b/apps/web/src/components/CopyButton/CopyButton.tsx
@@ -13,12 +13,21 @@ import { type MouseEvent, type PropsWithChildren } from "react";
 
 import { useColor } from "../../styles/useColor";
 
+const COPY_TIMEOUT = 30_000;
+
+type CopyButtonProps = {
+  value: string;
+  isCopyDisabled?: boolean;
+  isDisposable?: boolean;
+} & ButtonProps;
+
 export const CopyButton = ({
   value,
   children,
   isCopyDisabled = false,
+  isDisposable = false,
   ...props
-}: PropsWithChildren<{ value: string; isCopyDisabled?: boolean } & ButtonProps>) => {
+}: PropsWithChildren<CopyButtonProps>) => {
   const color = useColor();
 
   const { isOpen, onOpen, onClose } = useDisclosure();
@@ -30,7 +39,18 @@ export const CopyButton = ({
 
     event.stopPropagation();
     setTimeout(onClose, 1000);
-    return navigator.clipboard.writeText(value);
+
+    return navigator.clipboard.writeText(value).then(() => {
+      if (isDisposable) {
+        setTimeout(() => {
+          try {
+            void navigator.clipboard.writeText("");
+          } catch (error: unknown) {
+            console.error("Failed to clear clipboard", error);
+          }
+        }, COPY_TIMEOUT);
+      }
+    });
   };
 
   return (

diff --git a/apps/web/src/components/MnemonicWord/MnemonicWord.tsx b/apps/web/src/components/MnemonicWord/MnemonicWord.tsx
@@ -7,13 +7,15 @@ import { useColor } from "../../styles/useColor";
 type MnemonicWordProps = {
   index: number;
   word?: string;
+  isHidden?: boolean;
   indexProps?: TextProps;
   autocompleteProps?: ComponentProps<typeof MnemonicAutocomplete>;
 } & GridItemProps;
 
 export const MnemonicWord = ({
   index,
   word,
+  isHidden,
   autocompleteProps,
   indexProps,
   ...props
@@ -39,11 +41,14 @@ export const MnemonicWord = ({
       {autocompleteProps && <MnemonicAutocomplete {...autocompleteProps} />}
       {word && (
         <Text
+          sx={{
+            WebkitTextSecurity: isHidden ? "disc" : "none",
+          }}
           paddingLeft={{ base: "22px", md: "26px" }}
           fontSize={{ base: "12px", md: "14px" }}
           fontWeight="medium"
         >
-          {word}
+          {isHidden ? "*******" : word}
         </Text>
       )}
     </GridItem>

diff --git a/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx b/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx
@@ -12,9 +12,10 @@ import {
   Text,
 } from "@chakra-ui/react";
 import { useDynamicModalContext } from "@umami/components";
+import { useState } from "react";
 
 import { VerifySeedphraseModal } from "./VerifySeedphraseModal";
-import { CopyIcon, KeyIcon } from "../../../assets/icons";
+import { CopyIcon, EyeIcon, EyeOffIcon, KeyIcon } from "../../../assets/icons";
 import { useColor } from "../../../styles/useColor";
 import { ModalBackButton } from "../../BackButton";
 import { ModalCloseButton } from "../../CloseButton";
@@ -29,6 +30,7 @@ export const RecordSeedphraseModal = ({ seedPhrase }: CopySeedphraseModalProps)
   const color = useColor();
   const { openWith } = useDynamicModalContext();
   const words = seedPhrase.split(" ");
+  const [isHidden, setIsHidden] = useState(false);
 
   return (
     <ModalContent>
@@ -49,6 +51,7 @@ export const RecordSeedphraseModal = ({ seedPhrase }: CopySeedphraseModalProps)
           gridRowGap={{ base: "12px", md: "18px" }}
           gridColumnGap={{ base: "8px", md: "12px" }}
           gridTemplateColumns={{ base: "repeat(3, 1fr)", md: "repeat(4, 1fr)" }}
+          userSelect="none"
         >
           {words.map((word, index) => (
             <MnemonicWord
@@ -66,21 +69,38 @@ export const RecordSeedphraseModal = ({ seedPhrase }: CopySeedphraseModalProps)
               borderColor={color("100")}
               borderRadius="full"
               index={index}
+              isHidden={isHidden}
               word={word}
             />
           ))}
         </Grid>
-        <CopyButton
-          gap="8px"
-          width="full"
-          marginTop="16px"
-          fontSize="14px"
-          value={seedPhrase}
-          variant="ghost"
-        >
-          <Icon as={CopyIcon} boxSize="18px" color={color("400")} />
-          Copy
-        </CopyButton>
+        <Flex gap="16px" width="100%" marginTop="16px">
+          <Button
+            gap="4px"
+            display="flex"
+            width="full"
+            fontSize="14px"
+            fontWeight="400"
+            leftIcon={
+              <Icon as={isHidden ? EyeOffIcon : EyeIcon} boxSize="18px" color={color("400")} />
+            }
+            onClick={() => setIsHidden(!isHidden)}
+            variant="ghost"
+          >
+            {isHidden ? "Show" : "Hide"} seed phrase
+          </Button>
+          <CopyButton
+            gap="8px"
+            width="full"
+            fontSize="14px"
+            isDisposable
+            value={seedPhrase}
+            variant="ghost"
+          >
+            <Icon as={CopyIcon} boxSize="18px" color={color("400")} />
+            Copy
+          </CopyButton>
+        </Flex>
       </ModalBody>
       <ModalFooter>
         <Button

diff --git a/packages/components/src/components/MnemonicAutocomplete/MnemonicAutocomplete.tsx b/packages/components/src/components/MnemonicAutocomplete/MnemonicAutocomplete.tsx
@@ -103,9 +103,9 @@ export const MnemonicAutocomplete = <T extends FieldValues, U extends Path<T>>({
               variant="unstyled"
             >
               {showMnemonic ? (
-                <EyeSlashIcon color="currentColor" data-testid="eye-slash-icon" />
-              ) : (
                 <EyeIcon width="16.5px" color="currentColor" data-testid="eye-icon" />
+              ) : (
+                <EyeSlashIcon color="currentColor" data-testid="eye-slash-icon" />
               )}
             </Button>
           </InputRightElement>