dapp-feat: added remove transaction records feature to main activity …

…page (#419) * dapp-update: added transactionResultStorageKey to the TransactionResult type Signed-off-by: Logan Nguyen <[email protected]> * dapp-feat: added delete individual transaction feature in /activity Signed-off-by: Logan Nguyen <[email protected]> * dapp-feat: remove all cached transactions feature complete Signed-off-by: Logan Nguyen <[email protected]> --------- Signed-off-by: Logan Nguyen <[email protected]>
hashgraph · Sep 23, 2023 · 7968621 · 7968621
1 parent 182bd23
commit 7968621
Show file tree

Hide file tree

Showing 33 changed files with 190 additions and 21 deletions.
diff --git a/system-contract-dapp-playground/src/api/hedera/index.ts b/system-contract-dapp-playground/src/api/hedera/index.ts
@@ -77,6 +77,7 @@ export const deploySmartContract = async (
     if (txReceipt) {
       const createTransactionResult: TransactionResult = {
         status: 'success',
+        transactionResultStorageKey,
         transactionTimeStamp: Date.now(),
         txHash: txReceipt.hash as string,
         transactionType: 'CONTRACT-CREATE',

diff --git a/...act-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/mint/index.tsx b/...act-dapp-playground/src/components/contract-interaction/erc/erc-20/methods/mint/index.tsx
@@ -71,10 +71,11 @@ const Mint = ({ baseContract }: PageProps) => {
 
     if (mintErr || !mintRes) {
       handleAPIErrors({
-        err: mintErr,
         toaster,
+        err: mintErr,
         setTransactionResults,
         transactionHash: txHash,
+        transactionResultStorageKey,
         transactionType: 'ERC20-MINT',
         sessionedContractAddress: currentContractAddress,
       });
@@ -86,6 +87,7 @@ const Mint = ({ baseContract }: PageProps) => {
         {
           status: 'success',
           txHash: txHash as string,
+          transactionResultStorageKey,
           transactionType: 'ERC20-MINT',
           transactionTimeStamp: Date.now(),
           sessionedContractAddress: currentContractAddress,

diff --git a/...yground/src/components/contract-interaction/erc/erc-20/methods/token-permission/index.tsx b/...yground/src/components/contract-interaction/erc/erc-20/methods/token-permission/index.tsx
@@ -213,6 +213,7 @@ const TokenPermission = ({ baseContract }: PageProps) => {
       handleAPIErrors({
         toaster,
         setTransactionResults,
+        transactionResultStorageKey,
         err: tokenPermissionRes.err,
         transactionHash: tokenPermissionRes.txHash,
         sessionedContractAddress: currentContractAddress,
@@ -265,6 +266,7 @@ const TokenPermission = ({ baseContract }: PageProps) => {
           ...prev,
           {
             status: 'success',
+            transactionResultStorageKey,
             transactionTimeStamp: Date.now(),
             txHash: tokenPermissionRes.txHash as string,
             sessionedContractAddress: currentContractAddress,

diff --git a/...layground/src/components/contract-interaction/erc/erc-20/methods/token-transfer/index.tsx b/...layground/src/components/contract-interaction/erc/erc-20/methods/token-transfer/index.tsx
@@ -129,6 +129,7 @@ const Transfer = ({ baseContract }: PageProps) => {
         toaster,
         setTransactionResults,
         err: tokenTransferRes.err,
+        transactionResultStorageKey,
         transactionHash: tokenTransferRes.txHash,
         sessionedContractAddress: currentContractAddress,
         transactionType: `ERC20-${convertCalmelCaseFunctionName(method).replace(' ', '-')}`,
@@ -143,6 +144,7 @@ const Transfer = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           txHash: tokenTransferRes.txHash as string,
           sessionedContractAddress: currentContractAddress,

diff --git a/...dapp-playground/src/components/contract-interaction/erc/erc-721/methods/approve/index.tsx b/...dapp-playground/src/components/contract-interaction/erc/erc-721/methods/approve/index.tsx
@@ -123,6 +123,7 @@ const ERC721Approve = ({ baseContract }: PageProps) => {
         handleAPIErrors({
           toaster,
           setTransactionResults,
+          transactionResultStorageKey,
           err: erc721ApproveResult.err,
           transactionType: 'ERC721-APPROVE',
           transactionHash: erc721ApproveResult.txHash,
@@ -136,6 +137,7 @@ const ERC721Approve = ({ baseContract }: PageProps) => {
             ...prev,
             {
               status: 'success',
+              transactionResultStorageKey,
               transactionTimeStamp: Date.now(),
               transactionType: 'ERC721-APPROVE',
               txHash: erc721ApproveResult.txHash as string,
@@ -162,6 +164,7 @@ const ERC721Approve = ({ baseContract }: PageProps) => {
       getApproveTokenId,
       approveParams.tokenId,
       currentContractAddress,
+      transactionResultStorageKey,
       approveParams.spenderAddress,
     ]
   );

diff --git a/...ct-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/mint/index.tsx b/...ct-dapp-playground/src/components/contract-interaction/erc/erc-721/methods/mint/index.tsx
@@ -75,6 +75,7 @@ const Mint = ({ baseContract }: PageProps) => {
         toaster,
         setTransactionResults,
         transactionHash: txHash,
+        transactionResultStorageKey,
         transactionType: 'ERC721-MINT',
         sessionedContractAddress: currentContractAddress,
       });
@@ -86,6 +87,7 @@ const Mint = ({ baseContract }: PageProps) => {
         {
           status: 'success',
           txHash: txHash as string,
+          transactionResultStorageKey,
           transactionType: 'ERC721-MINT',
           transactionTimeStamp: Date.now(),
           sessionedContractAddress: currentContractAddress,

diff --git a/...ground/src/components/contract-interaction/erc/erc-721/methods/operator-approve/index.tsx b/...ground/src/components/contract-interaction/erc/erc-721/methods/operator-approve/index.tsx
@@ -170,6 +170,7 @@ const ERC721OperatorApproval = ({ baseContract }: PageProps) => {
         toaster,
         setTransactionResults,
         err: tokenApprovalRes.err,
+        transactionResultStorageKey,
         transactionType: 'ERC721-SET-APPROVAL',
         transactionHash: tokenApprovalRes.txHash,
         sessionedContractAddress: currentContractAddress,
@@ -182,6 +183,7 @@ const ERC721OperatorApproval = ({ baseContract }: PageProps) => {
           ...prev,
           {
             status: 'success',
+            transactionResultStorageKey,
             transactionTimeStamp: Date.now(),
             transactionType: 'ERC721-SET-APPROVAL',
             txHash: tokenApprovalRes.txHash as string,

diff --git a/...ayground/src/components/contract-interaction/erc/erc-721/methods/token-transfer/index.tsx b/...ayground/src/components/contract-interaction/erc/erc-721/methods/token-transfer/index.tsx
@@ -121,6 +121,7 @@ const ERC721Transfer = ({ baseContract }: PageProps) => {
         toaster,
         setTransactionResults,
         err: tokenTransferRes.err,
+        transactionResultStorageKey,
         transactionHash: tokenTransferRes.txHash,
         sessionedContractAddress: currentContractAddress,
         transactionType: `ERC721-${convertCalmelCaseFunctionName(method).replace(' ', '-')}`,
@@ -134,6 +135,7 @@ const ERC721Transfer = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           txHash: tokenTransferRes.txHash as string,
           sessionedContractAddress: currentContractAddress,

diff --git a/...tract-dapp-playground/src/components/contract-interaction/exchange-rate/methods/index.tsx b/...tract-dapp-playground/src/components/contract-interaction/exchange-rate/methods/index.tsx
@@ -124,6 +124,7 @@ const HederaExchangeRateMethods = ({ baseContract }: PageProps) => {
         transactionHash,
         transactionType: API,
         setTransactionResults,
+        transactionResultStorageKey,
         initialAmount: paramValues.amountToConvert,
         sessionedContractAddress: currentContractAddress,
       });
@@ -136,6 +137,7 @@ const HederaExchangeRateMethods = ({ baseContract }: PageProps) => {
           status: 'success',
           APICalled: API,
           transactionType: API,
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,
           initialAmount: paramValues.amountToConvert,

diff --git a/...app-playground/src/components/contract-interaction/hts/shared/methods/handleAPIErrors.tsx b/...app-playground/src/components/contract-interaction/hts/shared/methods/handleAPIErrors.tsx
@@ -38,6 +38,7 @@ export const handleAPIErrors = ({
   receiverAddress,
   setTransactionResults,
   sessionedContractAddress,
+  transactionResultStorageKey,
 }: {
   err: any;
   toaster: any;
@@ -49,6 +50,7 @@ export const handleAPIErrors = ({
   receiverAddress?: string;
   tokenAddresses?: string[];
   sessionedContractAddress: string;
+  transactionResultStorageKey: string;
   transactionHash: string | undefined;
   keyTypeCalled?: IHederaTokenServiceKeyType;
   setTransactionResults: Dispatch<SetStateAction<TransactionResult[]>>;
@@ -87,12 +89,13 @@ export const handleAPIErrors = ({
         transactionType,
         txHash: transactionHash,
         sessionedContractAddress,
+        transactionResultStorageKey,
+        transactionTimeStamp: Date.now(),
         tokenAddress: tokenAddress ? tokenAddress : '',
         initialAmount: initialAmount ? initialAmount : '',
         accountAddress: accountAddress ? accountAddress : '',
         tokenAddresses: tokenAddresses ? tokenAddresses : [''],
         receiverAddress: receiverAddress ? receiverAddress : '',
-        transactionTimeStamp: Date.now(),
       },
     ]);
 

diff --git a/.../components/contract-interaction/hts/token-create-custom/methods/AssociateHederaToken.tsx b/.../components/contract-interaction/hts/token-create-custom/methods/AssociateHederaToken.tsx
@@ -152,6 +152,7 @@ const AssociateHederaToken = ({ baseContract }: PageProps) => {
         tokenAddresses,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         accountAddress: associatingAddress,
         transactionType: 'HTS-TOKEN-ASSOCIATE',
         sessionedContractAddress: currentContractAddress,
@@ -164,6 +165,7 @@ const AssociateHederaToken = ({ baseContract }: PageProps) => {
         {
           tokenAddresses,
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,
           accountAddress: associatingAddress,

diff --git a/...c/components/contract-interaction/hts/token-create-custom/methods/FungibleTokenCreate.tsx b/...c/components/contract-interaction/hts/token-create-custom/methods/FungibleTokenCreate.tsx
@@ -181,6 +181,7 @@ const FungibleTokenCreate = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         transactionType: 'HTS-TOKEN-CREATE',
         sessionedContractAddress: currentContractAddress,
       });
@@ -192,6 +193,7 @@ const FungibleTokenCreate = ({ baseContract }: PageProps) => {
         {
           tokenAddress,
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,
           transactionType: 'HTS-TOKEN-CREATE',

diff --git a/...und/src/components/contract-interaction/hts/token-create-custom/methods/GrantTokenKYC.tsx b/...und/src/components/contract-interaction/hts/token-create-custom/methods/GrantTokenKYC.tsx
@@ -119,6 +119,7 @@ const GrantTokenKYC = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         tokenAddress: hederaTokenAddress,
         transactionType: 'HTS-GRANT-KYC',
         accountAddress: grantingKYCAccountAddress,
@@ -131,6 +132,7 @@ const GrantTokenKYC = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           transactionType: 'HTS-GRANT-KYC',
           transactionTimeStamp: Date.now(),
           tokenAddress: hederaTokenAddress,

diff --git a/...d/src/components/contract-interaction/hts/token-create-custom/methods/MintHederaToken.tsx b/...d/src/components/contract-interaction/hts/token-create-custom/methods/MintHederaToken.tsx
@@ -190,6 +190,7 @@ const MintHederaToken = ({ baseContract }: PageProps) => {
         toaster,
         err: txRes.err,
         setTransactionResults,
+        transactionResultStorageKey,
         tokenAddress: tokenAddressToMint,
         transactionHash: txRes.transactionHash,
         sessionedContractAddress: currentContractAddress,
@@ -202,6 +203,7 @@ const MintHederaToken = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           accountAddress: recipientAddress,
           transactionTimeStamp: Date.now(),
           txHash: txRes.transactionHash as string,

diff --git a/...omponents/contract-interaction/hts/token-create-custom/methods/NonFungibleTokenCreate.tsx b/...omponents/contract-interaction/hts/token-create-custom/methods/NonFungibleTokenCreate.tsx
@@ -159,6 +159,7 @@ const NonFungibleTokenCreate = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         transactionType: 'HTS-NFT-CREATE',
         sessionedContractAddress: currentContractAddress,
       });
@@ -170,6 +171,7 @@ const NonFungibleTokenCreate = ({ baseContract }: PageProps) => {
         {
           tokenAddress,
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           transactionType: 'HTS-NFT-CREATE',
           txHash: transactionHash as string,

diff --git a/...ts/contract-interaction/hts/token-management-contract/methods/manageTokenDelete/index.tsx b/...ts/contract-interaction/hts/token-management-contract/methods/manageTokenDelete/index.tsx
@@ -120,6 +120,7 @@ const ManageTokenDelete = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         tokenAddress: hederaTokenAddress,
         transactionType: 'HTS-TOKEN-DELETE',
         sessionedContractAddress: currentContractAddress,
@@ -131,6 +132,7 @@ const ManageTokenDelete = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           tokenAddress: hederaTokenAddress,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,

diff --git a/...ents/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/index.tsx b/...ents/contract-interaction/hts/token-management-contract/methods/manageTokenInfo/index.tsx
@@ -262,6 +262,7 @@ const ManageTokenInfo = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         tokenAddress: hederaTokenAddress,
         sessionedContractAddress: currentContractAddress,
         transactionType: `HTS-${APIMethods.replace('_', '-')}`,
@@ -273,6 +274,7 @@ const ManageTokenInfo = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           tokenAddress: hederaTokenAddress,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,

diff --git a/...ontract-interaction/hts/token-management-contract/methods/manageTokenPermission/index.tsx b/...ontract-interaction/hts/token-management-contract/methods/manageTokenPermission/index.tsx
@@ -167,6 +167,7 @@ const ManageTokenPermission = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         tokenAddress: hederaTokenAddress,
         transactionType: transactionTypeMap[API],
         sessionedContractAddress: currentContractAddress,
@@ -178,6 +179,7 @@ const ManageTokenPermission = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           tokenAddress: hederaTokenAddress,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,

diff --git a/.../contract-interaction/hts/token-management-contract/methods/manageTokenRelation/index.tsx b/.../contract-interaction/hts/token-management-contract/methods/manageTokenRelation/index.tsx
@@ -218,6 +218,7 @@ const ManageTokenRelation = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         tokenAddress: paramValues.hederaTokenAddress,
         transactionType: `HTS-${API.replace('_', '-')}`,
         sessionedContractAddress: currentContractAddress,
@@ -229,6 +230,7 @@ const ManageTokenRelation = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,
           tokenAddress: paramValues.hederaTokenAddress,

diff --git a/...ts/contract-interaction/hts/token-management-contract/methods/manageTokenStatus/index.tsx b/...ts/contract-interaction/hts/token-management-contract/methods/manageTokenStatus/index.tsx
@@ -130,6 +130,7 @@ const ManageTokenStatus = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         transactionType: `HTS-TOKEN-${API}`,
         tokenAddress: paramValues.hederaTokenAddress,
         sessionedContractAddress: currentContractAddress,
@@ -141,6 +142,7 @@ const ManageTokenStatus = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,
           transactionType: `HTS-TOKEN-${API}`,

diff --git a/...ct-interaction/hts/token-management-contract/methods/manageTokenSupplyReduction/index.tsx b/...ct-interaction/hts/token-management-contract/methods/manageTokenSupplyReduction/index.tsx
@@ -165,6 +165,7 @@ const ManageTokenDeduction = ({ baseContract }: PageProps) => {
         toaster,
         transactionHash,
         setTransactionResults,
+        transactionResultStorageKey,
         tokenAddress: hederaTokenAddress,
         transactionType: transactionTypeMap[API],
         sessionedContractAddress: currentContractAddress,
@@ -176,6 +177,7 @@ const ManageTokenDeduction = ({ baseContract }: PageProps) => {
         ...prev,
         {
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           tokenAddress: hederaTokenAddress,
           txHash: transactionHash as string,

diff --git a/...onents/contract-interaction/hts/token-query-contract/methods/querySpecificToken/index.tsx b/...onents/contract-interaction/hts/token-query-contract/methods/querySpecificToken/index.tsx
@@ -188,6 +188,7 @@ const QueryTokenSpecificInfomation = ({ baseContract }: PageProps) => {
         setTransactionResults,
         keyTypeCalled: keyType,
         err: tokenInfoResult.err,
+        transactionResultStorageKey,
         tokenAddress: paramValues.hederaTokenAddress,
         sessionedContractAddress: currentContractAddress,
         transactionHash: tokenInfoResult.transactionHash,
@@ -233,6 +234,7 @@ const QueryTokenSpecificInfomation = ({ baseContract }: PageProps) => {
           status: 'success',
           keyTypeCalled: keyType,
           tokenInfo: cachedTokenInfo,
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           tokenAddress: paramValues.hederaTokenAddress,
           sessionedContractAddress: currentContractAddress,

diff --git a/...nts/contract-interaction/hts/token-query-contract/methods/queryTokenGeneralInfo/index.tsx b/...nts/contract-interaction/hts/token-query-contract/methods/queryTokenGeneralInfo/index.tsx
@@ -173,6 +173,7 @@ const QueryTokenGeneralInfomation = ({ baseContract }: PageProps) => {
         toaster,
         err: err,
         setTransactionResults,
+        transactionResultStorageKey,
         transactionHash: transactionHash,
         transactionType: transactionTypeMap[API],
         tokenAddress: paramValues.hederaTokenAddress,
@@ -187,6 +188,7 @@ const QueryTokenGeneralInfomation = ({ baseContract }: PageProps) => {
         {
           APICalled: API,
           status: 'success',
+          transactionResultStorageKey,
           transactionTimeStamp: Date.now(),
           txHash: transactionHash as string,
           transactionType: transactionTypeMap[API],