@toruslabs/ethereum-controllers 5.3.7 → 5.3.8

package/dist/ethereumControllers.esm.js

@@ -1350,7 +1350,7 @@ const formatPastTx = (x, lowerCaseSelectedAddress) => {
   var _x$to;
   let totalAmountString = "";
   if (x.type === CONTRACT_TYPE_ERC721 || x.type === CONTRACT_TYPE_ERC1155) totalAmountString = x.symbol;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 ? "" : formatSmallNumbers(Number.parseFloat(x.currency_amount), x.selected_currency, true);
+  const currencyAmountString = x.type === CONTRACT_TYPE_ERC721 || x.type === CONTRACT_TYPE_ERC1155 || x.isEtherscan ? "" : formatSmallNumbers(Number.parseFloat(x.currency_amount), x.selected_currency, true);
   const finalObject = {
     id: x.created_at.toString(),
     date: new Date(x.created_at).toString(),
@@ -1375,7 +1375,6 @@ const formatPastTx = (x, lowerCaseSelectedAddress) => {
     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 || "",
@@ -1496,7 +1495,7 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
   }));
   const finalTxs = transactionPromises.reduce((accumulator, x) => {
     var _SUPPORTED_NETWORKS$c3, _SUPPORTED_NETWORKS$c4;
-    const totalAmount = x.value ? formatEther(x.value) : "";
+    const totalAmountString = x.value ? formatEther(x.value) : "";
     const etherscanTransaction = {
       etherscanLink: getEtherScanHashLink(x.hash, chainId),
       type: x.type || ((_SUPPORTED_NETWORKS$c3 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c3 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c3.ticker) || CONTRACT_TYPE_ETH,
@@ -1504,12 +1503,12 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
       type_name: x.type_name || "n/a",
       symbol: (_SUPPORTED_NETWORKS$c4 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c4 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c4.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,
@@ -4285,6 +4284,7 @@ class PreferencesController extends BasePreferencesController {
           chainId: this.getProviderConfig().chainId
         });
         const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, selectedAddress, this.provider, chainId);
+        log.info("Formatted Etherscan Response", finalEthScanTxn);
         this.updateState({
           etherscanTransactions: finalEthScanTxn
         });
@@ -4297,7 +4297,7 @@ class PreferencesController extends BasePreferencesController {
       const url = new URL(`${this.config.api}/etherscan`);
       url.searchParams.append("chainId", parameters.chainId);
       const response = await get(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);