fix(dw): Fund btn + networkId (#2621)

* fix(dw): Fund btn + networkId * fix(dw): sig builder * fix(dw): sig builder
kadena-community · Oct 25, 2024 · 09e7584 · 09e7584
1 parent cb02e7e
commit 09e7584
Show file tree

Hide file tree

Showing 8 changed files with 152 additions and 230 deletions.
diff --git a/...ges/apps/dev-wallet/src/Components/AccountBalanceDistribution/components/ChainBalance.tsx b/...ges/apps/dev-wallet/src/Components/AccountBalanceDistribution/components/ChainBalance.tsx
@@ -63,12 +63,11 @@ export const ChainBalance: FC<IProps> = ({
           Chain {chainId}
         </Text>
         {!editable && activeNetwork?.faucetContract && fundAccount && (
-          <span className={fundButtonClass}>
-            <FundOnTestnetButton
-              fundAccountHandler={fundAccount}
-              chainId={chainId}
-            />
-          </span>
+          <FundOnTestnetButton
+            className={fundButtonClass}
+            fundAccountHandler={fundAccount}
+            chainId={chainId}
+          />
         )}
       </Stack>
 

diff --git a/packages/apps/dev-wallet/src/Components/AccountBalanceDistribution/components/style.css.ts b/packages/apps/dev-wallet/src/Components/AccountBalanceDistribution/components/style.css.ts
@@ -44,6 +44,9 @@ export const fundButtonClass = style({
     '&:focus': {
       opacity: 1,
     },
+    '&.pending': {
+      opacity: 1,
+    },
   },
 });
 

diff --git a/packages/apps/dev-wallet/src/Components/FundOnTestnet/FundOnTestnet.tsx b/packages/apps/dev-wallet/src/Components/FundOnTestnet/FundOnTestnet.tsx
@@ -4,23 +4,32 @@ import { ITransaction } from '@/modules/transaction/transaction.repository';
 import { useWallet } from '@/modules/wallet/wallet.hook';
 import { TxContainer } from '@/pages/transaction/components/TxContainer';
 import { ChainId } from '@kadena/client';
-import { Button } from '@kadena/kode-ui';
+import { MonoAutorenew } from '@kadena/kode-icons/system';
+import { Button, Stack } from '@kadena/kode-ui';
+import classNames from 'classnames';
 import { useState } from 'react';
 
 export function FundOnTestnetButton({
   account,
   chainId,
   fundAccountHandler,
+  className,
 }: {
   account?: IAccount;
   chainId?: ChainId;
   fundAccountHandler: (chainId: ChainId) => Promise<ITransaction>;
+  className?: string;
 }) {
   const [fundTx, setFundTx] = useState<ITransaction>();
   const { syncAllAccounts } = useWallet();
+  const [done, setDone] = useState(false);
 
   return (
-    <>
+    <Stack
+      gap={'sm'}
+      alignItems={'center'}
+      className={classNames(className, fundTx && 'pending')}
+    >
       {!fundTx && (
         <Button
           variant="outlined"
@@ -46,12 +55,22 @@ export function FundOnTestnetButton({
             } else {
               syncAllAccounts();
             }
-            if (tx.result?.result.status === 'success') {
-              setTimeout(() => setFundTx(undefined), 2000);
-            }
+            setDone(true);
           }}
         />
       )}
-    </>
+      {fundTx && done && (
+        <Button
+          isCompact
+          variant="transparent"
+          onClick={() => {
+            setFundTx(undefined);
+            setDone(false);
+          }}
+        >
+          <MonoAutorenew />
+        </Button>
+      )}
+    </Stack>
   );
 }
diff --git a/packages/apps/dev-wallet/src/modules/db/db.service.tsx b/packages/apps/dev-wallet/src/modules/db/db.service.tsx
@@ -93,7 +93,7 @@ export const setupDatabase = execInSequence(async (): Promise<IDBDatabase> => {
         unique: true,
       },
     ]);
-    create('network', 'uuid', [{ index: 'networkId' }]);
+    create('network', 'uuid', [{ index: 'networkId', unique: true }]);
     create('fungible', 'contract', [{ index: 'symbol', unique: true }]);
     create('keyset', 'uuid', [
       { index: 'profileId' },
@@ -105,10 +105,15 @@ export const setupDatabase = execInSequence(async (): Promise<IDBDatabase> => {
       },
     ]);
     create('transaction', 'uuid', [
-      { index: 'hash', unique: true },
+      { index: 'hash' },
       { index: 'profileId' },
       { index: 'groupId' },
       { index: 'network', indexKeyPath: ['profileId', 'networkUUID'] },
+      {
+        index: 'unique-tx',
+        indexKeyPath: ['profileId', 'networkUUID', 'hash'],
+        unique: true,
+      },
       {
         index: 'network-status',
         indexKeyPath: ['profileId', 'networkUUID', 'status'],

diff --git a/packages/apps/dev-wallet/src/modules/transaction/transaction.repository.ts b/packages/apps/dev-wallet/src/modules/transaction/transaction.repository.ts
@@ -70,6 +70,11 @@ export interface TransactionRepository {
   getTransaction: (uuid: string) => Promise<ITransaction>;
   getTransactionByHash: (hash: string) => Promise<ITransaction>;
   getTransactionsByGroup: (groupId: string) => Promise<ITransaction[]>;
+  getTransactionByHashNetworkProfile: (
+    profileId: string,
+    networkUUID: UUID,
+    hash: string,
+  ) => Promise<ITransaction>;
   addTransaction: (transaction: ITransaction) => Promise<void>;
   updateTransaction: (transaction: ITransaction) => Promise<void>;
   deleteTransaction: (transactionId: string) => Promise<void>;
@@ -108,6 +113,21 @@ const createTransactionRepository = ({
       const tx = getAll('transaction', hash, 'hash');
       return Array.isArray(tx) ? tx[0] : undefined;
     },
+    getTransactionByHashNetworkProfile: async (
+      profileId: string,
+      networkUUID: UUID,
+      hash: string,
+    ) => {
+      const txs = (await getAll(
+        'transaction',
+        IDBKeyRange.only([profileId, networkUUID, hash]),
+        'unique-tx',
+      )) as ITransaction[];
+      if (txs.length > 1) {
+        throw new Error('Multiple transactions with the same hash');
+      }
+      return txs[0];
+    },
     getTransactionsByGroup: async (
       groupId: string,
     ): Promise<ITransaction[]> => {