From dfd165b24f34d61c199ab2081467b6e58457b80a Mon Sep 17 00:00:00 2001
From: Javad Khalilian <khalilian.javad@gmail.com>
Date: Fri, 25 Oct 2024 19:49:07 +0200
Subject: [PATCH 1/3] fix(dw): Fund btn + networkId

---
 .../components/ChainBalance.tsx               | 11 +++----
 .../components/style.css.ts                   |  3 ++
 .../FundOnTestnet/FundOnTestnet.tsx           | 31 +++++++++++++++----
 .../dev-wallet/src/modules/db/db.service.tsx  |  2 +-
 .../src/pages/transfer-v2/Steps/style.css.ts  |  1 +
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/packages/apps/dev-wallet/src/Components/AccountBalanceDistribution/components/ChainBalance.tsx b/packages/apps/dev-wallet/src/Components/AccountBalanceDistribution/components/ChainBalance.tsx
index 93e9981958..c887211992 100644
--- a/packages/apps/dev-wallet/src/Components/AccountBalanceDistribution/components/ChainBalance.tsx
+++ b/packages/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
index 56edff9766..cb68c86dd1 100644
--- 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
index 2180cf0db4..a55b2fb986 100644
--- 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
index 5fbd7dfaed..cda91f04f1 100644
--- 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' },
diff --git a/packages/apps/dev-wallet/src/pages/transfer-v2/Steps/style.css.ts b/packages/apps/dev-wallet/src/pages/transfer-v2/Steps/style.css.ts
index e054d238be..e52045df43 100644
--- a/packages/apps/dev-wallet/src/pages/transfer-v2/Steps/style.css.ts
+++ b/packages/apps/dev-wallet/src/pages/transfer-v2/Steps/style.css.ts
@@ -7,4 +7,5 @@ export const labelClass = style({
   background: tokens.kda.foundation.color.background.surface.default,
   padding: '8px',
   marginLeft: '-12px',
+  fontWeight: '700',
 });

From d43b102f60ba3125353cef1f313d99999509e962 Mon Sep 17 00:00:00 2001
From: Javad Khalilian <khalilian.javad@gmail.com>
Date: Fri, 25 Oct 2024 20:25:01 +0200
Subject: [PATCH 2/3] fix(dw): sig builder

---
 .../dev-wallet/src/modules/db/db.service.tsx  |   7 +-
 .../transaction/transaction.repository.ts     |  20 ++
 .../signature-builder/signature-builder.tsx   | 285 +++++-------------
 .../src/pages/signature-builder/style.css.ts  |   9 +
 4 files changed, 110 insertions(+), 211 deletions(-)

diff --git a/packages/apps/dev-wallet/src/modules/db/db.service.tsx b/packages/apps/dev-wallet/src/modules/db/db.service.tsx
index cda91f04f1..2ad92bfc36 100644
--- a/packages/apps/dev-wallet/src/modules/db/db.service.tsx
+++ b/packages/apps/dev-wallet/src/modules/db/db.service.tsx
@@ -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
index 182d00504c..a2e09f4a21 100644
--- 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[]> => {
diff --git a/packages/apps/dev-wallet/src/pages/signature-builder/signature-builder.tsx b/packages/apps/dev-wallet/src/pages/signature-builder/signature-builder.tsx
index f8ccc7a6ec..e0c8edad28 100644
--- a/packages/apps/dev-wallet/src/pages/signature-builder/signature-builder.tsx
+++ b/packages/apps/dev-wallet/src/pages/signature-builder/signature-builder.tsx
@@ -9,12 +9,23 @@ import {
 
 import { PactCodeView } from '@/Components/PactCodeView/PactCodeView';
 import { Wizard } from '@/Components/Wizard/Wizard';
+import { transactionRepository } from '@/modules/transaction/transaction.repository';
 import * as transactionService from '@/modules/transaction/transaction.service';
 import { useWallet } from '@/modules/wallet/wallet.hook';
-import { Box, Button, Card, Heading, Text } from '@kadena/kode-ui';
+import {
+  Box,
+  Button,
+  Card,
+  Heading,
+  Notification,
+  Stack,
+  Text,
+} from '@kadena/kode-ui';
 import { execCodeParser } from '@kadena/pactjs-generator';
+import classNames from 'classnames';
 import { useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
+import { panelClass } from '../home/style.css';
 import { codeArea } from './style.css';
 import { normalizeSigs, normalizeTx } from './utils/normalizeSigs';
 
@@ -125,225 +136,79 @@ export function SignatureBuilder() {
     setSchema(schema);
   }
 
-  async function signTransaction() {
-    if (unsignedTx) {
-      const normalizedTx = { ...unsignedTx, sigs: normalizeSigs(unsignedTx) };
-      const tx = (await sign(normalizedTx)) as ICommand;
-      setSignedTx(tx);
-    }
-  }
-
   return (
-    <>
-      <Wizard>
-        <Wizard.Render>
-          {({ step, goTo }) => (
-            <Box>
-              <Button
-                variant="transparent"
-                isDisabled={step < 0}
-                onPress={() => goTo(0)}
-              >{`Paste Data`}</Button>
-              {schema === 'signingRequest' && (
-                <Button
-                  variant="transparent"
-                  isDisabled={step < 1}
-                  onPress={() => goTo(1)}
-                >{`Add Signers`}</Button>
-              )}
-              <Button
-                variant="transparent"
-                isDisabled={step < 2}
-                onPress={() => goTo(2)}
-              >{`Review Transaction`}</Button>
-              <Button
-                variant="transparent"
-                isDisabled={step < 3}
-                onPress={() => goTo(3)}
-              >{`Sign Transaction`}</Button>
-            </Box>
-          )}
-        </Wizard.Render>
-        <Wizard.Step>
-          {({ goTo }) => (
+    <Stack flexDirection={'column'} gap={'md'}>
+      <Heading variant="h5">Paste SigData, CommandSigData, or Payload</Heading>
+      <textarea
+        value={input}
+        className={classNames(codeArea, panelClass)}
+        onChange={(e) => {
+          e.preventDefault();
+          processSig(e.target.value);
+        }}
+      />
+      <Box>{schema && <Text>{`Schema: ${schema}`}</Text>}</Box>
+      <Box>
+        <Box>
+          {['PactCommand', 'quickSignRequest'].includes(schema!) && (
             <>
-              <Heading variant="h5">
-                Paste SigData, CommandSigData, or Payload
-              </Heading>
-              <textarea
-                value={input}
-                className={codeArea}
-                onChange={(e) => {
-                  e.preventDefault();
-                  processSig(e.target.value);
-                }}
-              />
-              <Box>{schema && <Text>{`Schema: ${schema}`}</Text>}</Box>
-              <Box>
-                <Box>
-                  {['PactCommand', 'quickSignRequest'].includes(schema!) && (
-                    <>
-                      <Button
-                        onPress={async () => {
-                          if (!unsignedTx || !profile || !activeNetwork) return;
-                          const command: IPactCommand = JSON.parse(
-                            unsignedTx.cmd,
-                          );
-                          let networkUUID = activeNetwork.uuid;
-                          if (
-                            command.networkId &&
-                            activeNetwork.networkId !== command.networkId
-                          ) {
-                            const network = networks.filter(
-                              ({ networkId }) =>
-                                networkId === command.networkId,
-                            );
-                            if (network.length === 0) {
-                              throw new Error('Network not found');
-                            }
-                            if (network.length > 1) {
-                              throw new Error('Multiple networks found');
-                            }
-                            networkUUID = network[0].uuid;
-                            // switch network
-                            setActiveNetwork(network[0]);
-                          }
-                          const groupId = crypto.randomUUID();
+              <Button
+                onPress={async () => {
+                  if (!unsignedTx || !profile || !activeNetwork) return;
+                  const command: IPactCommand = JSON.parse(unsignedTx.cmd);
+                  let networkUUID = activeNetwork.uuid;
+                  if (
+                    command.networkId &&
+                    activeNetwork.networkId !== command.networkId
+                  ) {
+                    const network = networks.filter(
+                      ({ networkId }) => networkId === command.networkId,
+                    );
+                    if (network.length === 0) {
+                      throw new Error('Network not found');
+                    }
+                    if (network.length > 1) {
+                      throw new Error('Multiple networks found');
+                    }
+                    networkUUID = network[0].uuid;
+                    // switch network
+                    setActiveNetwork(network[0]);
+                  }
+                  const groupId = crypto.randomUUID();
 
-                          await transactionService.addTransaction({
-                            transaction: unsignedTx,
-                            profileId: profile.uuid,
-                            networkUUID: networkUUID,
-                            groupId,
-                          });
-                          navigate(`/transaction/${groupId}`);
-                        }}
-                      >
-                        Review Transaction
-                      </Button>
-                    </>
-                  )}
-                  {schema === 'signingRequest' && (
-                    <Button onPress={() => goTo(1)}>Add Signers</Button>
-                  )}
-                </Box>
-              </Box>
-            </>
-          )}
-        </Wizard.Step>
-        <Wizard.Step>
-          {({ back, next }) => (
-            <>
-              <Heading variant="h5">Edit Transaction</Heading>
-              <pre>{JSON.stringify(pactCommand, null, 2)}</pre>
-              {capsWithoutSigners && (
-                <pre>{JSON.stringify(capsWithoutSigners, null, 2)}</pre>
-              )}
-              <Button onPress={() => back()} variant="transparent">
-                Back to Input
-              </Button>
-              <Button onPress={() => next()}>Review Transaction</Button>
-            </>
-          )}
-        </Wizard.Step>
-        <Wizard.Step>
-          {({ back, next, goTo }) => (
-            <>
-              <Heading variant="h5">Review Transaction</Heading>
-              <Box>
-                <Text bold>Hash: </Text>
-                <Text>{unsignedTx?.hash}</Text>
-              </Box>
-              <Heading variant="h6">Code</Heading>
-              {parsedCode &&
-                parsedCode.map((pc) => (
-                  <Card>
-                    <PactCodeView parsedCode={pc} />
-                  </Card>
-                ))}
+                  // check if transaction already exists
+                  const tx =
+                    await transactionRepository.getTransactionByHashNetworkProfile(
+                      profile.uuid,
+                      networkUUID,
+                      unsignedTx.hash,
+                    );
 
-              <Heading variant="h6">Data</Heading>
-              <pre>{JSON.stringify(exec.data, null, 2)}</pre>
-              <Text bold>Transaction Metadata & Information</Text>
-              <Box>
-                Network :<Text>{pactCommand?.networkId}</Text>
-              </Box>
-              <Box>
-                Chain :<Text>{pactCommand?.meta?.chainId}</Text>
-              </Box>
-              <Box>
-                Gas Payer:
-                <Text>{pactCommand?.meta?.sender}</Text>
-              </Box>
-              <Box>
-                Gas Limit: <Text>{pactCommand?.meta?.gasLimit}</Text>
-              </Box>
-              <Box>
-                Gas Price: <Text>{pactCommand?.meta?.gasPrice}</Text>
-              </Box>
-              <Box>
-                Max Gas Cost:{' '}
-                <Text>
-                  {Number(pactCommand?.meta?.gasPrice) *
-                    Number(pactCommand?.meta?.gasLimit)}
-                </Text>
-              </Box>
-              <Box>
-                Creation Time <Text>{pactCommand?.meta?.creationTime}</Text>
-              </Box>
-              <Box>
-                TTL : <Text>{pactCommand?.meta?.ttl}</Text>
-              </Box>
-              <Box>
-                Nonce : <Text>{pactCommand?.nonce}</Text>
-              </Box>
-              <Box>
-                Tx Type :
-                <Text>
-                  {'cont' in (pactCommand?.payload ?? {}) ? 'Cont' : 'Exec'}
-                </Text>
-              </Box>
+                  if (tx) {
+                    navigate(`/transaction/${tx.groupId}`);
+                    return;
+                  }
 
-              <Heading variant="h6">Transaction</Heading>
-              <Card>
-                <pre>{JSON.stringify(unsignedTx, null, 2)}</pre>
-              </Card>
-              {schema !== 'quickSignRequest' ? (
-                <Button onPress={() => back()} variant="transparent">
-                  Back to Edit Transaction
-                </Button>
-              ) : (
-                <Button onPress={() => goTo(0)} variant="transparent">
-                  Back to Input
-                </Button>
-              )}
-              <Button
-                onPress={async () => {
-                  await signTransaction();
-                  next();
+                  await transactionService.addTransaction({
+                    transaction: unsignedTx,
+                    profileId: profile.uuid,
+                    networkUUID: networkUUID,
+                    groupId,
+                  });
+                  navigate(`/transaction/${groupId}`);
                 }}
               >
-                Sign Transaction
+                Review Transaction
               </Button>
             </>
           )}
-        </Wizard.Step>
-        <Wizard.Step>
-          {({ back }) => (
-            <>
-              <Heading variant="h5">Signed Transaction</Heading>
-              <Card>
-                <pre style={{ whiteSpace: 'break-spaces' }}>
-                  {JSON.stringify(signed, null, 2)}
-                </pre>
-              </Card>
-              <Button onPress={() => back()} variant="transparent">
-                Back to Review Transaction
-              </Button>
-            </>
+          {schema === 'signingRequest' && (
+            <Notification intent="info" role="status">
+              SigningRequest is not supported yet, We are working on it.
+            </Notification>
           )}
-        </Wizard.Step>
-      </Wizard>
-    </>
+        </Box>
+      </Box>
+    </Stack>
   );
 }
diff --git a/packages/apps/dev-wallet/src/pages/signature-builder/style.css.ts b/packages/apps/dev-wallet/src/pages/signature-builder/style.css.ts
index fd753d1a06..3a44ae9cf4 100644
--- a/packages/apps/dev-wallet/src/pages/signature-builder/style.css.ts
+++ b/packages/apps/dev-wallet/src/pages/signature-builder/style.css.ts
@@ -1,6 +1,15 @@
+import { tokens } from '@kadena/kode-ui/styles';
 import { style } from '@vanilla-extract/css';
 
 export const codeArea = style({
   width: `100%`,
   minHeight: '300px',
+  background: tokens.kda.foundation.color.background.surface.default,
+  color: tokens.kda.foundation.color.text.base.default,
+  padding: '10px',
+  fontSize: '14px',
+  border: `1px solid ${tokens.kda.foundation.color.border.base.default}`,
+  margin: '0',
+  resize: 'none',
+  fontFamily: tokens.kda.foundation.typography.family.monospaceFont,
 });

From 59ed7a73f78a496359b19096b261a6c4c472b635 Mon Sep 17 00:00:00 2001
From: Javad Khalilian <khalilian.javad@gmail.com>
Date: Fri, 25 Oct 2024 20:29:03 +0200
Subject: [PATCH 3/3] fix(dw): sig builder

---
 .../signature-builder/signature-builder.tsx   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/apps/dev-wallet/src/pages/signature-builder/signature-builder.tsx b/packages/apps/dev-wallet/src/pages/signature-builder/signature-builder.tsx
index e0c8edad28..4ff7b97b1d 100644
--- a/packages/apps/dev-wallet/src/pages/signature-builder/signature-builder.tsx
+++ b/packages/apps/dev-wallet/src/pages/signature-builder/signature-builder.tsx
@@ -1,5 +1,4 @@
 import {
-  ICommand,
   IPactCommand,
   IPartialPactCommand,
   ISigningRequest,
@@ -7,15 +6,12 @@ import {
   createTransaction,
 } from '@kadena/client';
 
-import { PactCodeView } from '@/Components/PactCodeView/PactCodeView';
-import { Wizard } from '@/Components/Wizard/Wizard';
 import { transactionRepository } from '@/modules/transaction/transaction.repository';
 import * as transactionService from '@/modules/transaction/transaction.service';
 import { useWallet } from '@/modules/wallet/wallet.hook';
 import {
   Box,
   Button,
-  Card,
   Heading,
   Notification,
   Stack,
@@ -25,9 +21,8 @@ import { execCodeParser } from '@kadena/pactjs-generator';
 import classNames from 'classnames';
 import { useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { panelClass } from '../home/style.css';
 import { codeArea } from './style.css';
-import { normalizeSigs, normalizeTx } from './utils/normalizeSigs';
+import { normalizeTx } from './utils/normalizeSigs';
 
 type requestScheme =
   | 'invalid'
@@ -86,8 +81,7 @@ export function SignatureBuilder() {
   const [capsWithoutSigners, setCapsWithoutSigners] = useState<
     ISigningRequest['caps']
   >([]);
-  const { sign, profile, activeNetwork, networks, setActiveNetwork } =
-    useWallet();
+  const { profile, activeNetwork, networks, setActiveNetwork } = useWallet();
   const navigate = useNavigate();
 
   const exec =
@@ -100,6 +94,13 @@ export function SignatureBuilder() {
     [exec.code],
   );
 
+  console.log('parsedCode', {
+    parsedCode,
+    capsWithoutSigners,
+    signed,
+    setSignedTx,
+  });
+
   function processSig(inputData: string) {
     setInput(inputData);
     const schema = determineSchema(inputData);
@@ -141,7 +142,7 @@ export function SignatureBuilder() {
       <Heading variant="h5">Paste SigData, CommandSigData, or Payload</Heading>
       <textarea
         value={input}
-        className={classNames(codeArea, panelClass)}
+        className={classNames(codeArea)}
         onChange={(e) => {
           e.preventDefault();
           processSig(e.target.value);