fix: Copy to clipboard format (#172)

pancakeswap · Feb 8, 2021 · a77199c · a77199c
1 parent 2ff467a
commit a77199c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/src/__tests__/widgets/walletModal.test.tsx b/src/__tests__/widgets/walletModal.test.tsx
@@ -421,7 +421,9 @@ it("renders ConnectModal correctly", () => {
 });
 
 it("renders AccountModal correctly", () => {
-  const { asFragment } = renderWithTheme(<AccountModal logout={noop} />);
+  const { asFragment } = renderWithTheme(
+    <AccountModal account="0xb218C5D6aF1F979aC42BC68d98A5A0D796C6aB01" logout={noop} />
+  );
   expect(asFragment()).toMatchInlineSnapshot(`
     <DocumentFragment>
       <div
@@ -466,14 +468,16 @@ it("renders AccountModal correctly", () => {
             color="text"
             font-size="20px"
             style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; margin-bottom: 8px;"
-          />
+          >
+            0xb218C5D6aF1F979aC42BC68d98A5A0D796C6aB01
+          </div>
           <div
             class="sc-eCssSg gZPLzm"
           >
             <a
               class="sc-bdfBwQ sc-gsTCUz kgxXAa djpNeP"
               color="primary"
-              href="https://bscscan.com/address/undefined"
+              href="https://bscscan.com/address/0xb218C5D6aF1F979aC42BC68d98A5A0D796C6aB01"
               rel="noreferrer noopener"
               target="_blank"
             >

diff --git a/src/widgets/WalletModal/AccountModal.tsx b/src/widgets/WalletModal/AccountModal.tsx
@@ -8,7 +8,7 @@ import CopyToClipboard from "./CopyToClipboard";
 import { localStorageKey } from "./config";
 
 interface Props {
-  account?: string;
+  account: string;
   logout: () => void;
   onDismiss?: () => void;
 }

diff --git a/src/widgets/WalletModal/CopyToClipboard.tsx b/src/widgets/WalletModal/CopyToClipboard.tsx
@@ -4,7 +4,7 @@ import Text from "../../components/Text/Text";
 import { CopyIcon } from "../../components/Svg";
 
 interface Props {
-  toCopy?: string | number;
+  toCopy: string;
 }
 
 const StyleButton = styled(Text).attrs({ role: "button" })`
@@ -35,11 +35,13 @@ const CopyToClipboard: React.FC<Props> = ({ toCopy, children, ...props }) => {
       small
       bold
       onClick={() => {
-        navigator.clipboard.writeText(JSON.stringify(toCopy));
-        setIsTooltipDisplayed(true);
-        setTimeout(() => {
-          setIsTooltipDisplayed(false);
-        }, 1000);
+        if (navigator.clipboard) {
+          navigator.clipboard.writeText(toCopy);
+          setIsTooltipDisplayed(true);
+          setTimeout(() => {
+            setIsTooltipDisplayed(false);
+          }, 1000);
+        }
       }}
       {...props}
     >

diff --git a/src/widgets/WalletModal/useWalletModal.tsx b/src/widgets/WalletModal/useWalletModal.tsx
@@ -11,7 +11,7 @@ interface ReturnType {
 
 const useWalletModal = (login: Login, logout: () => void, account?: string): ReturnType => {
   const [onPresentConnectModal] = useModal(<ConnectModal login={login} />);
-  const [onPresentAccountModal] = useModal(<AccountModal account={account} logout={logout} />);
+  const [onPresentAccountModal] = useModal(<AccountModal account={account || ""} logout={logout} />);
   return { onPresentConnectModal, onPresentAccountModal };
 };