Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@
let visibleSurplus: number | undefined = undefined
let isPreparingOutput = false
$: expirationTimePicker?.setNull(giftStorageDeposit)
$: expirationDate, giftStorageDeposit, void rebuildTransactionOutput()
$: isBaseTokenTransfer =
transactionDetails.type === NewTransactionType.TokenTransfer &&
Expand Down Expand Up @@ -116,7 +115,6 @@
const outputParams = await getOutputParameters(transactionDetails)
preparedOutput = await prepareOutput($selectedAccount.index, outputParams, getDefaultTransactionOptions())
await updateStorageDeposit()
// This potentially triggers a second 'prepareOutput',
// as it updates expiration date through the ExpirationTimePicker bind
// Could be avoided with a rework of ExpirationTimePicker
Expand Down Expand Up @@ -242,7 +240,6 @@
slot="value"
bind:this={expirationTimePicker}
bind:value={expirationDate}
initialSelected={initialExpirationDate}
disabled={disableChangeExpiration || isTransferring}
/>
</KeyValueBox>
Expand Down
17 changes: 2 additions & 15 deletions packages/shared/components/ExpirationTimePicker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,13 @@
import { showAppNotification } from '@auxiliary/notification'
export let value: Date | null = null
export let initialSelected: TimePeriod = TimePeriod.None
export let disabled: boolean = false
export function setNull(bool: boolean): void {
if (bool && value) {
storedValue = value
value = null
} else {
value = storedValue ?? value
}
}
let anchor: HTMLElement | undefined = undefined
let selectedTimePeriod: TimePeriod = initialSelected
let previouslySelectedPeriod: TimePeriod = selectedTimePeriod
let selectedTimePeriod: TimePeriod = TimePeriod.None
let dateTimeSelectorValue: Date | undefined
let showDateTimePickerModal: boolean = false
let expirationTimePickerModal: Modal
let storedValue: Date
$: selectedTimePeriod !== TimePeriod.Custom && (value = TIME_PERIOD_TO_DATE[selectedTimePeriod])
Expand Down Expand Up @@ -61,13 +49,12 @@
dateTimeSelectorValue = undefined
}
expirationTimePickerModal?.close()
previouslySelectedPeriod = selectedTimePeriod
selectedTimePeriod = _selected
}
function onCancelExpirationTimeClick(): void {
if (!dateTimeSelectorValue) {
selectedTimePeriod = previouslySelectedPeriod
selectedTimePeriod = TimePeriod.None
}
showDateTimePickerModal = false
}
Expand Down