Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: on refresh entered details are not shown #57373

Merged
merged 5 commits into from
Mar 6, 2025
Merged

fix: on refresh entered details are not shown #57373

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13b842f
fix: on refresh entered details are not shown
nkdengineer Feb 25, 2025
57c1e35
Merge branch 'main' into fix/56746
nkdengineer Feb 26, 2025
f995675
Merge branch 'main' into fix/56746
nkdengineer Mar 3, 2025
573b994
fix remove useFocusEffect
nkdengineer Mar 3, 2025
7fc86b3
fix lint
nkdengineer Mar 3, 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
15 changes: 9 additions & 6 deletions src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {useMemo, useState} from 'react';
import {View} from 'react-native';
import {InteractionManager, View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import ConfirmModal from '@components/ConfirmModal';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
Expand Down Expand Up @@ -40,8 +40,9 @@ function WorkspaceCompanyCardsSettingsPage({

const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we want to run the hook only once to escape unexpected feed change
const selectedFeed = useMemo(() => getSelectedFeed(lastSelectedFeed, cardFeeds), []);

const selectedFeed = useMemo(() => getSelectedFeed(lastSelectedFeed, cardFeeds), [cardFeeds, lastSelectedFeed]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nkdengineer, could you clarify one detail please, is it safe to add the onyx values ​​lastSelectedFeed and cardFeeds to the dependencies? You had mentioned in the proposal the use of isLoadingOnyxValue. I'm not sure what unexpected feed change they were expecting as they left the dependencies empty. Thank you.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brunovjk To avoid adding many isLoadingOnyxValue dependency in this useMemo, I will go with the alternative solution. That also fixes the unexpected feed change bug and the deeplink bug.


const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${selectedFeed}`);
const feedName = getCustomOrFormattedFeedName(selectedFeed, cardFeeds?.settings?.companyCardNicknames);
const companyFeeds = getCompanyFeeds(cardFeeds);
Expand All @@ -53,16 +54,18 @@ function WorkspaceCompanyCardsSettingsPage({
};

const deleteCompanyCardFeed = () => {
setDeleteCompanyCardConfirmModalVisible(false);
Navigation.goBack();
if (selectedFeed) {
const {cardList, ...cards} = cardsList ?? {};
const cardIDs = Object.keys(cards);
const feedToOpen = (Object.keys(companyFeeds) as CompanyCardFeed[])
.filter((feed) => feed !== selectedFeed && companyFeeds[feed]?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
.at(0);
deleteWorkspaceCompanyCardFeed(policyID, workspaceAccountID, selectedFeed, cardIDs, feedToOpen);
InteractionManager.runAfterInteractions(() => {
deleteWorkspaceCompanyCardFeed(policyID, workspaceAccountID, selectedFeed, cardIDs, feedToOpen);
});
}
setDeleteCompanyCardConfirmModalVisible(false);
Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
};

const onToggleLiability = (isOn: boolean) => {
Expand Down
Loading