From 471d034a1b1a09085f230db9e380c5f4d8783bd4 Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Wed, 7 Jun 2023 12:05:01 +0530 Subject: [PATCH] proxy contract status --- apps/etherscan/src/app/app.tsx | 13 +++++++++---- apps/etherscan/src/app/utils/verify.ts | 4 ++++ apps/etherscan/src/app/views/ReceiptsView.tsx | 8 ++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/apps/etherscan/src/app/app.tsx b/apps/etherscan/src/app/app.tsx index 77911a9c05..501e3620ae 100644 --- a/apps/etherscan/src/app/app.tsx +++ b/apps/etherscan/src/app/app.tsx @@ -109,21 +109,26 @@ const App = () => { apiKey, getEtherScanApi(networkId) ) - status.details = status.result - status.result = 'Successfully Updated' + if (status.status === '1') { + status.message = status.result + status.result = 'Successfully Updated' + } } else status = await getReceiptStatus( item.guid, apiKey, getEtherScanApi(networkId) ) - if (status.result === "Pass - Verified" || status.result === "Already Verified" || status.result === "Successfully Updated") { + if (status.result === "Pass - Verified" || status.result === "Already Verified" || + status.result === "Successfully Updated") { newReceipts = newReceipts.map((currentReceipt: Receipt) => { if (currentReceipt.guid === item.guid) { - return { + let res = { ...currentReceipt, status: status.result, } + if (currentReceipt.isProxyContract) res.message = status.message + return res } return currentReceipt }) diff --git a/apps/etherscan/src/app/utils/verify.ts b/apps/etherscan/src/app/utils/verify.ts index f813192cdc..67de3dcd1e 100644 --- a/apps/etherscan/src/app/utils/verify.ts +++ b/apps/etherscan/src/app/utils/verify.ts @@ -121,6 +121,10 @@ export const verify = async ( apiKeyParam, etherscanApi ) + if (receiptStatus.status === '1') { + receiptStatus.message = receiptStatus.result + receiptStatus.result = 'Successfully Updated' + } } else receiptStatus = await getReceiptStatus( result, apiKeyParam, diff --git a/apps/etherscan/src/app/views/ReceiptsView.tsx b/apps/etherscan/src/app/views/ReceiptsView.tsx index 1ab86d6db2..8c4a00a4af 100644 --- a/apps/etherscan/src/app/views/ReceiptsView.tsx +++ b/apps/etherscan/src/app/views/ReceiptsView.tsx @@ -33,13 +33,17 @@ export const ReceiptsView: React.FC = () => { } const etherscanApi = getEtherScanApi(networkId) let result - if (isProxyContractReceipt) + if (isProxyContractReceipt) { result = await getProxyContractReceiptStatus( values.receiptGuid, apiKey, etherscanApi ) - else + if (result.status === '1') { + result.message = result.result + result.result = 'Successfully Updated' + } + } else result = await getReceiptStatus( values.receiptGuid, apiKey,