Merge pull request #2250 from daostack/dev

Revert sidenav to actual version
daostack · Oct 26, 2023 · 789d328 · 789d328
2 parents d96f3a6 + a724ca1
commit 789d328
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/pages/App/handlers/WebViewLoginHandler/WebViewLoginHandler.tsx b/src/pages/App/handlers/WebViewLoginHandler/WebViewLoginHandler.tsx
@@ -4,7 +4,7 @@ import { webviewLogin } from "@/pages/Auth/store/actions";
 import { history } from "@/shared/appConfig";
 import { WebviewActions } from "@/shared/constants";
 import { FirebaseCredentials } from "@/shared/interfaces/FirebaseCredentials";
-import { getInboxPagePath } from "@/shared/utils";
+import { getInboxPagePath_v04 } from "@/shared/utils";
 import { parseJson } from "@/shared/utils/json";
 
 const WebViewLoginHandler: FC = () => {
@@ -25,7 +25,7 @@ const WebViewLoginHandler: FC = () => {
               window.ReactNativeWebView.postMessage(
                 WebviewActions.loginSuccess,
               );
-              history.push(getInboxPagePath());
+              history.push(getInboxPagePath_v04());
             } else {
               window.ReactNativeWebView.postMessage(WebviewActions.loginError);
             }

diff --git a/src/shared/layouts/MultipleSpacesLayout/MultipleSpacesLayout.tsx b/src/shared/layouts/MultipleSpacesLayout/MultipleSpacesLayout.tsx
@@ -17,8 +17,7 @@ import {
   selectMultipleSpacesLayoutBackUrl,
 } from "@/store/states";
 import { getSidenavLeft } from "../CommonSidenavLayout/utils";
-import { Header, /* SidenavContent */ } from "./components";
-import { SidenavContent as SidenavContentV04 } from "../CommonSidenavLayout/components";
+import { Header, SidenavContent } from "./components";
 import styles from "./MultipleSpacesLayout.module.scss";
 
 const MULTIPLE_SPACES_LAYOUT_SIDENAV_OPEN_STATE = "open";
@@ -109,9 +108,9 @@ const MultipleSpacesLayout: FC = (props) => {
           shouldCheckViewportForOpenState={false}
           withAnimation
         >
-          <SidenavContentV04
+          <SidenavContent
             className={styles.sidenavContent}
-            // onClose={handleSidenavClose}
+            onClose={handleSidenavClose}
           />
         </Sidenav>
         <main className={styles.main}>