Skip to content

Fix JMD display precision handling in wallet transaction mapping #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
temp4allOG wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix JMD display precision handling in wallet transaction mapping #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/app/wallets/get-transactions-for-wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ export const getTransactionsForWallets = async ({

export const toWalletTransactions = (ibexResp: GResponse200): IbexTransaction[] => {
return ibexResp.map(trx => {
const displayCurrency = ((trx as { displayCurrency?: string }).displayCurrency || (trx as { settlementDisplayCurrency?: string }).settlementDisplayCurrency || "USD") as DisplayCurrency
const currency = (trx.currencyId === 3 ? "USD" : "BTC") as WalletCurrency // WalletCurrency: "USD" | "BTC",

const settlementDisplayPrice: WalletMinorUnitDisplayPrice<WalletCurrency, DisplayCurrency> = {
base: trx.exchangeRateCurrencySats ? BigInt(Math.floor(trx.exchangeRateCurrencySats)) : 0n,
offset: 0n, // what is this?
displayCurrency: "USD" as DisplayCurrency,
base: trx.exchangeRateCurrencySats ? BigInt(Math.round(trx.exchangeRateCurrencySats)) : 0n,
offset: 0n,
displayCurrency,
walletCurrency: currency
}

Expand All @@ -48,8 +49,8 @@ export const toWalletTransactions = (ibexResp: GResponse200): IbexTransaction[]
settlementAmount: toSettlementAmount(trx.amount, trx.transactionTypeId, currency),
settlementFee: asCurrency(trx.networkFee, currency),
settlementCurrency: currency,
settlementDisplayAmount: `${trx.amount}`,
settlementDisplayFee: `${trx.networkFee}`,
settlementDisplayAmount: `${(trx as { settlementDisplayAmount?: number | string }).settlementDisplayAmount ?? trx.amount}`,
settlementDisplayFee: `${(trx as { settlementDisplayFee?: number | string }).settlementDisplayFee ?? trx.networkFee}`,
settlementDisplayPrice: settlementDisplayPrice,
createdAt: trx.createdAt ? new Date(trx.createdAt) : new Date(), // should always return
id: trx.id || "null", // "LedgerTransactionId" - this is likely unused
Expand Down
2 changes: 1 addition & 1 deletion src/graphql/shared/types/object/btc-wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const BtcWallet = GT.Object<Wallet>({
if (balanceSats instanceof Error) {
throw mapError(balanceSats)
}
return balanceSats
return normalizePaymentAmount(balanceSats).amount
},
},
pendingIncomingBalance: {
Expand Down