Merge pull request #102 from yauheni-deriv/evgeniy/88400/account_clos…

…ed_ts_migration

evgeniy/ 88400/ account_closed ts migration

packages/account/package.json

@@ -31,6 +31,7 @@
         "@deriv/api-types": "^1.0.11",
         "@deriv/components": "^1.0.0",
         "@deriv/shared": "^1.0.0",
+        "@deriv/stores": "^1.0.0",
         "@deriv/translations": "^1.0.0",
         "bowser": "^2.9.0",
         "classnames": "^2.2.6",

packages/account/src/Sections/Security/AccountClosed/account-closed.jsx → packages/account/src/Sections/Security/AccountClosed/account-closed.tsx

@@ -1,22 +1,20 @@
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import { Modal, Text } from '@deriv/components';
+import { routes, getStaticUrl, PlatformContext } from '@deriv/shared';
 import { Localize } from '@deriv/translations';
-import { getStaticUrl, PlatformContext } from '@deriv/shared';
 import { connect } from 'Stores/connect';
+import type { TRootStore } from '@deriv/stores/types';
 
-const AccountClosed = ({ logout }) => {
+type TAccountClosed = {
+    logout: () => void;
+};
+
+const AccountClosed = ({ logout }: TAccountClosed) => {
     const [is_modal_open, setModalState] = React.useState(true);
     const [timer, setTimer] = React.useState(10);
     const { is_appstore } = React.useContext(PlatformContext);
-
-    React.useEffect(() => {
-        window.history.pushState(null, null, '/');
-        logout();
-        const handleInterval = setInterval(() => counter(), 1000);
-        return () => {
-            if (handleInterval) clearInterval(handleInterval);
-        };
-    }, [timer, is_modal_open, logout, counter]);
+    const history = useHistory();
 
     const counter = React.useCallback(() => {
         if (timer > 0) {
@@ -26,6 +24,15 @@ const AccountClosed = ({ logout }) => {
         }
     }, [is_appstore, timer]);
 
+    React.useEffect(() => {
+        history.push(routes.root);
+        logout();
+        const handleInterval = setInterval(() => counter(), 1000);
+        return () => {
+            if (handleInterval) clearInterval(handleInterval);
+        };
+    }, [timer, is_modal_open, logout, counter]);
+
     return (
         <Modal
             is_open={is_modal_open}
@@ -40,6 +47,6 @@ const AccountClosed = ({ logout }) => {
     );
 };
 
-export default connect(({ client }) => ({
+export default connect(({ client }: TRootStore) => ({
     logout: client.logout,
 }))(AccountClosed);

packages/account/src/Sections/Security/AccountClosed/index.ts

@@ -0,0 +1,3 @@
+import AccountClosed from './account-closed';
+
+export default AccountClosed;