Skip to content

QBO: Fix connection missing #50766

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
yuwenmemon merged 3 commits into from
Oct 23, 2024
Merged

QBO: Fix connection missing #50766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5457af1
fix connection missing QBO
hungvu193 Oct 15, 2024
ede7ca4
Merge remote-tracking branch 'origin/main' into fix-qbo-sync-issue
hungvu193 Oct 16, 2024
1b1d03a
Merge remote-tracking branch 'origin/main' into fix-qbo-sync-issue
hungvu193 Oct 22, 2024
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: 7 additions & 4 deletions src/libs/actions/connections/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,15 @@ function isConnectionInProgress(connectionSyncProgress: OnyxEntry<PolicyConnecti
return false;
}

const qboConnection = policy?.connections?.quickbooksOnline;

const lastSyncProgressDate = parseISO(connectionSyncProgress?.timestamp ?? '');
return (
!!connectionSyncProgress?.stageInProgress &&
(connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE || !policy?.connections?.[connectionSyncProgress.connectionName]) &&
isValid(lastSyncProgressDate) &&
differenceInMinutes(new Date(), lastSyncProgressDate) < CONST.POLICY.CONNECTIONS.SYNC_STAGE_TIMEOUT_MINUTES
(!!connectionSyncProgress?.stageInProgress &&
(connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE || !policy?.connections?.[connectionSyncProgress.connectionName]) &&
isValid(lastSyncProgressDate) &&
differenceInMinutes(new Date(), lastSyncProgressDate) < CONST.POLICY.CONNECTIONS.SYNC_STAGE_TIMEOUT_MINUTES) ||
(!!qboConnection && !qboConnection?.data && !!qboConnection?.config?.credentials)
);
}

Expand Down
23 changes: 23 additions & 0 deletions src/types/onyx/Policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,26 @@ type ConnectionLastSync = {
isConnected?: boolean;
};

/**
* Model of QBO credentials data.
*/
type QBOCredentials = {
/**
* The company ID that's connected from QBO.
*/
companyID: string;

/**
* The company name that's connected from QBO.
*/
companyName: string;

/**
* The current scope of QBO connection.
*/
scope: string;
};

/** Financial account (bank account, debit card, etc) */
type Account = {
/** GL code assigned to the financial account */
Expand Down Expand Up @@ -437,6 +457,9 @@ type QBOConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{

/** Collections of form field errors */
errorFields?: OnyxCommon.ErrorFields;

/** Credentials of the current QBO connection */
credentials: QBOCredentials;
}>;

/**
Expand Down