Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
25c66ee
[UX Reliability] Use new modal in ConfirmModal
blazejkustra Apr 10, 2025
c4fba48
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra Apr 10, 2025
8bab50e
Merge branch 'main' into feature/new-confirm-modal
borys3kk Apr 11, 2025
18840a0
Merge branch 'main' into feature/new-confirm-modal
borys3kk Apr 11, 2025
0719402
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra Apr 17, 2025
7ec503f
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra Apr 18, 2025
e788333
Fix perf tests
blazejkustra Apr 18, 2025
85cf191
Bring back ConfirmedRoute mock
blazejkustra Apr 18, 2025
6196c2f
Fix text changed to plural form
blazejkustra Apr 18, 2025
2a42134
Update useOnyx calls to handle missing data gracefully
blazejkustra Apr 18, 2025
8170546
Globally fix text that is changed to plural form
blazejkustra Apr 22, 2025
99d1ff1
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra Apr 22, 2025
b8340c8
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra Apr 23, 2025
0693809
Fix remaining cases
blazejkustra Apr 23, 2025
702b9c9
Fix confirm modal on categories page
blazejkustra Apr 23, 2025
bce873e
Fix confirm modal on WorkspaceViewTags page
blazejkustra Apr 23, 2025
0d138d4
Update useOnyx calls with new canBeMissing prop
blazejkustra Apr 23, 2025
8bfb717
Add onModalWillShow and onModalWillHide props to BaseModal, improve s…
blazejkustra Apr 24, 2025
8214344
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra Apr 24, 2025
e49e151
Fix ConfirmModal animation when removing tags
blazejkustra Apr 24, 2025
96ed572
Migrate TestToolsModal to new modal
blazejkustra Apr 24, 2025
46929cc
Fix lint
blazejkustra Apr 24, 2025
0d4d60a
Merge branch 'main' into feature/new-confirm-modal
jmusial Apr 28, 2025
db6074e
Merge branch 'main' into feature/new-confirm-modal
jmusial Apr 29, 2025
307ab57
Fix ts
jmusial Apr 29, 2025
e4dd0e3
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra May 5, 2025
dc7f913
Merge branch 'feature/new-confirm-modal' of github.com:software-mansi…
blazejkustra May 5, 2025
f11c493
Refactor LayoutAnimationConfig mock to return a functional component
blazejkustra May 5, 2025
664c03c
Revert status bar changes
blazejkustra May 5, 2025
29b7ef8
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra May 6, 2025
8baf801
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra May 8, 2025
e9926a4
Merge branch 'main' of github.com:Expensify/App into feature/new-conf…
blazejkustra May 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/ConfirmModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ function ConfirmModal({
shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
restoreFocusType={restoreFocusType}
shouldHandleNavigationBack={shouldHandleNavigationBack}
shouldUseNewModal
>
<ConfirmContent
title={title}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ReportParticipantsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@ function ReportParticipantsPage({report, route}: ReportParticipantsPageProps) {
const accountIDsToRemove = selectedMembers.filter((id) => id !== currentUserAccountID);
removeFromGroupChat(report.reportID, accountIDsToRemove);
setSearchValue('');
setSelectedMembers([]);
setRemoveMembersConfirmModalVisible(false);
InteractionManager.runAfterInteractions(() => {
setSelectedMembers([]);
clearUserSearchPhrase();
});
};
Expand Down
2 changes: 1 addition & 1 deletion src/pages/RoomMembersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ function RoomMembersPage({report, policies}: RoomMembersPageProps) {
removeFromRoom(report.reportID, selectedMembers);
}
setSearchValue('');
setSelectedMembers([]);
setRemoveMembersConfirmModalVisible(false);
InteractionManager.runAfterInteractions(() => {
setSelectedMembers([]);
clearUserSearchPhrase();
});
};
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/WorkspaceMembersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@ function WorkspaceMembersPage({personalDetails, route, policy, currentUserPerson
});
}

setSelectedEmployees([]);
setRemoveMembersConfirmModalVisible(false);
InteractionManager.runAfterInteractions(() => {
setSelectedEmployees([]);
removeMembers(accountIDsToRemove, route.params.policyID);
});
};
Expand Down
7 changes: 5 additions & 2 deletions src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import lodashSortBy from 'lodash/sortBy';
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import {ActivityIndicator, View} from 'react-native';
import {ActivityIndicator, InteractionManager, View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import Button from '@components/Button';
import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
Expand Down Expand Up @@ -217,9 +217,12 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
};

const handleDeleteCategories = () => {
setSelectedCategories([]);
deleteWorkspaceCategories(policyId, selectedCategories);
setDeleteCategoriesConfirmModalVisible(false);

InteractionManager.runAfterInteractions(() => {
setSelectedCategories([]);
});
};

const getHeaderButtons = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import {ActivityIndicator, View} from 'react-native';
import {ActivityIndicator, InteractionManager, View} from 'react-native';
import Button from '@components/Button';
import type {DropdownOption, WorkspaceDistanceRatesBulkActionType} from '@components/ButtonWithDropdownMenu/types';
import ConfirmModal from '@components/ConfirmModal';
Expand Down Expand Up @@ -237,8 +237,11 @@ function PolicyDistanceRatesPage({
}

deletePolicyDistanceRates(policyID, customUnit, selectedDistanceRates);
setSelectedDistanceRates([]);
setIsDeleteModalVisible(false);

InteractionManager.runAfterInteractions(() => {
setSelectedDistanceRates([]);
});
};

const toggleRate = (rate: RateForList) => {
Expand Down
7 changes: 5 additions & 2 deletions src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {useFocusEffect} from '@react-navigation/native';
import lodashSortBy from 'lodash/sortBy';
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import {ActivityIndicator, View} from 'react-native';
import {ActivityIndicator, InteractionManager, View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import Button from '@components/Button';
import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
Expand Down Expand Up @@ -256,8 +256,11 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {

const handleDeletePerDiemRates = () => {
deleteWorkspacePerDiemRates(policyID, customUnit, selectedPerDiem);
setSelectedPerDiem([]);
setDeletePerDiemConfirmModalVisible(false);

InteractionManager.runAfterInteractions(() => {
setSelectedPerDiem([]);
});
};

const getHeaderButtons = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {useCallback, useMemo, useState} from 'react';
import {View} from 'react-native';
import {InteractionManager, View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import Button from '@components/Button';
import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
Expand Down Expand Up @@ -164,8 +164,6 @@ function ReportFieldsListValuesPage({
};

const handleDeleteValues = () => {
setSelectedValues({});

const valuesToDelete = selectedValuesArray.reduce<number[]>((acc, valueName) => {
const index = listValues?.indexOf(valueName) ?? -1;

Expand All @@ -183,6 +181,10 @@ function ReportFieldsListValuesPage({
}

setDeleteValuesConfirmModalVisible(false);

InteractionManager.runAfterInteractions(() => {
setSelectedValues({});
});
};

const openListValuePage = (valueItem: ValueListItem) => {
Expand Down
Loading