From bafb9eea4baa5b5cff105da935ea7f8b69d87f14 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 31 Mar 2022 12:06:21 -0700 Subject: [PATCH 1/2] Merge pull request #8414 from Expensify/version-BUILD-56a4f5a693d7b9cf829c8c7639345b5cbde8377e Update version to 1.1.49-1 on main (cherry picked from commit d3e6376a473835afc049e736337723db5c8a7235) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d225dd56993d..4db5b8484aee 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -152,8 +152,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001014900 - versionName "1.1.49-0" + versionCode 1001014901 + versionName "1.1.49-1" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 75e725ef532d..c64aa11abc37 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.49.0 + 1.1.49.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 47356b75aef0..24e64feb7997 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.49.0 + 1.1.49.1 diff --git a/package-lock.json b/package-lock.json index 4df3ccca0171..432e83ff16ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.49-0", + "version": "1.1.49-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8bf249b3ca1e..b5fcca5f5a4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.49-0", + "version": "1.1.49-1", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From eb3ab4299952c039404412ea8a92a1f87875a177 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Thu, 31 Mar 2022 12:54:05 -0600 Subject: [PATCH 2/2] Merge pull request #8412 from Expensify/marcaaron-revertRajatChanges Revert changes related to #7623 (cherry picked from commit 56a4f5a693d7b9cf829c8c7639345b5cbde8377e) --- .storybook/preview.js | 2 -- __mocks__/MockNavigationProvider.js | 24 ------------------------ src/components/Button.js | 8 ++------ src/pages/RequestCallPage.js | 1 - 4 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 __mocks__/MockNavigationProvider.js diff --git a/.storybook/preview.js b/.storybook/preview.js index f02e3938d182..65508e6bed71 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -6,7 +6,6 @@ import HTMLEngineProvider from '../src/components/HTMLEngineProvider'; import OnyxProvider from '../src/components/OnyxProvider'; import {LocaleContextProvider} from '../src/components/withLocalize'; import ONYXKEYS from '../src/ONYXKEYS'; -import MockNavigationProvider from '../__mocks__/MockNavigationProvider'; Onyx.init({ keys: ONYXKEYS, @@ -19,7 +18,6 @@ const decorators = [ OnyxProvider, LocaleContextProvider, HTMLEngineProvider, - MockNavigationProvider, ]} > diff --git a/__mocks__/MockNavigationProvider.js b/__mocks__/MockNavigationProvider.js deleted file mode 100644 index 67d4790f6b89..000000000000 --- a/__mocks__/MockNavigationProvider.js +++ /dev/null @@ -1,24 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import {NavigationContext} from '@react-navigation/native'; - -const propTypes = { - /** Rendered child component */ - children: PropTypes.node.isRequired, -}; - -const MockNavigationProvider = props => ( - true, - addListener: () => {}, - removeListener: () => {}, - }} - > - {props.children} - -); - -MockNavigationProvider.propTypes = propTypes; - -export default MockNavigationProvider; diff --git a/src/components/Button.js b/src/components/Button.js index 526ba00cd993..d192c43f7738 100644 --- a/src/components/Button.js +++ b/src/components/Button.js @@ -1,7 +1,6 @@ import React, {Component} from 'react'; import {Pressable, ActivityIndicator, View} from 'react-native'; import PropTypes from 'prop-types'; -import {withNavigationFocus} from '@react-navigation/compat'; import styles from '../styles/styles'; import themeColors from '../styles/themes/default'; import OpacityView from './OpacityView'; @@ -81,9 +80,6 @@ const propTypes = { /** Should enable the haptic feedback? */ shouldEnableHapticFeedback: PropTypes.bool, - - /** Whether Button is on active screen */ - isFocused: PropTypes.bool.isRequired, }; const defaultProps = { @@ -128,7 +124,7 @@ class Button extends Component { // Setup and attach keypress handler for pressing the button with Enter key this.unsubscribe = KeyboardShortcut.subscribe(shortcutConfig.shortcutKey, (e) => { - if (!this.props.isFocused || this.props.isDisabled || this.props.isLoading || (e && e.target.nodeName === 'TEXTAREA')) { + if (this.props.isDisabled || this.props.isLoading || (e && e.target.nodeName === 'TEXTAREA')) { return; } this.props.onPress(); @@ -243,4 +239,4 @@ class Button extends Component { Button.propTypes = propTypes; Button.defaultProps = defaultProps; -export default withNavigationFocus(Button); +export default Button; diff --git a/src/pages/RequestCallPage.js b/src/pages/RequestCallPage.js index 56c93bc42f77..84504769a867 100644 --- a/src/pages/RequestCallPage.js +++ b/src/pages/RequestCallPage.js @@ -311,7 +311,6 @@ class RequestCallPage extends Component { )}