[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] 01/02: remove references to product and delivery
|
From: |
gnunet |
|
Subject: |
[taler-wallet-core] 01/02: remove references to product and delivery |
|
Date: |
Fri, 08 Sep 2023 23:12:45 +0200 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository wallet-core.
commit b784144edf2cf21b886bfbea6750cac69fb94159
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Fri Sep 8 18:09:33 2023 -0300
remove references to product and delivery
---
.../ShowFullContractTermPopup.stories.tsx | 6 ++--
.../src/components/ShowFullContractTermPopup.tsx | 8 ++---
.../src/cta/Payment/views.tsx | 2 +-
.../src/cta/Refund/index.ts | 2 +-
.../src/cta/Refund/state.ts | 2 +-
.../src/cta/Refund/stories.tsx | 26 ++++++++--------
.../src/cta/Refund/views.tsx | 4 +--
.../src/wallet/Transaction.stories.tsx | 36 +++++++++++-----------
.../src/wallet/Transaction.tsx | 22 ++++++-------
9 files changed, 54 insertions(+), 54 deletions(-)
diff --git
a/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.stories.tsx
b/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.stories.tsx
index 6cf863519..74c92cbc6 100644
---
a/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.stories.tsx
+++
b/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.stories.tsx
@@ -73,11 +73,11 @@ const cd: WalletContractData = {
country: "ar",
},
},
- products: [],
+ // products: [],
autoRefund: undefined,
summaryI18n: undefined,
- deliveryDate: undefined,
- deliveryLocation: undefined,
+ // deliveryDate: undefined,
+ // deliveryLocation: undefined,
};
export const ShowingSimpleOrder = tests.createExample(ShowView, {
diff --git
a/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.tsx
b/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.tsx
index 392a7d0e8..db9b6ebcd 100644
---
a/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.tsx
+++
b/packages/taler-wallet-webextension/src/components/ShowFullContractTermPopup.tsx
@@ -259,7 +259,7 @@ export function ShowView({ contractTerms, hideHandler }:
States.Show): VNode {
</span>
</td>
</tr>
- <tr>
+ {/* <tr>
<td>
<i18n.Translate>Delivery date</i18n.Translate>
</td>
@@ -291,7 +291,7 @@ export function ShowView({ contractTerms, hideHandler }:
States.Show): VNode {
.map((p) => `${p.description} x ${p.quantity}`)
.join(", ")}
</td>
- </tr>
+ </tr> */}
<tr>
<td>
<i18n.Translate>Created at</i18n.Translate>
@@ -334,8 +334,8 @@ export function ShowView({ contractTerms, hideHandler }:
States.Show): VNode {
!contractTerms.autoRefund
? Duration.getZero()
: Duration.fromTalerProtocolDuration(
- contractTerms.autoRefund,
- ),
+ contractTerms.autoRefund,
+ ),
)}
format="dd MMMM yyyy, HH:mm"
/>
diff --git a/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
b/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
index 0bdadef0e..c00e570f9 100644
--- a/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
@@ -76,7 +76,7 @@ export function BaseView(state: SupportedStates): VNode {
...contractTerms,
orderId: contractTerms.order_id,
contractTermsHash: "",
- products: contractTerms.products!,
+ // products: contractTerms.products!,
}}
proposalId={state.payStatus.proposalId}
/>
diff --git a/packages/taler-wallet-webextension/src/cta/Refund/index.ts
b/packages/taler-wallet-webextension/src/cta/Refund/index.ts
index bbb72c328..42e9cc534 100644
--- a/packages/taler-wallet-webextension/src/cta/Refund/index.ts
+++ b/packages/taler-wallet-webextension/src/cta/Refund/index.ts
@@ -49,7 +49,7 @@ export namespace State {
interface BaseInfo {
merchantName: string;
- products: Product[] | undefined;
+ // products: Product[] | undefined;
amount: AmountJson;
// awaitingAmount: AmountJson;
// granted: AmountJson;
diff --git a/packages/taler-wallet-webextension/src/cta/Refund/state.ts
b/packages/taler-wallet-webextension/src/cta/Refund/state.ts
index 0ba77a19d..6c0f37471 100644
--- a/packages/taler-wallet-webextension/src/cta/Refund/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/Refund/state.ts
@@ -106,7 +106,7 @@ export function useComponentState({
// granted: Amounts.parseOrThrow(info.response.refund.granted),
// awaitingAmount: Amounts.parseOrThrow(refund.awaiting),
merchantName: purchase.info.merchant.name,
- products: purchase.info.products,
+ // products: purchase.info.products,
error: undefined,
};
diff --git a/packages/taler-wallet-webextension/src/cta/Refund/stories.tsx
b/packages/taler-wallet-webextension/src/cta/Refund/stories.tsx
index ef1f76033..03d55ee91 100644
--- a/packages/taler-wallet-webextension/src/cta/Refund/stories.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Refund/stories.tsx
@@ -47,7 +47,7 @@ export const Ready = tests.createExample(ReadyView, {
// awaitingAmount: Amounts.parseOrThrow("USD:1"),
// granted: Amounts.parseOrThrow("USD:0"),
merchantName: "the merchant",
- products: [],
+ // products: [],
orderId: "abcdef",
});
@@ -60,18 +60,18 @@ export const WithAProductList =
tests.createExample(ReadyView, {
// awaitingAmount: Amounts.parseOrThrow("USD:1"),
// granted: Amounts.parseOrThrow("USD:0"),
merchantName: "the merchant",
- products: [
- {
- description: "beer",
- image: beer,
- quantity: 2,
- },
- {
- description: "t-shirt",
- price: "EUR:1",
- quantity: 5,
- },
- ],
+ // products: [
+ // {
+ // description: "beer",
+ // image: beer,
+ // quantity: 2,
+ // },
+ // {
+ // description: "t-shirt",
+ // price: "EUR:1",
+ // quantity: 5,
+ // },
+ // ],
orderId: "abcdef",
});
diff --git a/packages/taler-wallet-webextension/src/cta/Refund/views.tsx
b/packages/taler-wallet-webextension/src/cta/Refund/views.tsx
index accdab0c3..b6638cf8b 100644
--- a/packages/taler-wallet-webextension/src/cta/Refund/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Refund/views.tsx
@@ -104,11 +104,11 @@ export function ReadyView(state: State.Ready): VNode {
kind="positive"
/> */}
</section>
- {state.products && state.products.length ? (
+ {/* {state.products && state.products.length ? (
<section>
<ProductList products={state.products} />
</section>
- ) : undefined}
+ ) : undefined} */}
<section>
<Button
variant="contained"
diff --git
a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
index 3ba3ac591..f1ae84ed3 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.stories.tsx
@@ -378,9 +378,9 @@ export const PaymentWithDeliveryDate =
tests.createExample(TestedComponent, {
amountRaw: "KUDOS:12",
info: {
...exampleData.payment.info,
- delivery_date: {
- t_s: new Date().getTime() / 1000,
- },
+ // delivery_date: {
+ // t_s: new Date().getTime() / 1000,
+ // },
},
},
});
@@ -391,12 +391,12 @@ export const PaymentWithDeliveryAddr =
tests.createExample(TestedComponent, {
amountRaw: "KUDOS:12",
info: {
...exampleData.payment.info,
- delivery_location: {
- country: "Argentina",
- street: "Elm Street",
- district: "CABA",
- post_code: "1101",
- },
+ // delivery_location: {
+ // country: "Argentina",
+ // street: "Elm Street",
+ // district: "CABA",
+ // post_code: "1101",
+ // },
},
},
});
@@ -407,15 +407,15 @@ export const PaymentWithDeliveryFull =
tests.createExample(TestedComponent, {
amountRaw: "KUDOS:12",
info: {
...exampleData.payment.info,
- delivery_date: {
- t_s: new Date().getTime() / 1000,
- },
- delivery_location: {
- country: "Argentina",
- street: "Elm Street",
- district: "CABA",
- post_code: "1101",
- },
+ // delivery_date: {
+ // t_s: new Date().getTime() / 1000,
+ // },
+ // delivery_location: {
+ // country: "Argentina",
+ // street: "Elm Street",
+ // district: "CABA",
+ // post_code: "1101",
+ // },
},
},
});
diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
index e54137016..018d3ccb4 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
@@ -237,8 +237,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(
@@ -464,7 +464,7 @@ export function TransactionView({
{/**FIXME: DD37 check if this holds */}
{transaction.txState.major !==
- TransactionMajorState.Pending ? undefined : transaction
+ TransactionMajorState.Pending ? undefined : transaction
.withdrawalDetails.type === WithdrawalType.ManualTransfer ? (
//manual withdrawal
<BankDetailsByPaytoType
@@ -1475,10 +1475,10 @@ export function PurchaseDetails({
const total = Amounts.add(price.value, price.fee).amount;
- const hasProducts = info.products && info.products.length > 0;
+ // const hasProducts = info.products && info.products.length > 0;
- const hasShipping =
- info.delivery_date !== undefined || info.delivery_location !== undefined;
+ // const hasShipping =
+ // info.delivery_date !== undefined || info.delivery_location !==
undefined;
const showLargePic = (): void => {
return;
@@ -1558,7 +1558,7 @@ export function PurchaseDetails({
</tr>
</Fragment>
)}
- {hasProducts && (
+ {/* {hasProducts && (
<tr>
<td colSpan={2}>
<PartCollapsible
@@ -1586,8 +1586,8 @@ export function PurchaseDetails({
/>
</td>
</tr>
- )}
- {hasShipping && (
+ )} */}
+ {/* {hasShipping && (
<tr>
<td colSpan={2}>
<PartCollapsible
@@ -1602,7 +1602,7 @@ export function PurchaseDetails({
/>
</td>
</tr>
- )}
+ )} */}
<tr>
<td>
<ShowFullContractTermPopup proposalId={proposalId} />
@@ -2008,7 +2008,7 @@ function ShowWithdrawalDetailForBankIntegrated({
/>
)}
{!transaction.withdrawalDetails.confirmed &&
- transaction.withdrawalDetails.bankConfirmationUrl ? (
+ transaction.withdrawalDetails.bankConfirmationUrl ? (
<InfoBox>
<div style={{ display: "block" }}>
<i18n.Translate>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.