diff options
author | Sebastian <sebasjm@gmail.com> | 2024-02-04 17:02:16 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2024-02-04 17:02:16 -0300 |
commit | bda2474d19eea56468c56f204ec26e70807945f5 (patch) | |
tree | 0835834ab30cce708a4df153d722b88bff5b383b /packages/taler-wallet-core/src | |
parent | 1b0b40fee2b15dd8847bf91c01630492ced93750 (diff) | |
download | wallet-core-bda2474d19eea56468c56f204ec26e70807945f5.tar.xz |
pretty
Diffstat (limited to 'packages/taler-wallet-core/src')
-rw-r--r-- | packages/taler-wallet-core/src/operations/reward.ts | 21 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/operations/transactions.ts | 10 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/wallet.ts | 12 |
3 files changed, 27 insertions, 16 deletions
diff --git a/packages/taler-wallet-core/src/operations/reward.ts b/packages/taler-wallet-core/src/operations/reward.ts index 369c1f40d..6dcd48019 100644 --- a/packages/taler-wallet-core/src/operations/reward.ts +++ b/packages/taler-wallet-core/src/operations/reward.ts @@ -651,7 +651,7 @@ export async function acceptTipBackwardCompat( transactionIdParam: TransactionIdStr | undefined, ): Promise<AcceptTipResponse> { if (transactionIdParam) { - return acceptTip(ws, transactionIdParam) + return acceptTip(ws, transactionIdParam); } if (walletTipId) { /** @@ -661,19 +661,26 @@ export async function acceptTipBackwardCompat( tag: TransactionType.Reward, walletRewardId: walletTipId, }); - return acceptTip(ws, transactionId) + return acceptTip(ws, transactionId); } - throw Error("Unable to accept tip: neither tipId (deprecated) nor transactionId was specified") + throw Error( + "Unable to accept tip: neither tipId (deprecated) nor transactionId was specified", + ); } export async function acceptTip( ws: InternalWalletState, transactionId: TransactionIdStr, ): Promise<AcceptTipResponse> { - const pTxId = parseTransactionIdentifier(transactionId) - if (!pTxId) throw Error(`Unable to accept tip: invalid tx tag "${transactionId}"`) - const rewardId = pTxId.tag === TransactionType.Reward ? pTxId.walletRewardId : undefined; - if (!rewardId) throw Error(`Unable to accept tip: txId is not a reward tag "${pTxId.tag}"`) + const pTxId = parseTransactionIdentifier(transactionId); + if (!pTxId) + throw Error(`Unable to accept tip: invalid tx tag "${transactionId}"`); + const rewardId = + pTxId.tag === TransactionType.Reward ? pTxId.walletRewardId : undefined; + if (!rewardId) + throw Error( + `Unable to accept tip: txId is not a reward tag "${pTxId.tag}"`, + ); const dbRes = await ws.db .mktx((x) => [x.rewards]) .runReadWrite(async (tx) => { diff --git a/packages/taler-wallet-core/src/operations/transactions.ts b/packages/taler-wallet-core/src/operations/transactions.ts index f64d3d21d..8fd7afae6 100644 --- a/packages/taler-wallet-core/src/operations/transactions.ts +++ b/packages/taler-wallet-core/src/operations/transactions.ts @@ -539,7 +539,7 @@ function buildTransactionForPeerPullCredit( const silentWithdrawalErrorForInvoice = wsrOrt?.lastError && wsrOrt.lastError.code === - TalerErrorCode.WALLET_WITHDRAWAL_GROUP_INCOMPLETE && + TalerErrorCode.WALLET_WITHDRAWAL_GROUP_INCOMPLETE && Object.values(wsrOrt.lastError.errorsPerCoin ?? {}).every((e) => { return ( e.code === TalerErrorCode.WALLET_UNEXPECTED_REQUEST_ERROR && @@ -569,10 +569,10 @@ function buildTransactionForPeerPullCredit( kycUrl: pullCredit.kycUrl, ...(wsrOrt?.lastError ? { - error: silentWithdrawalErrorForInvoice - ? undefined - : wsrOrt.lastError, - } + error: silentWithdrawalErrorForInvoice + ? undefined + : wsrOrt.lastError, + } : {}), }; } diff --git a/packages/taler-wallet-core/src/wallet.ts b/packages/taler-wallet-core/src/wallet.ts index 6440a9912..b8d11760c 100644 --- a/packages/taler-wallet-core/src/wallet.ts +++ b/packages/taler-wallet-core/src/wallet.ts @@ -735,9 +735,9 @@ async function dumpCoins(ws: InternalWalletState): Promise<CoinDumpJson> { ageCommitmentProof: c.ageCommitmentProof, spend_allocation: c.spendAllocation ? { - amount: c.spendAllocation.amount, - id: c.spendAllocation.id, - } + amount: c.spendAllocation.amount, + id: c.spendAllocation.id, + } : undefined, }); } @@ -1195,7 +1195,11 @@ async function dispatchRequestInternal<Op extends WalletApiOperation>( } case WalletApiOperation.AcceptReward: { const req = codecForAcceptTipRequest().decode(payload); - return await acceptTipBackwardCompat(ws, req.walletRewardId, req.transactionId); + return await acceptTipBackwardCompat( + ws, + req.walletRewardId, + req.transactionId, + ); } case WalletApiOperation.AddBackupProvider: { const req = codecForAddBackupProviderRequest().decode(payload); |