[taler-wallet-core] branch master updated: validate that default pay deadline is not greater than wire transfer deadline

[gnunet]

This is an automated email from the git hooks/post-receive script.

sebasjm pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new 39897b0c2 validate that default pay deadline is not greater than wire 
transfer deadline
39897b0c2 is described below

commit 39897b0c24eec28e86235351b451ca8f9e26e8c7
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Tue Nov 21 01:00:04 2023 -0300

    validate that default pay deadline is not greater than wire transfer 
deadline
---
 .../merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx    | 6 +++++-
 .../merchant-backoffice-ui/src/paths/instance/update/UpdatePage.tsx | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx 
b/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx
index a8108251d..e5072a2b8 100644
--- a/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx
@@ -85,7 +85,11 @@ export function CreatePage({ onCreate, onBack, forceId }: 
Props): VNode {
     //     ),
     default_pay_delay: !value.default_pay_delay
       ? i18n.str`required`
-      : undefined,
+      : !!value.default_wire_transfer_delay &&
+        value.default_wire_transfer_delay.d_us !== "forever" &&
+        value.default_pay_delay.d_us !== "forever" &&
+        value.default_pay_delay.d_us > value.default_wire_transfer_delay.d_us ?
+        i18n.str`pay delay can't be greater than wire transfer delay` : 
undefined,
     default_wire_transfer_delay: !value.default_wire_transfer_delay
       ? i18n.str`required`
       : undefined,
diff --git 
a/packages/merchant-backoffice-ui/src/paths/instance/update/UpdatePage.tsx 
b/packages/merchant-backoffice-ui/src/paths/instance/update/UpdatePage.tsx
index 01a3d0252..3dc1f8d07 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/update/UpdatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/update/UpdatePage.tsx
@@ -107,7 +107,11 @@ export function UpdatePage({
         : undefined,
     default_pay_delay: !value.default_pay_delay
       ? i18n.str`required`
-      : undefined,
+      : !!value.default_wire_transfer_delay &&
+        value.default_wire_transfer_delay.d_us !== "forever" &&
+        value.default_pay_delay.d_us !== "forever" &&
+        value.default_pay_delay.d_us > value.default_wire_transfer_delay.d_us ?
+        i18n.str`pay delay can't be greater than wire transfer delay` : 
undefined,
     default_wire_transfer_delay: !value.default_wire_transfer_delay
       ? i18n.str`required`
       : undefined,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.