Merge pull request #4 from reef-chain/evm-addr

feat: do not show evm addr if not claimed
reef-chain · Aug 10, 2023 · dc64bdb · dc64bdb
2 parents 3ecf8ff + 1358d91
commit dc64bdb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/example/components/AccountSelector.tsx b/src/example/components/AccountSelector.tsx
@@ -11,7 +11,8 @@ const accounts = [
   {
     name: "Test Account 2",
     address: "5HW5AhtsiFhqN6K2TfZHmanh9kboyuLrCddWpNtBuu2XzVPc",
-    evmAddress: "0x9f704566B7A3725f05A434959bA69e97B73c5B66"
+    evmAddress: "0x9f704566B7A3725f05A434959bA69e97B73c5B66",
+    isEvmClaimed:false
   },
   {
     name: "Test Account 3",

diff --git a/src/ui-kit/components/organisms/AccountSelector/Account.tsx b/src/ui-kit/components/organisms/AccountSelector/Account.tsx
@@ -12,7 +12,8 @@ export interface Props {
   source?: string,
   isSelected?: boolean,
   onSelect?: (...args: any[]) => any,
-  className?: string
+  className?: string,
+  isEvmClaimed?:boolean,
 }
 
 const Account = ({
@@ -21,6 +22,7 @@ const Account = ({
   evmAddress,
   source,
   isSelected,
+  isEvmClaimed,
   onSelect,
   className
 }: Props): JSX.Element => (
@@ -59,7 +61,7 @@ const Account = ({
       </div>
 
       {
-        !!evmAddress &&
+        !!evmAddress && isEvmClaimed!=false &&
         <div className='uik-account-selector-account__address'>
           <div>{localizedStrings.reef_evm_address}: { formatAddress(evmAddress) }</div>
           <CopyButton

diff --git a/src/ui-kit/components/organisms/AccountSelector/AccountSelector.tsx b/src/ui-kit/components/organisms/AccountSelector/AccountSelector.tsx
@@ -15,7 +15,8 @@ export type Account = {
   name?: string,
   address: string,
   evmAddress?: string,
-  source?: string
+  source?: string,
+  isEvmClaimed?:boolean,
 }
 
 export type Network = 'mainnet' | 'testnet'
@@ -158,6 +159,7 @@ const AccountSelector = ({
                     address={account.address}
                     evmAddress={account.evmAddress}
                     source={account.source}
+                    isEvmClaimed={account.isEvmClaimed}
                     onSelect={() => select(account)}
                     isSelected={isSelected(account)}
                   />