From 14b068771cd4bcb72c43d28f14a625f937740199 Mon Sep 17 00:00:00 2001
From: Moe <moe@chocola.dev>
Date: Sun, 22 May 2022 22:04:58 +0700
Subject: [PATCH] Fix menu with auth

---
 lib/components/menu.dart | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/components/menu.dart b/lib/components/menu.dart
index e9c31dc..aa64d46 100644
--- a/lib/components/menu.dart
+++ b/lib/components/menu.dart
@@ -62,11 +62,13 @@ class _MenuState extends State<Menu> {
       var oldSelectedIndex = _selectedIndex;
       _selectedIndex = index;
       if (index == 0) {
+        _selectedWidget = const Sessions();
         checkSessionExist().then((isLoggedIn) {
-          if (isLoggedIn) {
-            _selectedWidget = const Sessions();
-          } else {
+          if (!isLoggedIn) {
             _selectedIndex = oldSelectedIndex;
+            Navigator.of(context).pushReplacement(MaterialPageRoute(
+              builder: (context) => const Menu(initialScreen: 2))
+            );
             Navigator.pushNamed(context, '/login');
           }
         });
@@ -80,11 +82,13 @@ class _MenuState extends State<Menu> {
         html.window.history.pushState(null, '', '/#/cart');
         _selectedWidget = const Cart();
       } else if (index == 4) {
+        _selectedWidget = const Transactions();
         checkSessionExist().then((isLoggedIn) {
-          if (isLoggedIn) {
-            _selectedWidget = const Transactions();
-          } else {
+          if (!isLoggedIn) {
             _selectedIndex = oldSelectedIndex;
+            Navigator.of(context).pushReplacement(MaterialPageRoute(
+              builder: (context) => const Menu(initialScreen: 2))
+            );
             Navigator.pushNamed(context, '/login');
           }
         });