From 9733cec831ad7fdaa493935f1c6e769d58af1cdd Mon Sep 17 00:00:00 2001
From: mitra-fs <mitra@firstsource.tech>
Date: Mon, 3 Jan 2022 12:57:38 +0330
Subject: [PATCH 1/2] Convert Terms & Conditions page to TS

---
 .../{_business-grid.js => _business-grid.tsx} | 17 +++++++-------
 .../{_clients-grid.js => _clients-grid.tsx}   | 23 +++++++++++--------
 ...ns-style.js => _terms-conditions-style.ts} |  0
 .../{index.js => index.tsx}                   |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)
 rename src/pages/terms-and-conditions/{_business-grid.js => _business-grid.tsx} (91%)
 rename src/pages/terms-and-conditions/{_clients-grid.js => _clients-grid.tsx} (94%)
 rename src/pages/terms-and-conditions/{_terms-conditions-style.js => _terms-conditions-style.ts} (100%)
 rename src/pages/terms-and-conditions/{index.js => index.tsx} (97%)

diff --git a/src/pages/terms-and-conditions/_business-grid.js b/src/pages/terms-and-conditions/_business-grid.tsx
similarity index 91%
rename from src/pages/terms-and-conditions/_business-grid.js
rename to src/pages/terms-and-conditions/_business-grid.tsx
index 7bc6ee0e755..af389a02a7a 100644
--- a/src/pages/terms-and-conditions/_business-grid.js
+++ b/src/pages/terms-and-conditions/_business-grid.tsx
@@ -1,5 +1,4 @@
 import React from 'react'
-import PropTypes from 'prop-types'
 import { StyledGrid, StyledContainer, IconWrapper, GridCol, Cta } from './_terms-conditions-style'
 import { Header, Text } from 'components/elements'
 import { localize } from 'components/localization'
@@ -10,7 +9,14 @@ import PA from 'images/svg/terms/business-pa-tc.svg'
 import API from 'images/svg/terms/business-api-tc.svg'
 import PDF from 'images/svg/regulatory/pdf-icon-black.svg'
 
-const Col = ({ Icon, content, link_title, title, url }) => (
+type ColProps = {
+    Icon: string
+    content: string
+    title: string
+    link_title: string
+    url: string
+}
+const Col = ({ Icon, content, link_title, title, url }: ColProps) => (
     <GridCol>
         <IconWrapper>
             <img src={Icon} />
@@ -27,13 +33,6 @@ const Col = ({ Icon, content, link_title, title, url }) => (
         </Cta>
     </GridCol>
 )
-Col.propTypes = {
-    content: PropTypes.string,
-    Icon: PropTypes.elementType,
-    link_title: PropTypes.string,
-    title: PropTypes.string,
-    url: PropTypes.string,
-}
 
 const IconGrid = () => (
     <StyledContainer>
diff --git a/src/pages/terms-and-conditions/_clients-grid.js b/src/pages/terms-and-conditions/_clients-grid.tsx
similarity index 94%
rename from src/pages/terms-and-conditions/_clients-grid.js
rename to src/pages/terms-and-conditions/_clients-grid.tsx
index f54a8c6dd4f..15f6969e3e9 100644
--- a/src/pages/terms-and-conditions/_clients-grid.js
+++ b/src/pages/terms-and-conditions/_clients-grid.tsx
@@ -1,5 +1,4 @@
 import React from 'react'
-import PropTypes from 'prop-types'
 import { StyledGrid, StyledContainer, IconWrapper, GridCol, Cta } from './_terms-conditions-style'
 import { Show } from 'components/containers'
 import { Header, Text } from 'components/elements'
@@ -13,7 +12,20 @@ import Risk from 'images/svg/terms/risk-tc.svg'
 import PDF from 'images/svg/regulatory/pdf-icon-black.svg'
 import BFX from 'images/svg/terms/bfx-tc.svg'
 
-const Col = ({ Icon, content, title, eu_links, non_eu_links }) => (
+type ColProps = {
+    Icon: string
+    content: string
+    title: string
+    non_eu_links: Link[]
+    eu_links?: Link[]
+}
+
+type Link = {
+    url: string
+    title: string
+}
+
+const Col = ({ Icon, content, title, eu_links, non_eu_links }: ColProps) => (
     <GridCol>
         <IconWrapper>
             <img src={Icon} />
@@ -44,13 +56,6 @@ const Col = ({ Icon, content, title, eu_links, non_eu_links }) => (
         </Show.Eu>
     </GridCol>
 )
-Col.propTypes = {
-    content: PropTypes.string,
-    eu_links: PropTypes.array,
-    Icon: PropTypes.elementType,
-    non_eu_links: PropTypes.array,
-    title: PropTypes.string,
-}
 
 const IconGrid = () => {
     const columns = [
diff --git a/src/pages/terms-and-conditions/_terms-conditions-style.js b/src/pages/terms-and-conditions/_terms-conditions-style.ts
similarity index 100%
rename from src/pages/terms-and-conditions/_terms-conditions-style.js
rename to src/pages/terms-and-conditions/_terms-conditions-style.ts
diff --git a/src/pages/terms-and-conditions/index.js b/src/pages/terms-and-conditions/index.tsx
similarity index 97%
rename from src/pages/terms-and-conditions/index.js
rename to src/pages/terms-and-conditions/index.tsx
index 602f4230f25..bc35ddbf9e7 100644
--- a/src/pages/terms-and-conditions/index.js
+++ b/src/pages/terms-and-conditions/index.tsx
@@ -8,7 +8,7 @@ import { Header, Tabs } from 'components/elements'
 import { localize, WithIntl } from 'components/localization'
 
 const Section = styled(SectionContainer)`
-    background-color: ${(props) => props.bgcolor || 'transparent'};
+    background-color: ${(props) => props.bgColor || 'transparent'};
 `
 
 const TermsAndConditions = () => {

From d466ac306645b8ef4109b0e8f11135a893c50435 Mon Sep 17 00:00:00 2001
From: mitra-fs <mitra@firstsource.tech>
Date: Mon, 3 Jan 2022 13:13:18 +0330
Subject: [PATCH 2/2] Adding space

---
 src/pages/terms-and-conditions/_business-grid.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/terms-and-conditions/_business-grid.tsx b/src/pages/terms-and-conditions/_business-grid.tsx
index af389a02a7a..17500d0c47a 100644
--- a/src/pages/terms-and-conditions/_business-grid.tsx
+++ b/src/pages/terms-and-conditions/_business-grid.tsx
@@ -16,6 +16,7 @@ type ColProps = {
     link_title: string
     url: string
 }
+
 const Col = ({ Icon, content, link_title, title, url }: ColProps) => (
     <GridCol>
         <IconWrapper>