From b5d853f5e7e6153728d2d56c74e2dc0088cf76c9 Mon Sep 17 00:00:00 2001
From: Jim Daniels Wasswa <jim@deriv.com>
Date: Tue, 25 Oct 2022 15:41:22 +0800
Subject: [PATCH 1/3] refactor: remaining-time-component-ts-migration

---
 .../src/components/remaining-time/index.js    |  3 ---
 .../src/components/remaining-time/index.ts    |  3 +++
 ...{remaining-time.jsx => remaining-time.tsx} | 20 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 packages/components/src/components/remaining-time/index.js
 create mode 100644 packages/components/src/components/remaining-time/index.ts
 rename packages/components/src/components/remaining-time/{remaining-time.jsx => remaining-time.tsx} (64%)

diff --git a/packages/components/src/components/remaining-time/index.js b/packages/components/src/components/remaining-time/index.js
deleted file mode 100644
index 59af37cd427d..000000000000
--- a/packages/components/src/components/remaining-time/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import RemainingTime from './remaining-time.jsx';
-
-export default RemainingTime;
diff --git a/packages/components/src/components/remaining-time/index.ts b/packages/components/src/components/remaining-time/index.ts
new file mode 100644
index 000000000000..7e11567f505d
--- /dev/null
+++ b/packages/components/src/components/remaining-time/index.ts
@@ -0,0 +1,3 @@
+import RemainingTime from './remaining-time';
+
+export default RemainingTime;
diff --git a/packages/components/src/components/remaining-time/remaining-time.jsx b/packages/components/src/components/remaining-time/remaining-time.tsx
similarity index 64%
rename from packages/components/src/components/remaining-time/remaining-time.jsx
rename to packages/components/src/components/remaining-time/remaining-time.tsx
index 71598d4ebe7f..84e7f1d16cb7 100644
--- a/packages/components/src/components/remaining-time/remaining-time.jsx
+++ b/packages/components/src/components/remaining-time/remaining-time.tsx
@@ -1,9 +1,16 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import { formatDuration, getDiffDuration } from '@deriv/shared';
+import moment from 'moment';
 
-const RemainingTime = ({ end_time = null, format, getCardLabels, start_time }) => {
-    if (!+end_time || start_time.unix() > +end_time) {
+type TRemainingTimeProps = {
+    end_time?: number | null;
+    start_time: moment.Moment;
+    format: string;
+    getCardLabels: () => { [key: string]: string }; // TODO Use the one from common after contract-card migration
+};
+
+const RemainingTime = ({ end_time = null, format, getCardLabels, start_time }: TRemainingTimeProps) => {
+    if (!end_time || start_time.unix() > +end_time) {
         return '';
     }
 
@@ -17,11 +24,4 @@ const RemainingTime = ({ end_time = null, format, getCardLabels, start_time }) =
     return !is_zeroes && <div className='dc-remaining-time'>{remaining_time}</div>;
 };
 
-RemainingTime.propTypes = {
-    end_time: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-    start_time: PropTypes.object,
-    format: PropTypes.string,
-    getCardLabels: PropTypes.func,
-};
-
 export default RemainingTime;

From 77b991786635288cb9873ef3fda46edb1b90c2a4 Mon Sep 17 00:00:00 2001
From: Jim Daniels Wasswa <jim@deriv.com>
Date: Wed, 26 Oct 2022 11:22:04 +0800
Subject: [PATCH 2/3] chore: remove default null assignment

---
 .../components/src/components/remaining-time/remaining-time.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/components/remaining-time/remaining-time.tsx b/packages/components/src/components/remaining-time/remaining-time.tsx
index 84e7f1d16cb7..416cb92023e7 100644
--- a/packages/components/src/components/remaining-time/remaining-time.tsx
+++ b/packages/components/src/components/remaining-time/remaining-time.tsx
@@ -9,7 +9,7 @@ type TRemainingTimeProps = {
     getCardLabels: () => { [key: string]: string }; // TODO Use the one from common after contract-card migration
 };
 
-const RemainingTime = ({ end_time = null, format, getCardLabels, start_time }: TRemainingTimeProps) => {
+const RemainingTime = ({ end_time, format, getCardLabels, start_time }: TRemainingTimeProps) => {
     if (!end_time || start_time.unix() > +end_time) {
         return '';
     }

From d79ed540015be8b9a32981ac6d127dcd1eea57ca Mon Sep 17 00:00:00 2001
From: Jim Daniels Wasswa <jim@deriv.com>
Date: Wed, 26 Oct 2022 17:53:06 +0800
Subject: [PATCH 3/3] chore: remove union from end_time

---
 .../components/src/components/remaining-time/remaining-time.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/components/remaining-time/remaining-time.tsx b/packages/components/src/components/remaining-time/remaining-time.tsx
index 416cb92023e7..6e51e00b5181 100644
--- a/packages/components/src/components/remaining-time/remaining-time.tsx
+++ b/packages/components/src/components/remaining-time/remaining-time.tsx
@@ -3,7 +3,7 @@ import { formatDuration, getDiffDuration } from '@deriv/shared';
 import moment from 'moment';
 
 type TRemainingTimeProps = {
-    end_time?: number | null;
+    end_time?: number;
     start_time: moment.Moment;
     format: string;
     getCardLabels: () => { [key: string]: string }; // TODO Use the one from common after contract-card migration