wallet-ext: make sure address starts with 0x

davidqw · Jul 15, 2022 · 352e262 · 352e262
1 parent ec92798
commit 352e262
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/wallet/src/ui/app/KeypairVault.ts b/wallet/src/ui/app/KeypairVault.ts
@@ -13,7 +13,11 @@ export default class KeypairVault {
     }
 
     public getAccount(): string | null {
-        return this._keypair?.getPublicKey().toSuiAddress() || null;
+        let address = this._keypair?.getPublicKey().toSuiAddress() || null;
+        if (address && !address.startsWith('0x')) {
+            address = `0x${address}`;
+        }
+        return address;
     }
 
     public getKeyPair() {

diff --git a/wallet/src/ui/app/components/account-address/index.tsx b/wallet/src/ui/app/components/account-address/index.tsx
@@ -16,9 +16,7 @@ type AccountAddressProps = {
 };
 
 function AccountAddress({ className, showLink = true }: AccountAddressProps) {
-    const address = useAppSelector(
-        ({ account: { address } }) => address && `0x${address}`
-    );
+    const address = useAppSelector(({ account: { address } }) => address);
     const shortenAddress = useMiddleEllipsis(address || '', 20);
     return address ? (
         <span className={cl(st.addressContainer, className)}>

diff --git a/wallet/src/ui/app/pages/home/transfer-nft/index.tsx b/wallet/src/ui/app/pages/home/transfer-nft/index.tsx
@@ -36,9 +36,7 @@ function TransferNFTPage() {
         () => searchParams.get('objectId'),
         [searchParams]
     );
-    const address = useAppSelector(
-        ({ account: { address } }) => address && `0x${address}`
-    );
+    const address = useAppSelector(({ account: { address } }) => address);
 
     let selectedNFT;
     const nftCollections = useAppSelector(accountNftsSelector);

diff --git a/wallet/src/ui/app/pages/site-connect/index.tsx b/wallet/src/ui/app/pages/site-connect/index.tsx
@@ -46,7 +46,7 @@ function SiteConnectPage() {
                 dispatch(
                     respondToPermissionRequest({
                         id: requestID,
-                        accounts: allowed ? [`0x${activeAccount}`] : [],
+                        accounts: allowed ? [activeAccount] : [],
                         allowed,
                     })
                 );