test
parent
a86fcb4c0d
commit
d1446701e7
|
@ -20,10 +20,6 @@ if linkage != nil
|
||||||
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
|
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
|
||||||
use_frameworks! :linkage => linkage.to_sym
|
use_frameworks! :linkage => linkage.to_sym
|
||||||
end
|
end
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> ac3f6e99e1f4a2b81ad830dbc9d904acc74bee46
|
|
||||||
|
|
||||||
target 'ClickAndJoinApp' do
|
target 'ClickAndJoinApp' do
|
||||||
config = use_native_modules!
|
config = use_native_modules!
|
||||||
|
|
|
@ -75,6 +75,9 @@ export default function AccountInfoBanner(props: {
|
||||||
borderRightRadius={size / 2}
|
borderRightRadius={size / 2}
|
||||||
{...darkThemeStyle(theme, 'black.500')}>
|
{...darkThemeStyle(theme, 'black.500')}>
|
||||||
<TextSkeleton
|
<TextSkeleton
|
||||||
|
onPress={() => {
|
||||||
|
MyUserManager.logoutMyUser();
|
||||||
|
}}
|
||||||
SkeletonProps={{
|
SkeletonProps={{
|
||||||
lines: 1,
|
lines: 1,
|
||||||
width: '160px',
|
width: '160px',
|
||||||
|
|
|
@ -10,7 +10,8 @@ import {
|
||||||
import {saveVarChanges} from '@caj/helper/appData';
|
import {saveVarChanges} from '@caj/helper/appData';
|
||||||
import {apiBackendRequest, makeRequest} from '@caj/helper/request';
|
import {apiBackendRequest, makeRequest} from '@caj/helper/request';
|
||||||
import BigDataManager from '@caj/helper/storage/BigDataManager';
|
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';
|
import {MyUserAccount, createUserProp, SourceProp} from './types';
|
||||||
|
|
||||||
function createNewMyUser(
|
function createNewMyUser(
|
||||||
|
@ -120,10 +121,27 @@ function setMyUser(user: MyUserAccount) {
|
||||||
saveVarChanges();
|
saveVarChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function logoutMyUser() {
|
||||||
|
store.dispatch(appVarActions.setCurrentAccount('none'));
|
||||||
|
saveVarChanges();
|
||||||
|
}
|
||||||
|
|
||||||
function getSelectedUserId(): UserId {
|
function getSelectedUserId(): UserId {
|
||||||
return store.getState().appVariables.preferences.selectedAccount;
|
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 {
|
function getSessionId(userId?: UserId): XAuthorization | undefined {
|
||||||
const preferences = store.getState().appVariables.preferences;
|
const preferences = store.getState().appVariables.preferences;
|
||||||
let user = preferences.accounts[userId || preferences.selectedAccount];
|
let user = preferences.accounts[userId || preferences.selectedAccount];
|
||||||
|
@ -139,5 +157,6 @@ const MyUserManager = {
|
||||||
createNewMyUser,
|
createNewMyUser,
|
||||||
getSessionId,
|
getSessionId,
|
||||||
getSelectedUserId,
|
getSelectedUserId,
|
||||||
|
logoutMyUser,
|
||||||
};
|
};
|
||||||
export default MyUserManager;
|
export default MyUserManager;
|
||||||
|
|
Loading…
Reference in New Issue