diff --git a/package.json b/package.json index f8491f7f..8ad9e663 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "2.0.3-2", "private": true, "scripts": { - "android": "react-native run-android --variant=debug --appIdSuffix=debug", + "android": "react-native run-android --mode=beta --appIdSuffix=beta", "check-types": "tsc --noEmit", "format:check": "yarn prettier --check", "format": "yarn prettier --write", @@ -61,6 +61,7 @@ "react-native-safe-area-context": "^4.4.1", "react-native-screens": "^3.29.0", "react-native-svg": "^13.6.0", + "react-native-system-navigation-bar": "^2.6.4", "react-native-url-polyfill": "^1.3.0", "react-native-vision-camera": "^4.5.0", "styled-components": "^5.3.11" diff --git a/src/App.tsx b/src/App.tsx index 7cabb9b3..0e458dd7 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,6 +2,7 @@ import React, { useEffect } from 'react'; import { LogBox, StatusBar } from 'react-native'; import { getLocales } from 'react-native-localize'; import { SafeAreaProvider } from 'react-native-safe-area-context'; +import SystemNavigationBar from 'react-native-system-navigation-bar'; import { useFlipper } from '@react-navigation/devtools'; import { NavigationContainer, useNavigationContainerRef } from '@react-navigation/native'; import { ThemeProvider } from 'styled-components/native'; @@ -25,6 +26,7 @@ const App = () => { useEffect(() => { storage.set(StorageKey.Language, getLocales()[0].languageCode); + SystemNavigationBar.setNavigationColor(theme.palette.neutral['0']); }, []); return ( diff --git a/src/_context/AuthenticationContext.tsx b/src/_context/AuthenticationContext.tsx index d9d873ad..66435e41 100644 --- a/src/_context/AuthenticationContext.tsx +++ b/src/_context/AuthenticationContext.tsx @@ -48,6 +48,7 @@ const AuthenticationProvider: FC = ({ children }) => { try { await client.credentialsManager.clearCredentials(); await client.webAuth.clearSession(); + setIsAuthenticated(false); // Clear react query cache const queryCache = new QueryCache({}); @@ -58,7 +59,6 @@ const AuthenticationProvider: FC = ({ children }) => { // Reset state setAccessToken(undefined); setUser(undefined); - setIsAuthenticated(false); } catch (e) { log.error(e); } diff --git a/src/profile/LogOutModal.tsx b/src/profile/LogOutModal.tsx index 83bc8c51..e53c160e 100644 --- a/src/profile/LogOutModal.tsx +++ b/src/profile/LogOutModal.tsx @@ -32,8 +32,20 @@ const LogoutModal: FC = ({ isVisible, toggleIsVisible }) => { {t('AUTHENTICATION.CONFIRM_TEXT')} - - + + ); diff --git a/yarn.lock b/yarn.lock index 79e6f517..6aa59f9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7724,6 +7724,11 @@ react-native-svg@^13.6.0: css-select "^5.1.0" css-tree "^1.1.3" +react-native-system-navigation-bar@^2.6.4: + version "2.6.4" + resolved "https://registry.yarnpkg.com/react-native-system-navigation-bar/-/react-native-system-navigation-bar-2.6.4.tgz#34edee7051dea01531ff2be95dc14f9fa8a540b7" + integrity sha512-4pysgADW53PiuHv+2glzNLJnHSxqDszZvLoitLFI5os4D+gCDfxmR36VSET4EnXkzSf8X9mbeFkHYDypDHJyZA== + react-native-url-polyfill@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz#c1763de0f2a8c22cc3e959b654c8790622b6ef6a"