Revert "Block edit assignee and mark as complete simultaneously"

Expensify · Apr 22, 2024 · a5989aa · a5989aa
1 parent e17bf43
commit a5989aa
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 98 deletions.
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
@@ -334,7 +334,7 @@ function MenuItem(
     const StyleUtils = useStyleUtils();
     const combinedStyle = [style, styles.popoverMenuItem];
     const {isSmallScreenWidth} = useWindowDimensions();
-    const {isExecuting, singleExecution} = useContext(MenuItemGroupContext) ?? {};
+    const {isExecuting, singleExecution, waitForNavigate} = useContext(MenuItemGroupContext) ?? {};
 
     const isDeleted = style && Array.isArray(style) ? style.includes(styles.offlineFeedback.deleted) : false;
     const descriptionVerticalMargin = shouldShowDescriptionOnTop ? styles.mb1 : styles.mt1;
@@ -409,11 +409,15 @@ function MenuItem(
         }
 
         if (onPress && event) {
-            if (!singleExecution) {
+            if (!singleExecution || !waitForNavigate) {
                 onPress(event);
                 return;
             }
-            singleExecution(onPress)(event);
+            singleExecution(
+                waitForNavigate(() => {
+                    onPress(event);
+                }),
+            )();
         }
     };
 

diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
@@ -1,4 +1,4 @@
-import React, {useContext} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -10,7 +10,6 @@ import * as Task from '@userActions/Task';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
 import Button from './Button';
-import {MenuItemGroupContext} from './MenuItemGroup';
 
 type TaskHeaderActionButtonOnyxProps = {
     /** Current user session */
@@ -25,25 +24,15 @@ type TaskHeaderActionButtonProps = TaskHeaderActionButtonOnyxProps & {
 function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {isExecuting, singleExecution} = useContext(MenuItemGroupContext) ?? {};
-
-    const onPressAction = () => {
-        const onPress = () => (ReportUtils.isCompletedTaskReport(report) ? Task.reopenTask(report) : Task.completeTask(report));
-        if (!singleExecution) {
-            onPress();
-            return;
-        }
-        singleExecution(onPress)();
-    };
 
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={!Task.canModifyTask(report, session?.accountID ?? 0) || isExecuting}
+                isDisabled={!Task.canModifyTask(report, session?.accountID ?? 0)}
                 medium
                 text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
-                onPress={Session.checkIfActionIsAllowed(onPressAction)}
+                onPress={Session.checkIfActionIsAllowed(() => (ReportUtils.isCompletedTaskReport(report) ? Task.reopenTask(report) : Task.completeTask(report)))}
                 style={styles.flex1}
             />
         </View>

diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
@@ -12,7 +12,6 @@ import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import DragAndDropProvider from '@components/DragAndDrop/Provider';
 import * as Illustrations from '@components/Icon/Illustrations';
-import MenuItemGroup from '@components/MenuItemGroup';
 import MoneyReportHeader from '@components/MoneyReportHeader';
 import MoneyRequestHeader from '@components/MoneyRequestHeader';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -629,87 +628,85 @@ function ReportScreen({
     return (
         <ActionListContext.Provider value={actionListValue}>
             <ReactionListContext.Provider value={reactionListRef}>
-                <MenuItemGroup>
-                    <ScreenWrapper
-                        navigation={navigation}
-                        style={screenWrapperStyle}
-                        shouldEnableKeyboardAvoidingView={isTopMostReportId}
-                        testID={ReportScreen.displayName}
+                <ScreenWrapper
+                    navigation={navigation}
+                    style={screenWrapperStyle}
+                    shouldEnableKeyboardAvoidingView={isTopMostReportId}
+                    testID={ReportScreen.displayName}
+                >
+                    <FullPageNotFoundView
+                        shouldShow={shouldShowNotFoundPage}
+                        subtitleKey="notFound.noAccess"
+                        shouldShowBackButton={isSmallScreenWidth}
+                        onBackButtonPress={Navigation.goBack}
+                        shouldShowLink={false}
                     >
-                        <FullPageNotFoundView
-                            shouldShow={shouldShowNotFoundPage}
-                            subtitleKey="notFound.noAccess"
-                            shouldShowBackButton={isSmallScreenWidth}
-                            onBackButtonPress={Navigation.goBack}
-                            shouldShowLink={false}
+                        <OfflineWithFeedback
+                            pendingAction={reportPendingAction}
+                            errors={reportErrors}
+                            shouldShowErrorMessages={false}
+                            needsOffscreenAlphaCompositing
                         >
-                            <OfflineWithFeedback
-                                pendingAction={reportPendingAction}
-                                errors={reportErrors}
-                                shouldShowErrorMessages={false}
-                                needsOffscreenAlphaCompositing
-                            >
-                                {headerView}
-                                {ReportUtils.isTaskReport(report) && isSmallScreenWidth && ReportUtils.isOpenTaskReport(report, parentReportAction) && (
-                                    <View style={[styles.borderBottom]}>
-                                        <View style={[styles.appBG, styles.pl0]}>
-                                            <View style={[styles.ph5, styles.pb3]}>
-                                                <TaskHeaderActionButton report={report} />
-                                            </View>
+                            {headerView}
+                            {ReportUtils.isTaskReport(report) && isSmallScreenWidth && ReportUtils.isOpenTaskReport(report, parentReportAction) && (
+                                <View style={[styles.borderBottom]}>
+                                    <View style={[styles.appBG, styles.pl0]}>
+                                        <View style={[styles.ph5, styles.pb3]}>
+                                            <TaskHeaderActionButton report={report} />
                                         </View>
                                     </View>
-                                )}
-                            </OfflineWithFeedback>
-                            {!!accountManagerReportID && ReportUtils.isConciergeChatReport(report) && isBannerVisible && (
-                                <Banner
-                                    containerStyles={[styles.mh4, styles.mt4, styles.p4, styles.bgDark]}
-                                    textStyles={[styles.colorReversed]}
-                                    text={translate('reportActionsView.chatWithAccountManager')}
-                                    onClose={dismissBanner}
-                                    onPress={chatWithAccountManager}
-                                    shouldShowCloseButton
-                                />
-                            )}
-                            <DragAndDropProvider isDisabled={!isCurrentReportLoadedFromOnyx || !ReportUtils.canUserPerformWriteAction(report)}>
-                                <View
-                                    style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
-                                    onLayout={onListLayout}
-                                >
-                                    {shouldShowReportActionList && (
-                                        <ReportActionsView
-                                            reportActions={reportActions}
-                                            report={report}
-                                            parentReportAction={parentReportAction}
-                                            isLoadingInitialReportActions={reportMetadata?.isLoadingInitialReportActions}
-                                            isLoadingNewerReportActions={reportMetadata?.isLoadingNewerReportActions}
-                                            isLoadingOlderReportActions={reportMetadata?.isLoadingOlderReportActions}
-                                            isReadyForCommentLinking={!shouldShowSkeleton}
-                                            transactionThreadReportID={transactionThreadReportID}
-                                        />
-                                    )}
-
-                                    {/* Note: The ReportActionsSkeletonView should be allowed to mount even if the initial report actions are not loaded.
-                                        If we prevent rendering the report while they are loading then
-                                        we'll unnecessarily unmount the ReportActionsView which will clear the new marker lines initial state. */}
-                                    {shouldShowSkeleton && <ReportActionsSkeletonView />}
-
-                                    {isCurrentReportLoadedFromOnyx ? (
-                                        <ReportFooter
-                                            onComposerFocus={() => setIsComposerFocus(true)}
-                                            onComposerBlur={() => setIsComposerFocus(false)}
-                                            report={report}
-                                            pendingAction={reportPendingAction}
-                                            isComposerFullSize={!!isComposerFullSize}
-                                            listHeight={listHeight}
-                                            isEmptyChat={isEmptyChat}
-                                            lastReportAction={lastReportAction}
-                                        />
-                                    ) : null}
                                 </View>
-                            </DragAndDropProvider>
-                        </FullPageNotFoundView>
-                    </ScreenWrapper>
-                </MenuItemGroup>
+                            )}
+                        </OfflineWithFeedback>
+                        {!!accountManagerReportID && ReportUtils.isConciergeChatReport(report) && isBannerVisible && (
+                            <Banner
+                                containerStyles={[styles.mh4, styles.mt4, styles.p4, styles.bgDark]}
+                                textStyles={[styles.colorReversed]}
+                                text={translate('reportActionsView.chatWithAccountManager')}
+                                onClose={dismissBanner}
+                                onPress={chatWithAccountManager}
+                                shouldShowCloseButton
+                            />
+                        )}
+                        <DragAndDropProvider isDisabled={!isCurrentReportLoadedFromOnyx || !ReportUtils.canUserPerformWriteAction(report)}>
+                            <View
+                                style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
+                                onLayout={onListLayout}
+                            >
+                                {shouldShowReportActionList && (
+                                    <ReportActionsView
+                                        reportActions={reportActions}
+                                        report={report}
+                                        parentReportAction={parentReportAction}
+                                        isLoadingInitialReportActions={reportMetadata?.isLoadingInitialReportActions}
+                                        isLoadingNewerReportActions={reportMetadata?.isLoadingNewerReportActions}
+                                        isLoadingOlderReportActions={reportMetadata?.isLoadingOlderReportActions}
+                                        isReadyForCommentLinking={!shouldShowSkeleton}
+                                        transactionThreadReportID={transactionThreadReportID}
+                                    />
+                                )}
+
+                                {/* Note: The ReportActionsSkeletonView should be allowed to mount even if the initial report actions are not loaded.
+                                    If we prevent rendering the report while they are loading then
+                                    we'll unnecessarily unmount the ReportActionsView which will clear the new marker lines initial state. */}
+                                {shouldShowSkeleton && <ReportActionsSkeletonView />}
+
+                                {isCurrentReportLoadedFromOnyx ? (
+                                    <ReportFooter
+                                        onComposerFocus={() => setIsComposerFocus(true)}
+                                        onComposerBlur={() => setIsComposerFocus(false)}
+                                        report={report}
+                                        pendingAction={reportPendingAction}
+                                        isComposerFullSize={!!isComposerFullSize}
+                                        listHeight={listHeight}
+                                        isEmptyChat={isEmptyChat}
+                                        lastReportAction={lastReportAction}
+                                    />
+                                ) : null}
+                            </View>
+                        </DragAndDropProvider>
+                    </FullPageNotFoundView>
+                </ScreenWrapper>
             </ReactionListContext.Provider>
         </ActionListContext.Provider>
     );

diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
@@ -1,11 +1,11 @@
-import React, {useContext, useEffect} from 'react';
+import React, {useEffect} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Illustrations from '@components/Icon/Illustrations';
-import MenuItemGroup, {MenuItemGroupContext} from '@components/MenuItemGroup';
+import MenuItemGroup from '@components/MenuItemGroup';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -61,7 +61,6 @@ function ProfilePage({
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
-    const {waitForNavigate} = useContext(MenuItemGroupContext) ?? {};
 
     const getPronouns = (): string => {
         const pronounsKey = currentUserPersonalDetails?.pronouns?.replace(CONST.PRONOUNS.PREFIX, '') ?? '';
@@ -180,7 +179,7 @@ function ProfilePage({
                                             title={detail.title}
                                             description={detail.description}
                                             wrapperStyle={styles.sectionMenuItemTopDescription}
-                                            onPress={waitForNavigate ? waitForNavigate(() => Navigation.navigate(detail.pageRoute)) : () => Navigation.navigate(detail.pageRoute)}
+                                            onPress={() => Navigation.navigate(detail.pageRoute)}
                                         />
                                     ))}
                                 </>