Skip to content

Commit

Permalink
Merge pull request Expensify#23562 from namhihi237/fix-19651-remove-f…
Browse files Browse the repository at this point in the history
…irst-request-from-queue

remove first request
  • Loading branch information
puneetlath authored Jul 27, 2023
2 parents a011ad8 + 48c1f36 commit 9fd1793
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions src/libs/actions/PersistedRequests.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,18 @@ function save(requestsToPersist) {
* @param {Object} requestToRemove
*/
function remove(requestToRemove) {
persistedRequests = _.reject(persistedRequests, (persistedRequest) => _.isEqual(persistedRequest, requestToRemove));
Onyx.set(ONYXKEYS.PERSISTED_REQUESTS, persistedRequests);
/**
* We only remove the first matching request because the order of requests matters.
* If we were to remove all matching requests, we can end up with a final state that is different than what the user intended.
*/
const requests = [...persistedRequests];
const index = _.findIndex(requests, (persistedRequest) => _.isEqual(persistedRequest, requestToRemove));
if (index !== -1) {
requests.splice(index, 1);
}

persistedRequests = requests;
Onyx.set(ONYXKEYS.PERSISTED_REQUESTS, requests);
}

/**
Expand Down

0 comments on commit 9fd1793

Please sign in to comment.