prevent unmounting the portfolio component when redirecting to report…

…s packge
deriv-com · Jul 5, 2022 · bdc145e · bdc145e
1 parent c9a2c1d
commit bdc145e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/packages/core/src/Stores/portfolio-store.js b/packages/core/src/Stores/portfolio-store.js
@@ -452,10 +452,13 @@ export default class PortfolioStore extends BaseStore {
 
     @action.bound
     onUnmount() {
-        this.disposePreSwitchAccount();
-        this.disposeSwitchAccount();
-        this.disposeLogout();
-        this.clearTable();
+        const is_reports_path = /^\/reports/.test(window.location.pathname);
+        if (!is_reports_path) {
+            this.clearTable();
+            this.disposePreSwitchAccount();
+            this.disposeSwitchAccount();
+            this.disposeLogout();
+        }
     }
 
     getPositionIndexById(contract_id) {

diff --git a/packages/core/src/Stores/ui-store.js b/packages/core/src/Stores/ui-store.js
@@ -16,9 +16,6 @@ export default class UIStore extends BaseStore {
     // Take profit, Stop loss & Deal cancellation checkbox
     @observable should_show_cancellation_warning = true;
 
-    // Check previous url to don't unmount portfolio when navigate from reports to trader
-    @observable is_reports_url = false;
-
     // Extensions
     @observable footer_extensions = [];
     @observable header_extension = undefined;
@@ -196,11 +193,6 @@ export default class UIStore extends BaseStore {
         }
     };
 
-    @action.bound
-    setIsReportsUrl(is_reports_url) {
-        this.is_reports_url = is_reports_url;
-    }
-
     @action.bound
     init(notification_messages) {
         this.notification_messages_ui = notification_messages;

diff --git a/packages/reports/src/Containers/reports.jsx b/packages/reports/src/Containers/reports.jsx
@@ -29,11 +29,9 @@ const Reports = ({
     setVisibilityRealityCheck,
     tab_index,
     toggleReports,
-    setIsReportsUrl,
 }) => {
     React.useEffect(() => {
         toggleReports(true);
-        setIsReportsUrl(true);
         return () => {
             setVisibilityRealityCheck(1);
             toggleReports(false);
@@ -132,5 +130,4 @@ export default connect(({ client, common, ui }) => ({
     setTabIndex: ui.setReportsTabIndex,
     tab_index: ui.reports_route_tab_index,
     toggleReports: ui.toggleReports,
-    setIsReportsUrl: ui.setIsReportsUrl,
 }))(withRouter(Reports));
diff --git a/packages/trader/src/App/Containers/Routes/routes.jsx b/packages/trader/src/App/Containers/Routes/routes.jsx
@@ -46,8 +46,6 @@ const Routes = ({
     passthrough,
     setPromptHandler,
     setTradeMountingPolicy,
-    is_reports_url,
-    setIsReportsUrl,
 }) => {
     React.useEffect(() => {
         if (setPromptHandler) {
@@ -97,11 +95,7 @@ const Routes = ({
     }, []);
 
     React.useEffect(() => {
-        if (is_reports_url) {
-            setIsReportsUrl(false);
-            return;
-        }
-        onUnmountPortfolio();
+        return () => onUnmountPortfolio();
     }, [onUnmountPortfolio]);
 
     if (has_error) return <Error {...error} />;
@@ -131,7 +125,5 @@ export default withRouter(
         is_logging_in: client.is_logging_in,
         setPromptHandler: ui.setPromptHandler,
         setTradeMountingPolicy: modules.trade.setSkipPrePostLifecycle,
-        is_reports_url: ui.is_reports_url,
-        setIsReportsUrl: ui.setIsReportsUrl,
     }))(Routes)
 );