Skip to content

Tasks are duplicated for invited member #63832

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

Merged
techievivek merged 4 commits into from
Jun 23, 2025
Merged

Tasks are duplicated for invited member #63832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98fc5d8
Tasks are duplicated for invited member
nkdengineer Jun 10, 2025
411cd70
Merge branch 'main' into fix/62536
nkdengineer Jun 17, 2025
ee12266
fix bug on desktop
nkdengineer Jun 19, 2025
b1984a9
fix lint error
nkdengineer Jun 19, 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
11 changes: 9 additions & 2 deletions src/libs/API/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {isOffline} from '@libs/Network/NetworkStore';
import {push as pushToSequentialQueue, waitForIdle as waitForSequentialQueueIdle} from '@libs/Network/SequentialQueue';
import Pusher from '@libs/Pusher';
import {processWithMiddleware, use} from '@libs/Request';
import {getLength as getPersistedRequestsLength} from '@userActions/PersistedRequests';
import {getAll, getLength as getPersistedRequestsLength} from '@userActions/PersistedRequests';
import CONST from '@src/CONST';
import type OnyxRequest from '@src/types/onyx/Request';
import type {PaginatedRequest, PaginationConfig, RequestConflictResolver} from '@src/types/onyx/Request';
Expand Down Expand Up @@ -62,8 +62,15 @@ function prepareRequest<TCommand extends ApiCommand>(
): OnyxRequest {
Log.info('[API] Preparing request', false, {command, type});

let shouldApplyOptimisticData = true;
if (conflictResolver?.checkAndFixConflictingRequest) {
const requests = getAll();
const {conflictAction} = conflictResolver.checkAndFixConflictingRequest(requests);
shouldApplyOptimisticData = conflictAction.type !== 'noAction';
}

const {optimisticData, ...onyxDataWithoutOptimisticData} = onyxData;
if (optimisticData) {
if (optimisticData && shouldApplyOptimisticData) {
Log.info('[API] Applying optimistic data', false, {command, type});
Onyx.update(optimisticData);
}
Expand Down
8 changes: 7 additions & 1 deletion src/libs/actions/Report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ import {clearByKey} from './CachedPDFPaths';
import {setDownload} from './Download';
import {close} from './Modal';
import navigateFromNotification from './navigateFromNotification';
import {getAll} from './PersistedRequests';
import {buildAddMembersToWorkspaceOnyxData, buildRoomMembersOnyxData} from './Policy/Member';
import {createPolicyExpenseChats} from './Policy/Policy';
import {
Expand Down Expand Up @@ -1106,9 +1107,14 @@ function openReport(
const isInviteOnboardingComplete = introSelected?.isInviteOnboardingComplete ?? false;
const isOnboardingCompleted = onboarding?.hasCompletedGuidedSetupFlow ?? false;

// Some cases we can have two open report requests with guide setup data because isInviteOnboardingComplete is not updated completely.
// Then we need to check the list request and prevent the guided setup data from being duplicated.
const allPersistedRequests = getAll();
const hasOpenReportWithGuidedSetupData = allPersistedRequests.some((request) => request.command === WRITE_COMMANDS.OPEN_REPORT && request.data?.guidedSetupData);

// Prepare guided setup data only when nvp_introSelected is set and onboarding is not completed
// OldDot users will never have nvp_introSelected set, so they will not see guided setup messages
if (introSelected && !isOnboardingCompleted && !isInviteOnboardingComplete) {
if (introSelected && !isOnboardingCompleted && !isInviteOnboardingComplete && !hasOpenReportWithGuidedSetupData) {
const {choice, inviteType} = introSelected;
const isInviteIOUorInvoice = inviteType === CONST.ONBOARDING_INVITE_TYPES.IOU || inviteType === CONST.ONBOARDING_INVITE_TYPES.INVOICE;
const isInviteChoiceCorrect = choice === CONST.ONBOARDING_CHOICES.ADMIN || choice === CONST.ONBOARDING_CHOICES.SUBMIT || choice === CONST.ONBOARDING_CHOICES.CHAT_SPLIT;
Expand Down