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 1.0.61 #25426

Merged
merged 21 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f462336
Update onyx
hannojg Aug 2, 2023
8558d74
fix resetting IOU on new request
hannojg Aug 2, 2023
cd62597
remove IOU with invalid data from initial values
hannojg Aug 2, 2023
c022440
Merge branch 'main' of github.com:Expensify/App into reapply-onyx-upg…
hannojg Aug 2, 2023
79c8565
Merge branch 'main' of github.com:Expensify/App into reapply-onyx-upg…
hannojg Aug 4, 2023
cb43f6b
Merge branch 'main' of github.com:Expensify/App into reapply-onyx-upg…
hannojg Aug 7, 2023
a3e0e82
update onyx
hannojg Aug 7, 2023
1c92993
fix issue with doubling IOU request
hannojg Aug 7, 2023
0a230de
add missing semicolon
hannojg Aug 7, 2023
54ef4ef
Merge branch 'main' of github.com:margelo/expensify-app-fork into rea…
hannojg Aug 10, 2023
8b0443a
Merge branch 'main' of github.com:Expensify/App into reapply-onyx-upg…
hannojg Aug 13, 2023
f28bf18
fix crashes navigating back and forth in IOU pages
hannojg Aug 14, 2023
6f9da52
remove hiding keyboard
hannojg Aug 14, 2023
53323f0
Merge branch 'main' of github.com:Expensify/App into reapply-onyx-upg…
hannojg Aug 14, 2023
b0d81a4
fix: leave auto focus logic to input component
hannojg Aug 15, 2023
f780e0b
Remove various deferred navigation logic
marcaaron Aug 17, 2023
871faf6
Commit other changes
marcaaron Aug 17, 2023
08a97a5
Merge branch 'main' into marcaaron-reapply-onyx-upgrade-use-cache-wit…
marcaaron Aug 17, 2023
f4d84b7
Merge branch 'main' into marcaaron-reapply-onyx-upgrade-use-cache-wit…
marcaaron Aug 17, 2023
1fd07e3
Bump Onyx version
marcaaron Aug 17, 2023
005aa4d
Remove other unneeded things
marcaaron Aug 17, 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
16 changes: 7 additions & 9 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,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.52",
"react-native-onyx": "1.0.61",
"react-native-pager-view": "^6.2.0",
"react-native-pdf": "^6.6.2",
"react-native-performance": "^4.0.0",
Expand Down
6 changes: 1 addition & 5 deletions src/components/EmojiPicker/EmojiPicker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {useState, useEffect, useRef, forwardRef, useImperativeHandle} from 'react';
import {Dimensions, Keyboard} from 'react-native';
import {Dimensions} from 'react-native';
import _ from 'underscore';
import EmojiPickerMenu from './EmojiPickerMenu';
import CONST from '../../CONST';
Expand Down Expand Up @@ -119,10 +119,6 @@ const EmojiPicker = forwardRef((props, ref) => {
useImperativeHandle(ref, () => ({showEmojiPicker, isActiveReportAction, hideEmojiPicker, isEmojiPickerVisible, resetEmojiPopoverAnchor}));

useEffect(() => {
if (isEmojiPickerVisible) {
Keyboard.dismiss();
}

const emojiPopoverDimensionListener = Dimensions.addEventListener('change', () => {
if (!emojiPopoverAnchor.current) {
// In small screen width, the window size change might be due to keyboard open/hide, we should avoid hide EmojiPicker in those cases
Expand Down
1 change: 0 additions & 1 deletion src/components/Form.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ const defaultProps = {
isSubmitButtonVisible: true,
formState: {
isLoading: false,
errors: null,
},
draftValues: {},
enabledWhenOffline: false,
Expand Down
14 changes: 2 additions & 12 deletions src/components/OptionsSelector/BaseOptionsSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,6 @@ class BaseOptionsSelector extends Component {
);

this.scrollToIndex(this.props.selectedOptions.length ? 0 : this.state.focusedIndex, false);

if (!this.props.autoFocus) {
return;
}

if (this.props.shouldShowTextInput) {
if (this.props.shouldDelayFocus) {
this.focusTimeout = setTimeout(() => this.textInput.focus(), CONST.ANIMATED_TRANSITION);
} else {
this.textInput.focus();
}
}
}

componentDidUpdate(prevProps) {
Expand Down Expand Up @@ -339,6 +327,8 @@ class BaseOptionsSelector extends Component {
selectTextOnFocus
blurOnSubmit={Boolean(this.state.allOptions.length)}
spellCheck={false}
autoFocus={this.props.autoFocus}
shouldDelayFocus={this.props.shouldDelayFocus}
/>
);
const optionsList = (
Expand Down
1 change: 1 addition & 0 deletions src/libs/actions/IOU.js
Original file line number Diff line number Diff line change
Expand Up @@ -1596,6 +1596,7 @@ function createEmptyTransaction() {
function navigateToNextPage(iou, iouType, reportID, report) {
const moneyRequestID = `${iouType}${reportID}`;
const shouldReset = iou.id !== moneyRequestID;

// If the money request ID in Onyx does not match the ID from params, we want to start a new request
// with the ID from params. We need to clear the participants in case the new request is initiated from FAB.
if (shouldReset) {
Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/QueuedOnyxUpdates.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Onyx.connect({
* @returns {Promise}
*/
function queueOnyxUpdates(updates) {
return Onyx.merge(ONYXKEYS.QUEUED_ONYX_UPDATES, updates);
return Onyx.set(ONYXKEYS.QUEUED_ONYX_UPDATES, [...queuedOnyxUpdates, ...updates]);
}

function clear() {
Expand Down
Loading