forked from Expensify/App
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into Rory-BumpRuby
- Loading branch information
Showing
48 changed files
with
688 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
-4 Bytes
(100%)
ios/NewApp_AppStore_Notification_Service.mobileprovision.gpg
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| import React, {useRef, useState} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useNetwork from '@hooks/useNetwork'; | ||
| import usePermissions from '@hooks/usePermissions'; | ||
| import useResponsiveLayout from '@hooks/useResponsiveLayout'; | ||
| import useTheme from '@hooks/useTheme'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import {clearDelegatorErrors, connect, disconnect} from '@libs/actions/Delegate'; | ||
| import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils'; | ||
| import variables from '@styles/variables'; | ||
| import * as Modal from '@userActions/Modal'; | ||
| import CONST from '@src/CONST'; | ||
| import type {TranslationPaths} from '@src/languages/types'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import type {PersonalDetails} from '@src/types/onyx'; | ||
| import Avatar from './Avatar'; | ||
| import ConfirmModal from './ConfirmModal'; | ||
| import Icon from './Icon'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
| import type {MenuItemProps} from './MenuItem'; | ||
| import MenuItemList from './MenuItemList'; | ||
| import type {MenuItemWithLink} from './MenuItemList'; | ||
| import Popover from './Popover'; | ||
| import {PressableWithFeedback} from './Pressable'; | ||
| import Text from './Text'; | ||
|
|
||
| function AccountSwitcher() { | ||
| const currentUserPersonalDetails = useCurrentUserPersonalDetails(); | ||
| const styles = useThemeStyles(); | ||
| const theme = useTheme(); | ||
| const {translate} = useLocalize(); | ||
| const {isOffline} = useNetwork(); | ||
| const {canUseNewDotCopilot} = usePermissions(); | ||
| const {shouldUseNarrowLayout} = useResponsiveLayout(); | ||
| const [account] = useOnyx(ONYXKEYS.ACCOUNT); | ||
| const buttonRef = useRef<HTMLDivElement>(null); | ||
|
|
||
| const [shouldShowDelegatorMenu, setShouldShowDelegatorMenu] = useState(false); | ||
| const [shouldShowOfflineModal, setShouldShowOfflineModal] = useState(false); | ||
| const delegators = account?.delegatedAccess?.delegators ?? []; | ||
|
|
||
| const isActingAsDelegate = !!account?.delegatedAccess?.delegate ?? false; | ||
| const canSwitchAccounts = canUseNewDotCopilot && (delegators.length > 0 || isActingAsDelegate); | ||
|
|
||
| const createBaseMenuItem = (personalDetails: PersonalDetails | undefined, error?: TranslationPaths, additionalProps: MenuItemWithLink = {}): MenuItemWithLink => { | ||
| return { | ||
| title: personalDetails?.displayName ?? personalDetails?.login, | ||
| description: personalDetails?.login, | ||
| avatarID: personalDetails?.accountID ?? -1, | ||
| icon: personalDetails?.avatar ?? '', | ||
| iconType: CONST.ICON_TYPE_AVATAR, | ||
| outerWrapperStyle: shouldUseNarrowLayout ? {} : styles.accountSwitcherPopover, | ||
| numberOfLinesDescription: 1, | ||
| errorText: error ? translate(error) : '', | ||
| shouldShowRedDotIndicator: !!error, | ||
| errorTextStyle: styles.mt2, | ||
| ...additionalProps, | ||
| }; | ||
| }; | ||
|
|
||
| const menuItems = (): MenuItemProps[] => { | ||
| const currentUserMenuItem = createBaseMenuItem(currentUserPersonalDetails, undefined, { | ||
| wrapperStyle: [styles.buttonDefaultBG], | ||
| focused: true, | ||
| shouldShowRightIcon: true, | ||
| iconRight: Expensicons.Checkmark, | ||
| success: true, | ||
| key: `${currentUserPersonalDetails?.login}-current`, | ||
| }); | ||
|
|
||
| if (isActingAsDelegate) { | ||
| const delegateEmail = account?.delegatedAccess?.delegate ?? ''; | ||
|
|
||
| // Avoid duplicating the current user in the list when switching accounts | ||
| if (delegateEmail === currentUserPersonalDetails.login) { | ||
| return [currentUserMenuItem]; | ||
| } | ||
|
|
||
| const delegatePersonalDetails = PersonalDetailsUtils.getPersonalDetailByEmail(delegateEmail); | ||
| const error = account?.delegatedAccess?.error; | ||
|
|
||
| return [ | ||
| createBaseMenuItem(delegatePersonalDetails, error, { | ||
| onPress: () => { | ||
| if (isOffline) { | ||
| Modal.close(() => setShouldShowOfflineModal(true)); | ||
| return; | ||
| } | ||
| disconnect(); | ||
| }, | ||
| key: `${delegateEmail}-delegate`, | ||
| }), | ||
| currentUserMenuItem, | ||
| ]; | ||
| } | ||
|
|
||
| const delegatorMenuItems: MenuItemProps[] = delegators | ||
| .filter(({email}) => email !== currentUserPersonalDetails.login) | ||
| .map(({email, role, error}, index) => { | ||
| const personalDetails = PersonalDetailsUtils.getPersonalDetailByEmail(email); | ||
| return createBaseMenuItem(personalDetails, error, { | ||
| badgeText: translate('delegate.role', role), | ||
| onPress: () => { | ||
| if (isOffline) { | ||
| Modal.close(() => setShouldShowOfflineModal(true)); | ||
| return; | ||
| } | ||
| connect(email); | ||
| }, | ||
| key: `${email}-${index}`, | ||
| }); | ||
| }); | ||
|
|
||
| return [currentUserMenuItem, ...delegatorMenuItems]; | ||
| }; | ||
|
|
||
| return ( | ||
| <> | ||
| <PressableWithFeedback | ||
| accessible | ||
| accessibilityLabel={translate('common.profile')} | ||
| onPress={() => { | ||
| setShouldShowDelegatorMenu(!shouldShowDelegatorMenu); | ||
| }} | ||
| ref={buttonRef} | ||
| interactive={canSwitchAccounts} | ||
| wrapperStyle={[styles.flexGrow1, styles.flex1, styles.mnw0, styles.justifyContentCenter]} | ||
| > | ||
| <View style={[styles.flexRow, styles.gap3]}> | ||
| <Avatar | ||
| type={CONST.ICON_TYPE_AVATAR} | ||
| size={CONST.AVATAR_SIZE.MEDIUM} | ||
| avatarID={currentUserPersonalDetails?.accountID} | ||
| source={currentUserPersonalDetails?.avatar} | ||
| fallbackIcon={currentUserPersonalDetails.fallbackIcon} | ||
| /> | ||
| <View style={[styles.flex1, styles.flexShrink1, styles.flexBasis0, styles.justifyContentCenter, styles.gap1]}> | ||
| <View style={[styles.flexRow, styles.gap1]}> | ||
| <Text | ||
| numberOfLines={1} | ||
| style={[styles.textBold, styles.textLarge]} | ||
| > | ||
| {currentUserPersonalDetails?.displayName} | ||
| </Text> | ||
| {canSwitchAccounts && ( | ||
| <View style={styles.justifyContentCenter}> | ||
| <Icon | ||
| fill={theme.icon} | ||
| src={Expensicons.CaretUpDown} | ||
| height={variables.iconSizeSmall} | ||
| width={variables.iconSizeSmall} | ||
| /> | ||
| </View> | ||
| )} | ||
| </View> | ||
| <Text | ||
| numberOfLines={1} | ||
| style={[styles.colorMuted, styles.fontSizeLabel]} | ||
| > | ||
| {currentUserPersonalDetails?.login} | ||
| </Text> | ||
| </View> | ||
| </View> | ||
| </PressableWithFeedback> | ||
| {canSwitchAccounts && ( | ||
| <Popover | ||
| isVisible={shouldShowDelegatorMenu} | ||
| onClose={() => { | ||
| setShouldShowDelegatorMenu(false); | ||
| clearDelegatorErrors(); | ||
| }} | ||
| anchorRef={buttonRef} | ||
| anchorPosition={styles.accountSwitcherAnchorPosition} | ||
| > | ||
| <View style={styles.pb4}> | ||
| <Text style={[styles.createMenuHeaderText, styles.ph5, styles.pb2, styles.pt4]}>{translate('delegate.switchAccount')}</Text> | ||
| <MenuItemList | ||
| menuItems={menuItems()} | ||
| shouldUseSingleExecution | ||
| /> | ||
| </View> | ||
| </Popover> | ||
| )} | ||
| <ConfirmModal | ||
| title={translate('common.youAppearToBeOffline')} | ||
| isVisible={shouldShowOfflineModal} | ||
| onConfirm={() => setShouldShowOfflineModal(false)} | ||
| onCancel={() => setShouldShowOfflineModal(false)} | ||
| confirmText={translate('common.buttonConfirm')} | ||
| prompt={translate('common.offlinePrompt')} | ||
| shouldShowCancelButton={false} | ||
| /> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| AccountSwitcher.displayName = 'AccountSwitcher'; | ||
|
|
||
| export default AccountSwitcher; |
Oops, something went wrong.