feat: add time expiration unlock condition for l1-l2 txs (#7719)

* feat: add time expiration unlock condition for l1-l2 txs * enhancement: improve code readability
iotaledger · Nov 16, 2023 · 9528333 · 9528333
1 parent 1ac4367
commit 9528333
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
@@ -65,8 +65,9 @@
         transactionDetails.type === NewTransactionType.TokenTransfer &&
         transactionDetails.asset?.metadata?.standard === TokenStandard.BaseToken
     $: isInternal = recipient.type === 'account'
+    $: isLayer2Transaction = !!layer2Parameters
     $: isTransferring = $selectedAccount.isTransferring
-    $: hideGiftToggle = isBaseTokenTransfer || !!layer2Parameters || (disableToggleGift && !giftStorageDeposit)
+    $: hideGiftToggle = isBaseTokenTransfer || isLayer2Transaction || (disableToggleGift && !giftStorageDeposit)
 
     $: if (!isSendAndClosePopup) expirationDate, giftStorageDeposit, void rebuildTransactionOutput()
 
@@ -84,7 +85,12 @@
 
         if (isSendAndClosePopup) {
             // Needed after 'return from stronghold' to SHOW to correct expiration date before output is sent
-            initialExpirationDate = getInitialExpirationDate(expirationDate, storageDeposit, giftStorageDeposit)
+            initialExpirationDate = getInitialExpirationDate(
+                expirationDate,
+                storageDeposit,
+                giftStorageDeposit,
+                isLayer2Transaction
+            )
 
             try {
                 await _onMount()
@@ -111,7 +117,12 @@
             // as it updates expiration date through the ExpirationTimePicker bind
             // Could be avoided with a rework of ExpirationTimePicker
             if (transactionDetails.expirationDate === undefined) {
-                initialExpirationDate = getInitialExpirationDate(expirationDate, storageDeposit, giftStorageDeposit)
+                initialExpirationDate = getInitialExpirationDate(
+                    expirationDate,
+                    storageDeposit,
+                    giftStorageDeposit,
+                    isLayer2Transaction
+                )
             }
         } catch (err) {
             handleError(err)

diff --git a/packages/shared/lib/core/wallet/utils/send/sendUtils.ts b/packages/shared/lib/core/wallet/utils/send/sendUtils.ts
@@ -25,11 +25,12 @@ export enum OptionalInputType {
 export function getInitialExpirationDate(
     expirationDate: Date,
     storageDeposit: number,
-    giftStorageDeposit: boolean
+    giftStorageDeposit: boolean,
+    isLayer2: boolean
 ): TimePeriod {
     if (expirationDate) {
         return TimePeriod.Custom
-    } else if (storageDeposit && !giftStorageDeposit) {
+    } else if ((storageDeposit && !giftStorageDeposit) || isLayer2) {
         return TimePeriod.OneDay
     } else {
         return TimePeriod.None