Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/libs/PolicyUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

let allPolicies: OnyxCollection<Policy>;

Onyx.connect({

Check warning on line 76 in src/libs/PolicyUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.POLICY,
waitForCollectionCallback: true,
callback: (value) => (allPolicies = value),
Expand Down Expand Up @@ -1650,9 +1650,9 @@
return cleanedCustomUnit;
}

function goBackWhenEnableFeature(policyID: string) {
function goBackWhenEnableFeature() {
setTimeout(() => {
Navigation.goBack(ROUTES.WORKSPACE_INITIAL.getRoute(policyID));
Navigation.goBack();
}, CONST.WORKSPACE_ENABLE_FEATURE_REDIRECT_DELAY);
}

Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/Policy/Category.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ function enablePolicyCategories(policyData: PolicyData, enabled: boolean, should
API.write(WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, parameters, onyxData);

if (enabled && getIsNarrowLayout() && shouldGoBack) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/Policy/DistanceRate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function enablePolicyDistanceRates(policyID: string, enabled: boolean, customUni
API.write(WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, parameters, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/Policy/PerDiem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function enablePerDiem(policyID: string, enabled: boolean, customUnitID?: string
API.write(WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM, parameters, onyxData);

if (enabled && getIsNarrowLayout() && shouldGoBack) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down
18 changes: 9 additions & 9 deletions src/libs/actions/Policy/Policy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
};

const deprecatedAllPolicies: OnyxCollection<Policy> = {};
Onyx.connect({

Check warning on line 255 in src/libs/actions/Policy/Policy.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.POLICY,
callback: (val, key) => {
if (!key) {
Expand All @@ -268,7 +268,7 @@
});

let deprecatedAllReportActions: OnyxCollection<ReportActions>;
Onyx.connect({

Check warning on line 271 in src/libs/actions/Policy/Policy.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
waitForCollectionCallback: true,
callback: (actions) => {
Expand All @@ -278,7 +278,7 @@

let deprecatedSessionEmail = '';
let deprecatedSessionAccountID = 0;
Onyx.connect({

Check warning on line 281 in src/libs/actions/Policy/Policy.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.SESSION,
callback: (val) => {
deprecatedSessionEmail = val?.email ?? '';
Expand All @@ -287,7 +287,7 @@
});

let deprecatedAllPersonalDetails: OnyxEntry<PersonalDetailsList>;
Onyx.connect({

Check warning on line 290 in src/libs/actions/Policy/Policy.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
callback: (val) => (deprecatedAllPersonalDetails = val),
});
Expand Down Expand Up @@ -4422,7 +4422,7 @@
API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, parameters, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down Expand Up @@ -4472,7 +4472,7 @@
API.write(WRITE_COMMANDS.TOGGLE_RECEIPT_PARTNERS, parameters, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down Expand Up @@ -4530,7 +4530,7 @@
}

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down Expand Up @@ -4578,7 +4578,7 @@
API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, parameters, onyxData);

if (enabled && getIsNarrowLayout() && shouldGoBack) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down Expand Up @@ -4743,7 +4743,7 @@
API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_TAXES, parameters, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down Expand Up @@ -4841,7 +4841,7 @@
API.write(WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, parameters, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down Expand Up @@ -4928,7 +4928,7 @@
API.write(WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, parameters, onyxData);

if (enabled && getIsNarrowLayout() && shouldGoBack) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down Expand Up @@ -5038,7 +5038,7 @@
API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_INVOICING, parameters, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down Expand Up @@ -5095,7 +5095,7 @@
API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_TIME_TRACKING, {policyID, enabled}, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/Policy/Tag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ function enablePolicyTags(policyData: PolicyData, enabled: boolean) {
API.write(WRITE_COMMANDS.ENABLE_POLICY_TAGS, parameters, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/Policy/Travel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function enablePolicyTravel(policyID: string, enabled: boolean) {
API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_TRAVEL, parameters, onyxData);

if (enabled && getIsNarrowLayout()) {
goBackWhenEnableFeature(policyID);
goBackWhenEnableFeature();
}
}

Expand Down
Loading