@@ -22,7 +25,7 @@ const HistoryItem = ({ transfer, fee }) => {
"d6329b5b1f7c0805b5c345f4957554002a2f557845f64d7645dae0e051a6498a"
? transfer.incoming
? transfer.amount
- : (transfer.amount * 1e12 - fee * 1e12) / 1e12
+ : amount.minus(fixedFee).toString()
: transfer.amount
)}{" "}
{
diff --git a/src/app/components/TransactionDetails/TransactionDetails.jsx b/src/app/components/TransactionDetails/TransactionDetails.jsx
index fdce389..11bbeb1 100644
--- a/src/app/components/TransactionDetails/TransactionDetails.jsx
+++ b/src/app/components/TransactionDetails/TransactionDetails.jsx
@@ -1,4 +1,5 @@
import React, { useEffect } from "react";
+import Big from "big.js";
import copyIcon from "../../assets/svg/copy-blue.svg";
import incomingIcon from "../../assets/svg/incoming_ico.svg";
import outgoingIcon from "../../assets/svg/outgoing_ico.svg";
@@ -44,6 +45,8 @@ const TransactionDetails = (props) => {
{props.transfers.map((transfer) => {
if (transfer.amount === props.fee) return null;
+ const amount = new Big(transfer.amount);
+ const fixedFee = new Big(props.fee);
return (
<>
@@ -52,7 +55,7 @@ const TransactionDetails = (props) => {
"d6329b5b1f7c0805b5c345f4957554002a2f557845f64d7645dae0e051a6498a"
? transfer.incoming
? transfer.amount
- : (transfer.amount * 1e12 - props.fee * 1e12) / 1e12
+ : amount.minus(fixedFee).toString()
: transfer.amount
)}{" "}
{
diff --git a/src/app/components/Wallet/Wallet.jsx b/src/app/components/Wallet/Wallet.jsx
index bbc6996..cc9d8f8 100644
--- a/src/app/components/Wallet/Wallet.jsx
+++ b/src/app/components/Wallet/Wallet.jsx
@@ -27,9 +27,9 @@ const Wallet = () => {
: s.aliasContent;
const renderBalance = () => {
- const fiatBalance = (state.wallet.balance * state.priceData.price).toFixed(
- 2
- );
+ const fiatBalance = (
+ Number(state.wallet.balance) * state.priceData.price
+ ).toFixed(2);
if (state.displayUsd) {
return (
@@ -46,7 +46,9 @@ const Wallet = () => {
);
} else {
- return {censorValue(state.wallet.balance.toFixed(2))} ZANO;
+ return (
+ {censorValue(Number(state.wallet.balance).toFixed(2))} ZANO
+ );
}
};
@@ -117,7 +119,8 @@ const Wallet = () => {
{getUnlockedBalance() !== state.wallet.balance && (
Locked balance:{" "}
- {(state.wallet.balance - getUnlockedBalance()).toFixed(2)} ZANO
+ {(Number(state.wallet.balance) - getUnlockedBalance()).toFixed(2)}{" "}
+ ZANO
)}
diff --git a/src/app/utils/utils.js b/src/app/utils/utils.js
index 99c5425..4c6b656 100644
--- a/src/app/utils/utils.js
+++ b/src/app/utils/utils.js
@@ -1,13 +1,29 @@
+import Big from "big.js";
+
export async function fetchBackground(data) {
- return new Promise((resolve, reject) => {
- try {
- // eslint-disable-next-line no-undef
- chrome.runtime.sendMessage(data, function (response) {
- resolve(response);
- });
- } catch (error) {
- console.error(`Error while fetching data (${data.method}):`, error);
- reject(error);
- }
- });
-};
\ No newline at end of file
+ return new Promise((resolve, reject) => {
+ try {
+ // eslint-disable-next-line no-undef
+ chrome.runtime.sendMessage(data, function (response) {
+ resolve(response);
+ });
+ } catch (error) {
+ console.error(`Error while fetching data (${data.method}):`, error);
+ reject(error);
+ }
+ });
+}
+
+const multiplier = new Big((1e12).toString());
+
+export const removeZeros = (amount) => {
+ const bigAmount = new Big(amount);
+ const fixedAmount = bigAmount.div(multiplier).toString();
+ return fixedAmount;
+};
+
+export const addZeros = (amount) => {
+ const bigAmount = new Big(amount);
+ const fixedAmount = bigAmount.times(multiplier);
+ return fixedAmount;
+};
diff --git a/src/background/wallet.js b/src/background/wallet.js
index 7e1a915..630a714 100644
--- a/src/background/wallet.js
+++ b/src/background/wallet.js
@@ -1,3 +1,5 @@
+import { addZeros, removeZeros } from "../app/utils/utils";
+
const fetchTxData = async () => {
try {
const response = await fetch("http://localhost:12111/json_rpc", {
@@ -47,7 +49,6 @@ export const fetchData = async (method, params = {}) =>
export const getAlias = async (address) => {
const response = await fetchData("get_alias_by_address", address);
const data = await response.json();
- console.log("get alias by address", data);
if (data.result.status === "OK") {
return data.result.alias_info_list[0].alias;
} else {
@@ -58,7 +59,6 @@ export const getAlias = async (address) => {
export const getAliasDetails = async (alias) => {
const response = await fetchData("get_alias_details", { alias });
const data = await response.json();
- console.log("get alias details", data);
if (data.result.status === "OK") {
return data.result.alias_info_list[0].alias;
} else {
@@ -73,17 +73,16 @@ export const getWallets = async () => {
const wallets = await Promise.all(
data.result.wallets.map(async (wallet) => {
const alias = await getAlias(wallet.wi.address);
- const balance =
- wallet.wi.balances.find(
- (asset) =>
- asset.asset_info.asset_id ===
- "d6329b5b1f7c0805b5c345f4957554002a2f557845f64d7645dae0e051a6498a"
- ).total /
- 10 ** 12;
+ const balance = wallet.wi.balances.find(
+ (asset) =>
+ asset.asset_info.asset_id ===
+ "d6329b5b1f7c0805b5c345f4957554002a2f557845f64d7645dae0e051a6498a"
+ ).total;
+
return {
address: wallet.wi.address,
alias: alias,
- balance: balance,
+ balance: removeZeros(balance),
};
})
);
@@ -100,13 +99,13 @@ export const getWalletData = async () => {
const address = addressParsed.result.address;
const balanceResponse = await fetchData("getbalance");
const balanceParsed = await balanceResponse.json();
- const balance =
+ const balance = removeZeros(
balanceParsed.result.balances.find(
(asset) =>
asset.asset_info.asset_id ===
"d6329b5b1f7c0805b5c345f4957554002a2f557845f64d7645dae0e051a6498a"
- ).total /
- 10 ** 12;
+ ).total
+ );
const txDataResponse = await fetchTxData();
const txData = txDataResponse.result.transfers;
let transactions = [];
@@ -124,10 +123,10 @@ export const getWalletData = async () => {
height: tx.height,
paymentId: tx.payment_id,
comment: tx.comment,
- fee: tx.fee / 10 ** 12,
+ fee: removeZeros(tx.fee),
addresses: tx.remote_addresses,
transfers: tx.subtransfers.map((transfer) => ({
- amount: transfer.amount / 10 ** 12,
+ amount: removeZeros(transfer.amount),
assetId: transfer.asset_id,
incoming: transfer.is_income,
})),
@@ -139,8 +138,8 @@ export const getWalletData = async () => {
name: asset.asset_info.full_name,
ticker: asset.asset_info.ticker,
assetId: asset.asset_info.asset_id,
- balance: asset.total / 10 ** 12,
- unlockedBalance: asset.unlocked / 10 ** 12,
+ balance: removeZeros(asset.total),
+ unlockedBalance: removeZeros(asset.unlocked),
}))
.sort((a, b) => {
if (
@@ -229,10 +228,11 @@ export const transfer = async (
const destinations = [
{
address: destination,
- amount: amount * 10 ** 12,
+ amount: addZeros(amount),
asset_id: assetId,
},
];
+
const response = await fetch("http://localhost:12111/json_rpc", {
method: "POST",
headers: {
@@ -268,7 +268,7 @@ export const transferBridge = async (
{
address:
"ZxCzikmFWMZEX8z3nojPyzcFUeEYcihX2jFvhLLYvJqtdgne2RLFd6UDaPgmzMNgDZP71E7citLPei4pLCWDjUWS1qGzMuagu",
- amount: amount * 10 ** 12,
+ amount: addZeros(amount),
asset_id: assetId,
},
];
@@ -313,6 +313,8 @@ export const transferBridge = async (
}),
});
+ console.log(response);
+
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}