@toruslabs/ethereum-controllers 5.3.7 → 5.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "5.3.7",
+  "version": "5.3.8",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "main": "dist/ethereumControllers.cjs.js",
@@ -64,7 +64,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c2fcca4be5d467dc40dd9aa6ba9b9c7c344300a1",
+  "gitHead": "ed4d9b8fa78f3dfabc8799f03ab106ddf144566d",
   "devDependencies": {
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "hardhat": "^2.19.5"

package/src/Preferences/PreferencesController.ts

@@ -215,6 +215,7 @@ export default class PreferencesController
           chainId: this.getProviderConfig().chainId,
         });
         const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, selectedAddress, this.provider, chainId);
+        log.info("Formatted Etherscan Response", finalEthScanTxn);
         this.updateState({ etherscanTransactions: finalEthScanTxn });
         return etherscanTxn;
       }
@@ -226,7 +227,7 @@ export default class PreferencesController
       const url = new URL(`${this.config.api}/etherscan`);
       url.searchParams.append("chainId", parameters.chainId);
       const response = await get<{ success: boolean; data: T[] }>(url.href, this.headers(parameters.selectedAddress));
-      log.info("Etherscan Response", response);
+      log.info("Etherscan Response API", response);
       return response.success ? response.data : [];
     } catch (error) {
       log.error("unable to fetch etherscan tx", error);

package/src/utils/helpers.ts

@@ -36,7 +36,7 @@ export const formatPastTx = (x: TransactionPayload, lowerCaseSelectedAddress?: s
   else if (x.type === CONTRACT_TYPE_ERC20) totalAmountString = formatSmallNumbers(Number.parseFloat(x.total_amount), x.symbol, true);
   else totalAmountString = formatSmallNumbers(Number.parseFloat(x.total_amount), x.type_name, true);
   const currencyAmountString =
-    x.type === CONTRACT_TYPE_ERC721 || x.type === CONTRACT_TYPE_ERC1155
+    x.type === CONTRACT_TYPE_ERC721 || x.type === CONTRACT_TYPE_ERC1155 || x.isEtherscan
       ? ""
       : formatSmallNumbers(Number.parseFloat(x.currency_amount), x.selected_currency, true);
   const finalObject: FormattedTransactionActivity = {
@@ -66,7 +66,6 @@ export const formatPastTx = (x: TransactionPayload, lowerCaseSelectedAddress?: s
     type_image_link: x.type_image_link,
     transaction_hash: x.transaction_hash,
     transaction_category: x.transaction_category,
-    // TODO: // figure out how to handle these values.
     isEtherscan: x.isEtherscan,
     input: x.input || "",
     token_id: x.token_id || "",
@@ -199,7 +198,8 @@ export const addEtherscanTransactions = async (
   );
 
   const finalTxs = transactionPromises.reduce((accumulator, x) => {
-    const totalAmount = x.value ? formatEther(x.value) : "";
+    const totalAmountString = x.value ? formatEther(x.value) : "";
+
     const etherscanTransaction: TransactionPayload = {
       etherscanLink: getEtherScanHashLink(x.hash, chainId),
       type: x.type || SUPPORTED_NETWORKS[chainId]?.ticker || CONTRACT_TYPE_ETH,
@@ -207,12 +207,12 @@ export const addEtherscanTransactions = async (
       type_name: x.type_name || "n/a",
       symbol: SUPPORTED_NETWORKS[chainId]?.ticker,
       token_id: x.tokenID || "",
-      total_amount: totalAmount,
+      total_amount: totalAmountString,
       created_at: new Date(Number(x.timeStamp) * 1000),
       from: x.from,
       to: x.to,
       transaction_hash: x.hash,
-      status: x.txreceipt_status && x.txreceipt_status === "0" ? TransactionStatus.failed : TransactionStatus.approved,
+      status: x.txreceipt_status && x.txreceipt_status === "0" ? TransactionStatus.failed : TransactionStatus.confirmed,
       isEtherscan: true,
       input: x.input,
       contract_address: x.contractAddress,