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.

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

Bump onyx to fix replay effect (after revert) #34801

Merged
merged 32 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
256a25a
fix: tests
chrispader Jan 19, 2024
e6b100d
bump node
chrispader Jan 19, 2024
6f9f756
Update react-native-onyx with TS setup
blazejkustra Jan 22, 2024
c9436e4
Merge branch 'main' into @chrispader/replay-effect-fix
chrispader Jan 22, 2024
ae6f23f
update onyx
chrispader Jan 22, 2024
bf0c144
Merge branch 'main' into @chrispader/replay-effect-fix
Jan 23, 2024
7fa76dd
Merge branch 'main' into @chrispader/replay-effect-fix
Jan 23, 2024
ecaab50
Merge branch 'main' into ts/onyx-migration
blazejkustra Jan 23, 2024
a5dc65a
Fix desktop
blazejkustra Jan 23, 2024
a98e2d0
Merge branch 'main' into @chrispader/replay-effect-fix
Jan 23, 2024
b041919
update onyx
Jan 23, 2024
03fffd3
Merge branch 'main' into @chrispader/replay-effect-fix
Jan 23, 2024
e11dde5
fix: nodejs type errors
Jan 23, 2024
6a813a5
fix: npm engine
Jan 23, 2024
3809483
Merge branch 'main' into @chrispader/replay-effect-fix
Jan 23, 2024
1ea9818
add Podfile.lock diff
Jan 23, 2024
810c5e2
Update react-native-onyx and expensify-common
blazejkustra Jan 24, 2024
4e25503
Use fastMerge from expensify-common
blazejkustra Jan 24, 2024
14521c1
Fix typehceck
blazejkustra Jan 24, 2024
af552c5
Fix lint
blazejkustra Jan 24, 2024
dc92d86
Merge branch 'main' into ts/onyx-migration
blazejkustra Jan 24, 2024
26d2d84
Fix onyx import
blazejkustra Jan 24, 2024
64f10b3
Merge branch 'main' into @chrispader/replay-effect-fix
Jan 25, 2024
87d8b06
update onyx to 2.0.1
Jan 25, 2024
ac1ddf7
Merge branch 'ts/onyx-migration' into @chrispader/replay-effect-fix
Jan 25, 2024
56129e1
Merge branch 'main' into @chrispader/replay-effect-fix
Jan 25, 2024
9a2d483
Merge branch 'main' into @chrispader/replay-effect-fix
Jan 25, 2024
212bfbe
fix: typecheck
Jan 25, 2024
9aa09bc
Merge branch 'main' into @chrispader/replay-effect-fix
chrispader Jan 26, 2024
903f89e
remove unused @ts-ignore
chrispader Jan 26, 2024
bac1ed9
Merge branch 'main' into @chrispader/replay-effect-fix
chrispader Jan 27, 2024
6d0d7b7
Merge branch 'main' into @chrispader/replay-effect-fix
chrispader Jan 29, 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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.9.0
20.10.0
chrispader marked this conversation as resolved.
Show resolved Hide resolved
72 changes: 54 additions & 18 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
"@react-ng/bounds-observer": "^0.2.1",
"@rnmapbox/maps": "^10.0.11",
"@shopify/flash-list": "^1.6.3",
"@types/node": "^18.14.0",
"@ua/react-native-airship": "^15.3.1",
"@vue/preload-webpack-plugin": "^2.0.0",
"awesome-phonenumber": "^5.4.0",
Expand Down Expand Up @@ -142,7 +141,7 @@
"react-native-linear-gradient": "^2.8.1",
"react-native-localize": "^2.2.6",
"react-native-modal": "^13.0.0",
"react-native-onyx": "1.0.118",
"react-native-onyx": "1.0.131",
"react-native-pager-view": "6.2.2",
"react-native-pdf": "6.7.3",
"react-native-performance": "^5.1.0",
Expand Down Expand Up @@ -217,6 +216,7 @@
"@types/js-yaml": "^4.0.5",
"@types/lodash": "^4.14.195",
"@types/mapbox-gl": "^2.7.13",
"@types/node": "^20.11.5",
"@types/pusher-js": "^5.1.0",
"@types/react": "18.2.45",
"@types/react-beautiful-dnd": "^13.1.4",
Expand Down Expand Up @@ -315,7 +315,7 @@
]
},
"engines": {
"node": "20.9.0",
"npm": "10.1.0"
"node": ">=20.10.0",
"npm": ">=10.2.3"
}
}
2 changes: 1 addition & 1 deletion src/components/BigNumberPad.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function BigNumberPad({numberPressed, longPressHandlerStateChanged = () => {}, i
const {toLocaleDigit} = useLocalize();

const styles = useThemeStyles();
const [timer, setTimer] = useState<NodeJS.Timer | null>(null);
const [timer, setTimer] = useState<NodeJS.Timeout | null>(null);
const {isExtraSmallScreenHeight} = useWindowDimensions();

/**
Expand Down
4 changes: 2 additions & 2 deletions src/libs/Timers.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const timers: NodeJS.Timer[] = [];
const timers: NodeJS.Timeout[] = [];

/**
* Register a timer so it can be cleaned up later.
*/
function register(timerID: NodeJS.Timer): NodeJS.Timer {
function register(timerID: NodeJS.Timeout): NodeJS.Timeout {
timers.push(timerID);
return timerID;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/MigrationTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ describe('Migrations', () => {
it('Should remove any individual reportActions that have no data in Onyx', () =>
Onyx.multiSet({
[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {
1: null,
2: null,
1: {},
2: {},
},
})
.then(PersonalDetailsByAccountID)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/ReportActionsUtilsTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ describe('ReportActionsUtils', () => {
callback: () => {
Onyx.disconnect(connectionID);
const res = ReportActionsUtils.getLastVisibleAction(report.reportID);
expect(res).toBe(action2);
expect(res).toEqual(action2);
resolve();
},
});
Expand Down
Loading