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

Update version React-Native-Onyx 1.0.39 #16531

Merged
merged 6 commits into from
Apr 24, 2023
Merged

Update version React-Native-Onyx 1.0.39 #16531

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec71ccc
update RN-onyx 1.0.39
tienifr Mar 27, 2023
0dfd9ab
fix: UTs
tienifr Mar 27, 2023
4e67189
resolve conflict
tienifr Apr 11, 2023
01251dc
merge main
tienifr Apr 14, 2023
e7a7830
Merge branch 'main' into update-version-react-native-onyx-1.0.39
tienifr Apr 22, 2023
c4393f9
fix: update package order
tienifr Apr 22, 2023
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 ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ PODS:
- React
- react-native-progress-view (1.3.2):
- React-Core
- react-native-quick-sqlite (5.1.0):
- react-native-quick-sqlite (8.0.2):
- React
- React-callinvoker
- React-Core
Expand Down Expand Up @@ -1014,7 +1014,7 @@ SPEC CHECKSUMS:
react-native-plaid-link-sdk: 9eb0f71dad94b3bdde649c7a384cba93024af46c
react-native-progress-bar-android: be43138ab7da30d51fc038bafa98e9ed594d0c40
react-native-progress-view: 4d3bbe6a099ba027b1fedb1548c2c87f74249b70
react-native-quick-sqlite: a7bd4139fb07194ef8534d1cc14c1aec6daa4d84
react-native-quick-sqlite: 2b225dadc63b670f027111e58f6f169773f6d755
react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
react-native-webview: e771bc375f789ebfa02a26939a57dbc6fa897336
Expand Down
53 changes: 37 additions & 16 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@
"react-native-image-picker": "^5.0.2",
"react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
"react-native-modal": "^13.0.0",
"react-native-onyx": "1.0.36",
"react-native-onyx": "1.0.39",
"react-native-pdf": "^6.6.2",
"react-native-performance": "^4.0.0",
"react-native-permissions": "^3.0.1",
"react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#84ee97dec11c2e65609511eb5a757d61bbeeab79",
"react-native-plaid-link-sdk": "^10.0.0",
"react-native-quick-sqlite": "^5.0.3",
"react-native-quick-sqlite": "^8.0.0-beta.2",
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this change required here?

Copy link
Contributor Author

@tienifr tienifr Mar 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

In the react-Native-Onyx, we just updated "react-native-quick-sqlite": "^8.0.0-beta.2" and this package is peerDependencies so we need to update it in the App repo

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you please link your PR in "react-native-onyx" in the PR body for which we are making update in "react-native-onyx" through this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it is this PR

"react-native-reanimated": "3.0.0-rc.10",
"react-native-render-html": "6.3.1",
"react-native-safe-area-context": "4.4.1",
Expand All @@ -122,7 +122,8 @@
"semver": "^7.3.8",
"shim-keyboard-event-key": "^1.0.3",
"underscore": "^1.13.1",
"urbanairship-react-native": "^14.6.1"
"urbanairship-react-native": "^14.6.1",
"localforage-removeitems": "^1.4.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor point but package.json is currently in alphabetical order – let's keep it that way

},
"devDependencies": {
"@actions/core": "1.10.0",
Expand Down
1 change: 1 addition & 0 deletions src/libs/Network/NetworkStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,5 @@ export {
isAuthenticating,
setIsAuthenticating,
getCredentials,
checkRequiredData,
};
1 change: 1 addition & 0 deletions tests/unit/NetworkTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ beforeEach(() => {
MainQueue.clear();
HttpUtils.cancelPendingRequests();
PersistedRequests.clear();
NetworkStore.checkRequiredData();
roryabraham marked this conversation as resolved.
Show resolved Hide resolved

// Wait for any Log command to finish and Onyx to fully clear
jest.advanceTimersByTime(CONST.NETWORK.PROCESS_REQUEST_DELAY_MS);
Expand Down