From 1331e72f329a2281002fa7674b2968a88a75fde0 Mon Sep 17 00:00:00 2001
From: Jean Ribeiro <contact@jeanribeiro.dev>
Date: Wed, 30 Aug 2023 20:57:50 -0300
Subject: [PATCH 1/2] fix: expiration time picker

---
 .../dashboard/send-flow/views/components/DateTimePicker.svelte  | 2 +-
 .../send-flow/views/components/DateTimePickerMenu.svelte        | 1 -
 .../src/components/inputs/ExpirationDateTimePicker.svelte       | 2 +-
 .../src/components/modals/ExpirationTimePickerMenu.svelte       | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/desktop/views/dashboard/send-flow/views/components/DateTimePicker.svelte b/packages/desktop/views/dashboard/send-flow/views/components/DateTimePicker.svelte
index ebf506f1ac..bab1f532c3 100644
--- a/packages/desktop/views/dashboard/send-flow/views/components/DateTimePicker.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/components/DateTimePicker.svelte
@@ -30,5 +30,5 @@
     bind:value
     on:cancel={onCancelClick}
     on:confirm={onConfirmClick}
-    startTime={new Date()}
+    startDate={new Date()}
 />
diff --git a/packages/desktop/views/dashboard/send-flow/views/components/DateTimePickerMenu.svelte b/packages/desktop/views/dashboard/send-flow/views/components/DateTimePickerMenu.svelte
index c9e8e64920..ab2150eba8 100644
--- a/packages/desktop/views/dashboard/send-flow/views/components/DateTimePickerMenu.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/components/DateTimePickerMenu.svelte
@@ -132,7 +132,6 @@
 </Modal>
 {#if canShowDateTimePicker}
     <ExpirationDateTimePicker
-        position="top"
         {anchor}
         bind:value={customDate}
         on:cancel={onCancelExpirationTimeClick}
diff --git a/packages/shared/src/components/inputs/ExpirationDateTimePicker.svelte b/packages/shared/src/components/inputs/ExpirationDateTimePicker.svelte
index ebf506f1ac..bab1f532c3 100644
--- a/packages/shared/src/components/inputs/ExpirationDateTimePicker.svelte
+++ b/packages/shared/src/components/inputs/ExpirationDateTimePicker.svelte
@@ -30,5 +30,5 @@
     bind:value
     on:cancel={onCancelClick}
     on:confirm={onConfirmClick}
-    startTime={new Date()}
+    startDate={new Date()}
 />
diff --git a/packages/shared/src/components/modals/ExpirationTimePickerMenu.svelte b/packages/shared/src/components/modals/ExpirationTimePickerMenu.svelte
index 9bca6d5396..5ba0deaada 100644
--- a/packages/shared/src/components/modals/ExpirationTimePickerMenu.svelte
+++ b/packages/shared/src/components/modals/ExpirationTimePickerMenu.svelte
@@ -129,7 +129,6 @@
 </Modal>
 {#if canShowDateTimePicker}
     <ExpirationDateTimePicker
-        position="top"
         {anchor}
         bind:value={customDate}
         on:cancel={onCancelExpirationTimeClick}

From 6197c9194c47670447d566c8adb01e4fb3d72294 Mon Sep 17 00:00:00 2001
From: Jean Ribeiro <contact@jeanribeiro.dev>
Date: Wed, 30 Aug 2023 20:59:47 -0300
Subject: [PATCH 2/2] chore: removes unused DateTimePicker component

---
 .../views/components/DateTimePicker.svelte    | 34 -------------------
 .../send-flow/views/components/index.js       |  1 -
 2 files changed, 35 deletions(-)
 delete mode 100644 packages/desktop/views/dashboard/send-flow/views/components/DateTimePicker.svelte

diff --git a/packages/desktop/views/dashboard/send-flow/views/components/DateTimePicker.svelte b/packages/desktop/views/dashboard/send-flow/views/components/DateTimePicker.svelte
deleted file mode 100644
index bab1f532c3..0000000000
--- a/packages/desktop/views/dashboard/send-flow/views/components/DateTimePicker.svelte
+++ /dev/null
@@ -1,34 +0,0 @@
-<script lang="ts">
-    import { createEventDispatcher } from 'svelte'
-    import { DateTimePicker } from '@bloomwalletio/ui'
-    import { localize } from '@core/i18n'
-    import { isValidExpirationDateTime, MILLISECONDS_PER_SECOND, SECONDS_PER_MINUTE } from '@core/utils'
-    import { showNotification } from '@auxiliary/notification'
-
-    export let value: Date = new Date(Date.now() + 5 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
-
-    const dispatch = createEventDispatcher()
-
-    function onCancelClick(): void {
-        dispatch('cancel')
-    }
-
-    function onConfirmClick(): void {
-        if (isValidExpirationDateTime(value)) {
-            dispatch('confirm')
-        } else {
-            showNotification({
-                variant: 'warning',
-                text: localize('warning.transaction.invalidExpirationDateTime'),
-            })
-        }
-    }
-</script>
-
-<DateTimePicker
-    {...$$restProps}
-    bind:value
-    on:cancel={onCancelClick}
-    on:confirm={onConfirmClick}
-    startDate={new Date()}
-/>
diff --git a/packages/desktop/views/dashboard/send-flow/views/components/index.js b/packages/desktop/views/dashboard/send-flow/views/components/index.js
index 2694432fab..b620a04891 100644
--- a/packages/desktop/views/dashboard/send-flow/views/components/index.js
+++ b/packages/desktop/views/dashboard/send-flow/views/components/index.js
@@ -1,4 +1,3 @@
-export { default as DateTimePicker } from './DateTimePicker.svelte'
 export { default as DateTimePickerButton } from './DateTimePickerButton.svelte'
 export { default as DateTimePickerMenu } from './DateTimePickerMenu.svelte'
 export { default as EvmTransactionDetails } from './EvmTransactionDetails.svelte'