Merge branch 'testnet' into development

CosmosContracts · Jul 4, 2022 · f370b81 · f370b81
2 parents c94efb3 + 7a54362
commit f370b81
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 7 deletions.
diff --git a/contracts/cw20/merkleAirdrop/contract.ts b/contracts/cw20/merkleAirdrop/contract.ts
@@ -97,13 +97,6 @@ export interface CW20MerkleAirdropMessages {
     hrp?: string,
   ) => [RegisterMessage, ReleaseEscrowMessage]
   depositEscrow: (airdropAddress: string) => DepositEscrowMessage
-  claim: (
-    airdropAddress: string,
-    stage: number,
-    amount: string,
-    proof: string[],
-    signedMessage?: SignedMessage,
-  ) => ClaimMessage
   fundWithSend: (recipient: string, amount: string) => FundWithSendMessage
   burn: (airdropAddress: string, stage: number) => BurnMessage
   withdraw: (airdropAddress: string, stage: number, address: string) => WithdrawMessage
@@ -199,6 +192,12 @@ export interface WithdrawMessage {
   funds: Coin[]
 }
 
+export interface FundWithSendMessage {
+  from_address: string
+  to_address: string
+  amount: Coin[]
+}
+
 export interface CW20MerkleAirdropContract {
   instantiate: (
     senderAddress: string,
@@ -600,6 +599,14 @@ export const CW20MerkleAirdrop = (client: SigningCosmWasmClient, txSigner: strin
       }
     }
 
+    const fundWithSend = (recipient: string, amount: string): FundWithSendMessage => {
+      return {
+        from_address: txSigner,
+        to_address: recipient,
+        amount: [coin(amount, getNetworkConfig(NETWORK).feeToken)],
+      }
+    }
+
     return {
       instantiate,
       registerAndReleaseEscrow,

diff --git a/pages/airdrops/[address]/claim.tsx b/pages/airdrops/[address]/claim.tsx
@@ -169,6 +169,10 @@ const ClaimAirdropPage: NextPage = () => {
     setBalance(Number(wallet.balance[0]?.amount))
   }, [wallet.balance])
 
+  useEffect(() => {
+    setBalance(Number(wallet.balance[0]?.amount))
+  }, [wallet.balance])
+
   useEffect(() => {
     if (!cw20BaseContract || !cw20TokenAddress) return
 

diff --git a/pages/airdrops/create.tsx b/pages/airdrops/create.tsx
@@ -78,6 +78,19 @@ const TOKEN_VALUES = [
   },
 ]
 
+const TOKEN_VALUES = [
+  {
+    id: 'native',
+    title: 'Native Token',
+    subtitle: `This airdrop will use ${getConfig(NETWORK).feeToken.slice(1)} as the token.`,
+  },
+  {
+    id: 'cw20',
+    title: 'CW20 Token',
+    subtitle: 'This airdrop will use a custom cw20 token address.',
+  },
+]
+
 type StartEndValue = 'null' | 'height' | 'timestamp'
 
 type TokenValue = 'native' | 'cw20'