Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: ts migration for self-exclusion-footer.js #69

Merged
merged 3 commits into from
Jan 4, 2023
Merged

refactor: ts migration for self-exclusion-footer.js #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6375816
refactor: ts migration for self-exclusion-footer.js
suisin-deriv Dec 22, 2022
1c74027
Merge branch 'shayan/82304/components-shared-ts-migration-parent-2' o…
suisin-deriv Jan 3, 2023
42ce301
refactor: fix ts error
suisin-deriv Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...n/__tests__/self-exclusion-footer.spec.js → .../__tests__/self-exclusion-footer.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Formik } from 'formik';
import { Formik, FormikValues } from 'formik';
import * as formik from 'formik';
import { fireEvent, render, screen } from '@testing-library/react';
import SelfExclusionContext from '../self-exclusion-context';
Expand All @@ -8,7 +8,7 @@ import SelfExclusionFooter from '../self-exclusion-footer';
const portal_root = document.createElement('div');
document.body.appendChild(portal_root);

const mockUseFormikContext = jest.spyOn(formik, 'useFormikContext');
const mockUseFormikContext = jest.spyOn(formik, 'useFormikContext') as any;

describe('<SelfExclusionFooter />', () => {
let mock_context = {};
Expand All @@ -26,7 +26,7 @@ describe('<SelfExclusionFooter />', () => {
});
});
it('should not render SelfExclusionFooter component', () => {
mock_context.footer_ref = null;
(mock_context as FormikValues).footer_ref = null;

render(
<SelfExclusionContext.Provider value={mock_context}>
Expand All @@ -39,7 +39,7 @@ describe('<SelfExclusionFooter />', () => {

it('should render SelfExclusionFooter component', () => {
render(
<Formik>
<Formik initialValues={{}} onSubmit={jest.fn()}>
<SelfExclusionContext.Provider value={mock_context}>
<SelfExclusionFooter />
</SelfExclusionContext.Provider>
Expand All @@ -50,10 +50,10 @@ describe('<SelfExclusionFooter />', () => {
});

it('Should trigger click on the button', () => {
const mockGoToConfirm = mock_context.goToConfirm;
const mockGoToConfirm = (mock_context as FormikValues).goToConfirm;

render(
<Formik>
<Formik initialValues={{}} onSubmit={jest.fn()}>
<SelfExclusionContext.Provider value={mock_context}>
<SelfExclusionFooter />
</SelfExclusionContext.Provider>
Expand Down
2 changes: 1 addition & 1 deletion packages/account/src/Components/self-exclusion/self-exclusion-context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react';

type TSelfExclusionContext = {
footer_ref?: React.RefObject<HTMLElement>;
goToConfirm?: () => void;
goToConfirm?: (values: unknown) => void;
toggleArticle?: () => void;
is_app_settings?: boolean;
is_wrapper_bypassed?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion .../self-exclusion/self-exclusion-footer.jsx → .../self-exclusion/self-exclusion-footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const SelfExclusionFooter = () => {
primary
className='da-self-exclusion__button'
large
onClick={() => goToConfirm(values)}
onClick={() => goToConfirm?.(values)}
type='button'
>
<Localize i18n_default_text='Next' />
Expand Down
2 changes: 1 addition & 1 deletion packages/account/src/Components/self-exclusion/self-exclusion-inputs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getBrandWebsiteName, epochToMoment, toMoment, PlatformContext, isMobile
import { Localize, localize } from '@deriv/translations';
import { Field, useFormikContext } from 'formik';
import SelfExclusionContext from './self-exclusion-context';
import SelfExclusionFooter from './self-exclusion-footer.jsx';
import SelfExclusionFooter from './self-exclusion-footer';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we should also add types for all context variables in self-exclusion-footer.tsx

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes.there are some ts errors in the file.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done Updating the codes 🙏


const SectionTitle = ({ title, has_border_line }) => {
return (
Expand Down