diff options
author | Sebastian <sebasjm@gmail.com> | 2024-02-06 17:06:56 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2024-02-06 17:06:56 -0300 |
commit | 27e4ff3011527d9c0b7630dc7a4080f8fb817300 (patch) | |
tree | a56f906cc36065eaf1733ea97a4eccc690145094 /packages/taler-wallet-webextension/src/wallet | |
parent | f91319e404ecfebfbc343175dd0bb73ab10eb4c0 (diff) | |
download | wallet-core-27e4ff3011527d9c0b7630dc7a4080f8fb817300.tar.gz wallet-core-27e4ff3011527d9c0b7630dc7a4080f8fb817300.tar.bz2 wallet-core-27e4ff3011527d9c0b7630dc7a4080f8fb817300.zip |
fixes #8336 remove rewards
Diffstat (limited to 'packages/taler-wallet-webextension/src/wallet')
5 files changed, 11 insertions, 155 deletions
diff --git a/packages/taler-wallet-webextension/src/wallet/AddNewActionView.tsx b/packages/taler-wallet-webextension/src/wallet/AddNewActionView.tsx index fc3a0916c..dd1777fd1 100644 --- a/packages/taler-wallet-webextension/src/wallet/AddNewActionView.tsx +++ b/packages/taler-wallet-webextension/src/wallet/AddNewActionView.tsx @@ -66,8 +66,6 @@ export function AddNewActionView({ onCancel }: Props): VNode { return <i18n.Translate>Open pay page</i18n.Translate>; case TalerUriAction.Refund: return <i18n.Translate>Open refund page</i18n.Translate>; - case TalerUriAction.Reward: - return <i18n.Translate>Open tip page</i18n.Translate>; case TalerUriAction.Withdraw: return <i18n.Translate>Open withdraw page</i18n.Translate>; } diff --git a/packages/taler-wallet-webextension/src/wallet/Application.tsx b/packages/taler-wallet-webextension/src/wallet/Application.tsx index 3867845f2..140bb5683 100644 --- a/packages/taler-wallet-webextension/src/wallet/Application.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Application.tsx @@ -59,7 +59,6 @@ import { PaymentPage } from "../cta/Payment/index.js"; import { PaymentTemplatePage } from "../cta/PaymentTemplate/index.js"; import { RecoveryPage } from "../cta/Recovery/index.js"; import { RefundPage } from "../cta/Refund/index.js"; -import { TipPage } from "../cta/Reward/index.js"; import { TransferCreatePage } from "../cta/TransferCreate/index.js"; import { TransferPickupPage } from "../cta/TransferPickup/index.js"; import { @@ -366,34 +365,6 @@ export function Application(): VNode { )} /> <Route - path={Pages.ctaTips} - component={({ talerUri }: { talerUri: string }) => ( - <CallToActionTemplate title={i18n.str`Digital cash rewards`}> - <TipPage - talerTipUri={decodeURIComponent(talerUri)} - onCancel={() => redirectTo(Pages.balance)} - onSuccess={(tid: string) => - redirectTo(Pages.balanceTransaction({ tid })) - } - /> - </CallToActionTemplate> - )} - /> - <Route - path={Pages.ctaRewards} - component={({ talerUri }: { talerUri: string }) => ( - <CallToActionTemplate title={i18n.str`Digital cash rewards`}> - <TipPage - talerTipUri={decodeURIComponent(talerUri)} - onCancel={() => redirectTo(Pages.balance)} - onSuccess={(tid: string) => - redirectTo(Pages.balanceTransaction({ tid })) - } - /> - </CallToActionTemplate> - )} - /> - <Route path={Pages.ctaWithdraw} component={({ talerUri }: { talerUri: string }) => ( <CallToActionTemplate title={i18n.str`Digital cash withdrawal`}> diff --git a/packages/taler-wallet-webextension/src/wallet/History.stories.tsx b/packages/taler-wallet-webextension/src/wallet/History.stories.tsx index 8b4f64a93..cc87cb992 100644 --- a/packages/taler-wallet-webextension/src/wallet/History.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/History.stories.tsx @@ -35,7 +35,6 @@ import { TransactionPeerPushDebit, TransactionRefresh, TransactionRefund, - TransactionReward, TransactionType, TransactionWithdrawal, WithdrawalType, @@ -112,11 +111,6 @@ const exampleData = { exchangeBaseUrl: "http://exchange.taler", refreshReason: RefreshReason.PayMerchant, } as TransactionRefresh, - tip: { - ...commonTransaction(), - type: TransactionType.Reward, - merchantBaseUrl: "http://ads.merchant.taler.net/", - } as TransactionReward, refund: { ...commonTransaction(), type: TransactionType.Refund, @@ -277,7 +271,6 @@ export const SomeTransactions = tests.createExample(TestedComponent, { }, }, exampleData.refund, - exampleData.tip, exampleData.deposit, ], balances: [ @@ -371,7 +364,6 @@ export const SomeTransactionsInDifferentStates = tests.createExample( }, }, exampleData.refund, - exampleData.tip, exampleData.deposit, ], balances: [ @@ -402,7 +394,6 @@ export const SomeTransactionsWithTwoCurrencies = tests.createExample( exampleData.payment, exampleData.refresh, exampleData.refund, - exampleData.tip, exampleData.deposit, ], balances: [ diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx index c17d15b01..194f0e0bb 100644 --- a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx @@ -38,11 +38,10 @@ import { TransactionPeerPushDebit, TransactionRefresh, TransactionRefund, - TransactionReward, TransactionType, TransactionWithdrawal, WithdrawalDetails, - WithdrawalType, + WithdrawalType } from "@gnu-taler/taler-util"; import * as tests from "@gnu-taler/web-util/testing"; import beer from "../../static-dev/beer.png"; @@ -137,17 +136,6 @@ const exampleData = { exchangeBaseUrl: "http://exchange.taler", refreshReason: RefreshReason.Manual, } as TransactionRefresh, - tip: { - ...commonTransaction, - type: TransactionType.Reward, - // merchant: { - // name: "the merchant", - // logo: merchantIcon, - // website: "https://www.themerchant.taler", - // email: "contact@merchant.taler", - // }, - merchantBaseUrl: "http://merchant.taler", - } as TransactionReward, refund: { ...commonTransaction, type: TransactionType.Refund, @@ -584,26 +572,6 @@ export const RefreshError = tests.createExample(TestedComponent, { }, }); -export const Tip = tests.createExample(TestedComponent, { - transaction: exampleData.tip, -}); - -export const TipError = tests.createExample(TestedComponent, { - transaction: { - ...exampleData.tip, - error: transactionError, - }, -}); - -export const TipPending = tests.createExample(TestedComponent, { - transaction: { - ...exampleData.tip, - txState: { - major: TransactionMajorState.Pending, - }, - }, -}); - export const Refund = tests.createExample(TestedComponent, { transaction: exampleData.refund, }); diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx index f6c98952e..65fc90f44 100644 --- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx @@ -229,8 +229,8 @@ function TransactionTemplate({ <Fragment> <section style={{ padding: 8, textAlign: "center" }}> {transaction?.error && - // FIXME: wallet core should stop sending this error on KYC - transaction.error.code !== + // FIXME: wallet core should stop sending this error on KYC + transaction.error.code !== TalerErrorCode.WALLET_WITHDRAWAL_KYC_REQUIRED ? ( <ErrorAlertView error={alertFromError( @@ -465,11 +465,11 @@ export function TransactionView({ </Header> {transaction.txState.major !== - TransactionMajorState.Pending ? undefined : transaction.txState + TransactionMajorState.Pending ? undefined : transaction.txState .minor === TransactionMinorState.KycRequired || - transaction.txState.minor === + transaction.txState.minor === TransactionMinorState.AmlRequired ? undefined : transaction - .withdrawalDetails.type === WithdrawalType.ManualTransfer ? ( + .withdrawalDetails.type === WithdrawalType.ManualTransfer ? ( //manual withdrawal <BankDetailsByPaytoType amount={raw} @@ -751,40 +751,6 @@ export function TransactionView({ ); } - if (transaction.type === TransactionType.Reward) { - return ( - <TransactionTemplate - transaction={transaction} - onDelete={onDelete} - onRetry={onRetry} - onAbort={onAbort} - onResume={onResume} - onSuspend={onSuspend} - onCancel={onCancel} - > - <Header - timestamp={transaction.timestamp} - type={i18n.str`Tip`} - total={effective} - kind="positive" - > - {transaction.merchantBaseUrl} - </Header> - {/* <Part - title={i18n.str`Merchant`} - text={<MerchantDetails merchant={transaction.merchant} />} - kind="neutral" - /> */} - <Part - title={i18n.str`Details`} - text={ - <TipDetails amount={getAmountWithFee(effective, raw, "credit")} /> - } - /> - </TransactionTemplate> - ); - } - if (transaction.type === TransactionType.Refund) { return ( <TransactionTemplate @@ -1042,6 +1008,9 @@ export function TransactionView({ if (transaction.type === TransactionType.Recoup) { throw Error("recoup transaction not implemented"); } + if (transaction.type === TransactionType.Reward) { + throw Error("recoup transaction not implemented"); + } assertUnreachable(transaction); } @@ -1453,7 +1422,7 @@ export function WithdrawDetails({ </td> </tr> {conversion.fraction === amount.value.fraction && - conversion.value === amount.value.value ? undefined : ( + conversion.value === amount.value.value ? undefined : ( <tr> <td> <i18n.Translate>Converted</i18n.Translate> @@ -1839,47 +1808,6 @@ function RefreshDetails({ amount }: { amount: AmountWithFee }): VNode { ); } -function TipDetails({ amount }: { amount: AmountWithFee }): VNode { - const { i18n } = useTranslationContext(); - - return ( - <PurchaseDetailsTable> - <tr> - <td> - <i18n.Translate>Tip</i18n.Translate> - </td> - <td> - <Amount value={amount.value} maxFracSize={amount.maxFrac} /> - </td> - </tr> - - {Amounts.isNonZero(amount.fee) && ( - <tr> - <td> - <i18n.Translate>Fees</i18n.Translate> - </td> - <td> - <Amount value={amount.fee} maxFracSize={amount.maxFrac} /> - </td> - </tr> - )} - <tr> - <td colSpan={2}> - <hr /> - </td> - </tr> - <tr> - <td> - <i18n.Translate>Total</i18n.Translate> - </td> - <td> - <Amount value={amount.total} maxFracSize={amount.maxFrac} /> - </td> - </tr> - </PurchaseDetailsTable> - ); -} - function Header({ timestamp, total, @@ -2054,7 +1982,7 @@ function ShowWithdrawalDetailForBankIntegrated({ /> )} {!transaction.withdrawalDetails.confirmed && - transaction.withdrawalDetails.bankConfirmationUrl ? ( + transaction.withdrawalDetails.bankConfirmationUrl ? ( <InfoBox> <div style={{ display: "block" }}> <i18n.Translate> |