diff --git a/ios/Podfile b/ios/Podfile index 504255a..8500565 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -20,10 +20,6 @@ if linkage != nil Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green use_frameworks! :linkage => linkage.to_sym end -<<<<<<< HEAD -======= - ->>>>>>> ac3f6e99e1f4a2b81ad830dbc9d904acc74bee46 target 'ClickAndJoinApp' do config = use_native_modules! diff --git a/src/caj/components/userUI/AccountInfoBanner.tsx b/src/caj/components/userUI/AccountInfoBanner.tsx index 10aafb5..67e8aef 100644 --- a/src/caj/components/userUI/AccountInfoBanner.tsx +++ b/src/caj/components/userUI/AccountInfoBanner.tsx @@ -75,6 +75,9 @@ export default function AccountInfoBanner(props: { borderRightRadius={size / 2} {...darkThemeStyle(theme, 'black.500')}> { + MyUserManager.logoutMyUser(); + }} SkeletonProps={{ lines: 1, width: '160px', diff --git a/src/caj/user/MyUserManager.ts b/src/caj/user/MyUserManager.ts index afeaefe..f9932ad 100644 --- a/src/caj/user/MyUserManager.ts +++ b/src/caj/user/MyUserManager.ts @@ -10,7 +10,8 @@ import { import {saveVarChanges} from '@caj/helper/appData'; import {apiBackendRequest, makeRequest} from '@caj/helper/request'; import BigDataManager from '@caj/helper/storage/BigDataManager'; -import {store} from '@caj/redux/store'; +import {RootState, store} from '@caj/redux/store'; +import {useSelector} from 'react-redux'; import {MyUserAccount, createUserProp, SourceProp} from './types'; function createNewMyUser( @@ -120,10 +121,27 @@ function setMyUser(user: MyUserAccount) { saveVarChanges(); } +function logoutMyUser() { + store.dispatch(appVarActions.setCurrentAccount('none')); + saveVarChanges(); +} + function getSelectedUserId(): UserId { return store.getState().appVariables.preferences.selectedAccount; } +function getSelectedMyUserSelector() { + const myUserId = useSelector( + (state: RootState) => state.appVariables.preferences.selectedAccount, + ); + + const myUser = useSelector( + (state: RootState) => state.appVariables.preferences.accounts[myUserId], + ); + + return myUser; +} + function getSessionId(userId?: UserId): XAuthorization | undefined { const preferences = store.getState().appVariables.preferences; let user = preferences.accounts[userId || preferences.selectedAccount]; @@ -139,5 +157,6 @@ const MyUserManager = { createNewMyUser, getSessionId, getSelectedUserId, + logoutMyUser, }; export default MyUserManager;