From ef9b14592940fef3cd7c4923799c642e0ec3f39c Mon Sep 17 00:00:00 2001 From: Jasper Huang Date: Tue, 26 Jul 2022 11:03:27 -0700 Subject: [PATCH 1/2] fix revert --- src/components/ScreenWrapper.js | 60 +--- src/pages/AddPersonalBankAccountPage.js | 117 +++---- .../EnablePayments/AdditionalDetailsStep.js | 250 +++++++------- .../EnablePayments/EnablePaymentsPage.js | 15 +- src/pages/GetAssistancePage.js | 59 ++-- src/pages/NewChatPage.js | 5 +- .../ReimbursementAccountPage.js | 55 +-- src/pages/RequestCallPage.js | 157 ++++----- src/pages/home/ReportScreen.js | 87 ++--- src/pages/home/report/ReportActionCompose.js | 2 +- src/pages/iou/IOUCurrencySelection.js | 29 +- src/pages/iou/IOUModal.js | 7 +- src/pages/settings/AddSecondaryLoginPage.js | 109 +++--- src/pages/settings/PasswordPage.js | 155 ++++----- .../settings/Payments/AddDebitCardPage.js | 159 ++++----- .../settings/Payments/AddPayPalMePage.js | 73 ++-- .../Payments/ChooseTransferAccountPage.js | 45 +-- .../Payments/PaymentsPage/BasePaymentsPage.js | 313 +++++++++--------- .../settings/Payments/TransferBalancePage.js | 179 +++++----- src/pages/settings/Profile/ProfilePage.js | 179 +++++----- .../settings/Security/CloseAccountPage.js | 145 ++++---- src/pages/workspace/WorkspaceInvitePage.js | 5 +- src/pages/workspace/WorkspaceNewRoomPage.js | 89 ++--- .../workspace/WorkspacePageWithSections.js | 57 ++-- src/styles/styles.js | 8 - 25 files changed, 1192 insertions(+), 1167 deletions(-) diff --git a/src/components/ScreenWrapper.js b/src/components/ScreenWrapper.js index 9167c7cc2dd7..bc6a416dbd01 100644 --- a/src/components/ScreenWrapper.js +++ b/src/components/ScreenWrapper.js @@ -1,7 +1,7 @@ import _ from 'underscore'; import React from 'react'; import PropTypes from 'prop-types'; -import {View, KeyboardAvoidingView} from 'react-native'; +import {View} from 'react-native'; import {SafeAreaInsetsContext} from 'react-native-safe-area-context'; import {withOnyx} from 'react-native-onyx'; import styles from '../styles/styles'; @@ -15,10 +15,6 @@ import compose from '../libs/compose'; import ONYXKEYS from '../ONYXKEYS'; import CONST from '../CONST'; import withNavigation from './withNavigation'; -import withWindowDimensions from './withWindowDimensions'; -import OfflineIndicator from './OfflineIndicator'; -import {withNetwork} from './OnyxProvider'; -import networkPropTypes from './networkPropTypes'; const propTypes = { /** Array of additional styles to add */ @@ -39,13 +35,6 @@ const propTypes = { // Called when navigated Screen's transition is finished. onTransitionEnd: PropTypes.func, - /** Is the window width narrow, like on a mobile device */ - isSmallScreenWidth: PropTypes.bool.isRequired, - - /** The behavior to pass to the KeyboardAvoidingView, requires some trial and error depending on the layout/devices used. - * Search 'switch(behavior)' in ./node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js for more context */ - keyboardAvoidingViewBehavior: PropTypes.oneOf(['padding', 'height', 'position']), - // react-navigation navigation object available to screen components navigation: PropTypes.shape({ // Method to attach listener to Navigation state. @@ -58,9 +47,6 @@ const propTypes = { willAlertModalBecomeVisible: PropTypes.bool, }), - /** Information about the network */ - network: networkPropTypes.isRequired, - }; const defaultProps = { @@ -72,7 +58,6 @@ const defaultProps = { addListener: () => {}, }, modal: {}, - keyboardAvoidingViewBehavior: 'padding', }; class ScreenWrapper extends React.Component { @@ -120,36 +105,27 @@ class ScreenWrapper extends React.Component { paddingStyle.paddingTop = paddingTop; } - // We always need the safe area padding bottom if we're showing the offline indicator since it is bottom-docked. - if (this.props.includePaddingBottom || this.props.network.isOffline) { + if (this.props.includePaddingBottom) { paddingStyle.paddingBottom = paddingBottom; } return ( - - - - {// If props.children is a function, call it to provide the insets to the children. - _.isFunction(this.props.children) - ? this.props.children({ - insets, - didScreenTransitionEnd: this.state.didScreenTransitionEnd, - }) - : this.props.children - } - - {this.props.isSmallScreenWidth && this.props.network.isOffline && ( - - - - )} - + + {// If props.children is a function, call it to provide the insets to the children. + _.isFunction(this.props.children) + ? this.props.children({ + insets, + didScreenTransitionEnd: this.state.didScreenTransitionEnd, + }) + : this.props.children + } + ); }} @@ -163,11 +139,9 @@ ScreenWrapper.defaultProps = defaultProps; export default compose( withNavigation, - withWindowDimensions, withOnyx({ modal: { key: ONYXKEYS.MODAL, }, }), - withNetwork(), )(ScreenWrapper); diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js index 6d6586fa1f0e..5a14ed6f7f45 100644 --- a/src/pages/AddPersonalBankAccountPage.js +++ b/src/pages/AddPersonalBankAccountPage.js @@ -13,6 +13,7 @@ import AddPlaidBankAccount from '../components/AddPlaidBankAccount'; import getPlaidOAuthReceivedRedirectURI from '../libs/getPlaidOAuthReceivedRedirectURI'; import compose from '../libs/compose'; import ONYXKEYS from '../ONYXKEYS'; +import KeyboardAvoidingView from '../components/KeyboardAvoidingView'; import Text from '../components/Text'; import styles from '../styles/styles'; import Button from '../components/Button'; @@ -124,65 +125,67 @@ class AddPersonalBankAccountPage extends React.Component { return ( - - {success ? ( - <> - - {success} - - -