From 1d3838d7085e1c3a101c3bdcf5170c2d682c2cb8 Mon Sep 17 00:00:00 2001 From: tay suisin Date: Wed, 16 Nov 2022 11:59:38 +0800 Subject: [PATCH 1/2] refactor: ts migration for idv-verified --- packages/account/globals.d.ts | 4 ++++ .../{idv-verified.spec.js => idv-verified.spec.tsx} | 5 +---- .../idv-verified/{idv-verified.jsx => idv-verified.tsx} | 7 ++++++- .../src/Components/poi/idv-status/idv-verified/index.js | 2 +- packages/account/tsconfig.json | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 packages/account/globals.d.ts rename packages/account/src/Components/poi/idv-status/idv-verified/__tests__/{idv-verified.spec.js => idv-verified.spec.tsx} (93%) rename packages/account/src/Components/poi/idv-status/idv-verified/{idv-verified.jsx => idv-verified.tsx} (88%) diff --git a/packages/account/globals.d.ts b/packages/account/globals.d.ts new file mode 100644 index 000000000000..60bd434c6f91 --- /dev/null +++ b/packages/account/globals.d.ts @@ -0,0 +1,4 @@ +declare module '*.svg' { + const content: any; + export default content; +} diff --git a/packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.js b/packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.tsx similarity index 93% rename from packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.js rename to packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.tsx index 3dd7e92c5003..174f7cfa8a39 100644 --- a/packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.js +++ b/packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.tsx @@ -31,10 +31,7 @@ describe('', () => { expect(screen.getByText(submit_text)).toBeInTheDocument(); expect(history.location.pathname).not.toBe('/account/proof-of-address'); fireEvent.click(screen.getByText(submit_text)); - expect(screen.getByRole('link', { name: submit_text }).closest('a')).toHaveAttribute( - 'href', - '/account/proof-of-address' - ); + expect(screen.getByRole('link', { name: submit_text })).toHaveAttribute('href', '/account/proof-of-address'); expect(history.location.pathname).toBe('/account/proof-of-address'); }); diff --git a/packages/account/src/Components/poi/idv-status/idv-verified/idv-verified.jsx b/packages/account/src/Components/poi/idv-status/idv-verified/idv-verified.tsx similarity index 88% rename from packages/account/src/Components/poi/idv-status/idv-verified/idv-verified.jsx rename to packages/account/src/Components/poi/idv-status/idv-verified/idv-verified.tsx index 3d2ada53fbac..6a29cb45b6d3 100644 --- a/packages/account/src/Components/poi/idv-status/idv-verified/idv-verified.jsx +++ b/packages/account/src/Components/poi/idv-status/idv-verified/idv-verified.tsx @@ -5,7 +5,12 @@ import { localize } from '@deriv/translations'; import PoaButton from 'Components/poa/poa-button'; import IdvDocumentVerified from 'Assets/ic-idv-verified.svg'; -const IdvVerified = ({ needs_poa, is_from_external }) => { +type TIdvVerified = { + needs_poa: boolean; + is_from_external: boolean; +}; + +const IdvVerified = ({ needs_poa, is_from_external }: Partial) => { const header_Text = needs_poa ? localize('Your ID is verified. You will also need to submit proof of your address.') : localize('ID verification passed'); diff --git a/packages/account/src/Components/poi/idv-status/idv-verified/index.js b/packages/account/src/Components/poi/idv-status/idv-verified/index.js index 41a6578c9dfb..d8ec153260d8 100644 --- a/packages/account/src/Components/poi/idv-status/idv-verified/index.js +++ b/packages/account/src/Components/poi/idv-status/idv-verified/index.js @@ -1,3 +1,3 @@ -import IdvVerified from './idv-verified.jsx'; +import IdvVerified from './idv-verified'; export default IdvVerified; diff --git a/packages/account/tsconfig.json b/packages/account/tsconfig.json index 1a92d82ee4aa..bb5714f527c9 100644 --- a/packages/account/tsconfig.json +++ b/packages/account/tsconfig.json @@ -4,6 +4,7 @@ "outDir": "./dist", "baseUrl": "./", "paths": { + "Assets/*": ["src/Assets/*"], "Components/*": ["src/Components/*"], "Containers/*": ["src/Containers/*"], "Constants/*": ["src/Constants/*"], From 4cf9e85b856cb53391ee4016ecc57acfd93db9d9 Mon Sep 17 00:00:00 2001 From: tay suisin Date: Wed, 16 Nov 2022 12:07:01 +0800 Subject: [PATCH 2/2] refactor: ts migration for idv-verified.spec.tsx --- .../poi/idv-status/idv-verified/__tests__/idv-verified.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.tsx b/packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.tsx index 174f7cfa8a39..fe61dca8ee94 100644 --- a/packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.tsx +++ b/packages/account/src/Components/poi/idv-status/idv-verified/__tests__/idv-verified.spec.tsx @@ -36,7 +36,7 @@ describe('', () => { }); it('should render the IdvVerified component when needs_poa is false and is_from_external is true in mobile', () => { - isMobile.mockReturnValue(true); + (isMobile as jest.Mock).mockReturnValue(true); renderWithRouter(); expect(screen.getByTestId('poi_idv_verified_container')).toBeInTheDocument(); expect(screen.getByText(/mockedsvgicon/i)).toBeInTheDocument();