Merge branch 'master' into age-withdraw

3 files changed, 9 insertions, 9 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/components/TermsOfService/views.tsx b/packages/taler-wallet-webextension/src/components/TermsOfService/views.tsx
index 214c4d792..f6c176550 100644
--- a/packages/taler-wallet-webextension/src/components/TermsOfService/views.tsx
+++ b/packages/taler-wallet-webextension/src/components/TermsOfService/views.tsx
@@ -99,7 +99,7 @@ export function ShowButtonsNonAcceptedTosView({
           </WarningText>
         </section>
       )} */}
-      {terms.status === ExchangeTosStatus.Pending && (
+      {terms.status === ExchangeTosStatus.Accepted && (
         <section style={{ justifyContent: "space-around", display: "flex" }}>
           <Button
             variant="contained"
@@ -181,7 +181,7 @@ export function ShowTosContentView({
           </LinkSuccess>
         </section>
       )}
-      {termsAccepted && terms.status !== ExchangeTosStatus.Proposed && (
+      {termsAccepted && terms.status !== ExchangeTosStatus.Accepted && (
         <section style={{ justifyContent: "space-around", display: "flex" }}>
           <CheckboxOutlined
             name="terms"