diff --git a/src/components/Section/index.tsx b/src/components/Section/index.tsx
index 74606d025faaa..de80d4deb02d5 100644
--- a/src/components/Section/index.tsx
+++ b/src/components/Section/index.tsx
@@ -186,7 +186,7 @@ function Section({
/>
)}
- {renderTitle ? renderTitle() : !!title && {title}}
+ {renderTitle ? renderTitle() : {title}}
{cardLayout === CARD_LAYOUT.ICON_ON_RIGHT && (
= shouldUseNarrowLayout ? [styles.mhv12, styles.mhn5, styles.mbn5] : [styles.mhv8, styles.mhn8, styles.mbn5];
const shouldShowAddress = !readOnly || !!formattedAddress;
const {isAccountLocked, showLockedAccountModal} = useContext(LockedAccountContext);
const [lastPaymentMethod] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD, {canBeMissing: true});
@@ -377,27 +380,20 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
};
const renderDropdownMenu = (options: Array>) => (
- {}}
- shouldAlwaysShowDropdownMenu
- customText={translate('common.more')}
- options={options}
- isSplitButton={false}
- wrapperStyle={isPolicyAdmin ? styles.flexGrow0 : styles.flexGrow1}
- />
+
+ {}}
+ shouldAlwaysShowDropdownMenu
+ customText={translate('common.more')}
+ options={options}
+ isSplitButton={false}
+ wrapperStyle={styles.flexGrow1}
+ />
+
);
- const handleInvitePress = useCallback(() => {
- if (isAccountLocked) {
- showLockedAccountModal();
- return;
- }
- clearInviteDraft(route.params.policyID);
- Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID, Navigation.getActiveRouteWithoutParams()));
- }, [isAccountLocked, showLockedAccountModal, route.params.policyID]);
-
const getHeaderButtons = () => {
const secondaryActions: Array> = [];
const canLeave = !isOwner;
@@ -415,6 +411,21 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
return null;
}
+ if (isPolicyAdmin) {
+ secondaryActions.push({
+ value: 'invite',
+ text: translate('common.invite'),
+ icon: expensifyIcons.UserPlus,
+ onSelected: () => {
+ if (isAccountLocked) {
+ showLockedAccountModal();
+ return;
+ }
+ clearInviteDraft(route.params.policyID);
+ Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID, Navigation.getActiveRouteWithoutParams()));
+ },
+ });
+ }
secondaryActions.push({
value: 'share',
text: translate('common.share'),
@@ -451,22 +462,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
});
}
- return (
-
- {isPolicyAdmin && (
-
- )}
- {renderDropdownMenu(secondaryActions)}
-
- );
+ return renderDropdownMenu(secondaryActions);
};
return (
@@ -495,6 +491,11 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
isCentralPane
title=""
>
+
{
if (!policy?.id) {
@@ -511,7 +512,12 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
DefaultAvatar={DefaultAvatar}
type={CONST.ICON_TYPE_WORKSPACE}
fallbackIcon={expensifyIcons.FallbackWorkspaceAvatar}
- style={[(policy?.errorFields?.avatarURL ?? shouldUseNarrowLayout) ? styles.mb1 : styles.mb3, styles.alignItemsStart, styles.sectionMenuItemTopDescription]}
+ style={[
+ (policy?.errorFields?.avatarURL ?? shouldUseNarrowLayout) ? styles.mb1 : styles.mb3,
+ shouldUseNarrowLayout ? styles.mtn17 : styles.mtn20,
+ styles.alignItemsStart,
+ styles.sectionMenuItemTopDescription,
+ ]}
editIconStyle={styles.smallEditIconWorkspace}
isUsingDefaultAvatar={!policy?.avatarURL}
onImageSelected={(file) => {