From 1504a3e9bc0d0c33c228edeb57fda7367231f992 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Thu, 8 Jun 2023 21:56:00 +0530 Subject: [PATCH 01/14] Added shouldShowOfflineIndicator default props --- src/components/ScreenWrapper/propTypes.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/ScreenWrapper/propTypes.js b/src/components/ScreenWrapper/propTypes.js index a82fb3b9e507..4e334a03013a 100644 --- a/src/components/ScreenWrapper/propTypes.js +++ b/src/components/ScreenWrapper/propTypes.js @@ -41,6 +41,9 @@ const propTypes = { ...windowDimensionsPropTypes, ...environmentPropTypes, + + /** Whether to show offline indicator */ + shouldShowOfflineIndicator: PropTypes.bool, }; const defaultProps = { @@ -53,6 +56,7 @@ const defaultProps = { keyboardAvoidingViewBehavior: 'padding', shouldEnableMaxHeight: false, shouldEnablePickerAvoiding: true, + shouldShowOfflineIndicator: true, }; export {propTypes, defaultProps}; From e586701a4edf2aee21bdb5d540d1bb4d83cf7232 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Thu, 8 Jun 2023 22:19:07 +0530 Subject: [PATCH 02/14] added props to component to display or not --- src/components/ScreenWrapper/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js index 95677a49570d..11c3dca58baf 100644 --- a/src/components/ScreenWrapper/index.js +++ b/src/components/ScreenWrapper/index.js @@ -144,7 +144,7 @@ class ScreenWrapper extends React.Component { }) : this.props.children } - {this.props.isSmallScreenWidth && } + {this.props.isSmallScreenWidth && this.props.shouldShowOfflineIndicator && } From 8f6e3363f68ad93b9dde6cf9e54b93b9d01a9bc6 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Thu, 8 Jun 2023 22:27:17 +0530 Subject: [PATCH 03/14] added on plaid step --- src/pages/ReimbursementAccount/BankAccountPlaidStep.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js index 3af673084976..8692198053d7 100644 --- a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js +++ b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js @@ -83,6 +83,7 @@ class BankAccountPlaidStep extends React.Component { Date: Thu, 8 Jun 2023 22:27:42 +0530 Subject: [PATCH 04/14] added on personal bank account --- src/pages/AddPersonalBankAccountPage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js index 8e9e067957c3..b23f706d4481 100644 --- a/src/pages/AddPersonalBankAccountPage.js +++ b/src/pages/AddPersonalBankAccountPage.js @@ -88,6 +88,7 @@ class AddPersonalBankAccountPage extends React.Component { Date: Thu, 8 Jun 2023 22:59:30 +0530 Subject: [PATCH 05/14] added on OnfidoStep --- src/pages/ReimbursementAccount/RequestorOnfidoStep.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js index aad5def99518..5d91f5dae562 100644 --- a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js +++ b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js @@ -41,7 +41,10 @@ class RequestorOnfidoStep extends React.Component { render() { return ( - + Date: Thu, 8 Jun 2023 23:25:07 +0530 Subject: [PATCH 06/14] added on Reimbursement --- src/components/ReimbursementAccountLoadingIndicator.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/ReimbursementAccountLoadingIndicator.js b/src/components/ReimbursementAccountLoadingIndicator.js index a110d3c747ba..64646c6e3983 100644 --- a/src/components/ReimbursementAccountLoadingIndicator.js +++ b/src/components/ReimbursementAccountLoadingIndicator.js @@ -23,7 +23,10 @@ const propTypes = { }; const ReimbursementAccountLoadingIndicator = (props) => ( - + Date: Thu, 8 Jun 2023 23:25:46 +0530 Subject: [PATCH 07/14] added on WalletStatmentPage: --- src/pages/wallet/WalletStatementPage.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/wallet/WalletStatementPage.js b/src/pages/wallet/WalletStatementPage.js index c9ef84711016..9b0828d1da57 100644 --- a/src/pages/wallet/WalletStatementPage.js +++ b/src/pages/wallet/WalletStatementPage.js @@ -93,7 +93,10 @@ class WalletStatementPage extends React.Component { const url = `${CONFIG.EXPENSIFY.EXPENSIFY_URL}statement.php?period=${this.yearMonth}`; return ( - + Date: Thu, 8 Jun 2023 23:28:57 +0530 Subject: [PATCH 08/14] added on CodesPage --- src/pages/settings/Security/TwoFactorAuth/CodesPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Security/TwoFactorAuth/CodesPage.js b/src/pages/settings/Security/TwoFactorAuth/CodesPage.js index 02911676d430..57057c17cff5 100644 --- a/src/pages/settings/Security/TwoFactorAuth/CodesPage.js +++ b/src/pages/settings/Security/TwoFactorAuth/CodesPage.js @@ -56,7 +56,7 @@ function CodesPage(props) { }, []); return ( - + Date: Thu, 8 Jun 2023 23:30:08 +0530 Subject: [PATCH 09/14] added on VerifyPage --- src/pages/settings/Security/TwoFactorAuth/VerifyPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js index d3a53a0a03be..644ff14f6ea8 100644 --- a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js +++ b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.js @@ -91,7 +91,7 @@ function VerifyPage(props) { } return ( - + Date: Thu, 8 Jun 2023 23:32:29 +0530 Subject: [PATCH 10/14] added on SuccesPage --- src/pages/settings/Security/TwoFactorAuth/SuccessPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Security/TwoFactorAuth/SuccessPage.js b/src/pages/settings/Security/TwoFactorAuth/SuccessPage.js index a44342ea27b0..e3608b43685e 100644 --- a/src/pages/settings/Security/TwoFactorAuth/SuccessPage.js +++ b/src/pages/settings/Security/TwoFactorAuth/SuccessPage.js @@ -12,7 +12,7 @@ const defaultProps = {}; function SuccessPage(props) { return ( - + Date: Thu, 8 Jun 2023 23:32:44 +0530 Subject: [PATCH 11/14] added on DisablePage --- src/pages/settings/Security/TwoFactorAuth/DisablePage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Security/TwoFactorAuth/DisablePage.js b/src/pages/settings/Security/TwoFactorAuth/DisablePage.js index 5f996378c5f0..1369c4d13e65 100644 --- a/src/pages/settings/Security/TwoFactorAuth/DisablePage.js +++ b/src/pages/settings/Security/TwoFactorAuth/DisablePage.js @@ -25,7 +25,7 @@ function DisablePage(props) { }, []); return ( - + Navigation.goBack(ROUTES.SETTINGS_SECURITY)} From 819ab5adb4e88800796bc701f39a69ef3233d9dc Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Thu, 15 Jun 2023 18:14:03 +0530 Subject: [PATCH 12/14] Added FullPageOfflineBlockingView to plaid --- src/components/AddPlaidBankAccount.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js index 4725d607ec64..4739e9ed1f12 100644 --- a/src/components/AddPlaidBankAccount.js +++ b/src/components/AddPlaidBankAccount.js @@ -197,7 +197,7 @@ class AddPlaidBankAccount extends React.Component { // Plaid bank accounts view return ( - + {!_.isEmpty(this.props.text) && {this.props.text}} - + ); } } From 07c7103241bdbea87c7ad6476214ec04d1c07a8d Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Sat, 17 Jun 2023 00:31:13 +0530 Subject: [PATCH 13/14] OfflineIndicator position fix --- src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js index 5eabd74be80c..74b7ff70cae9 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js @@ -377,7 +377,7 @@ class ReimbursementAccountPage extends React.Component { subtitle={policyName} onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} /> - {errorComponent} + {errorComponent} ); } From ef6315761a8bea284b4b3c910fde52fbdeeef123 Mon Sep 17 00:00:00 2001 From: dhairyasenjaliya Date: Sat, 17 Jun 2023 01:11:04 +0530 Subject: [PATCH 14/14] OfflineIndicator position bottom with scrollview --- src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js index 74b7ff70cae9..848cf0937d5a 100644 --- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js +++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js @@ -3,7 +3,7 @@ import lodashGet from 'lodash/get'; import React from 'react'; import {withOnyx} from 'react-native-onyx'; import Str from 'expensify-common/lib/str'; -import {View} from 'react-native'; +import {View, ScrollView} from 'react-native'; import PropTypes from 'prop-types'; import ScreenWrapper from '../../components/ScreenWrapper'; import * as BankAccounts from '../../libs/actions/BankAccounts'; @@ -377,7 +377,7 @@ class ReimbursementAccountPage extends React.Component { subtitle={policyName} onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)} /> - {errorComponent} + {errorComponent} ); }