From 78da1ae0a876cd66928cbce85c8e3af8467791ec Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 21 Sep 2022 14:11:05 -0400
Subject: [PATCH 1/2] Merge pull request #11174 from
Expensify/version-BUILD-8A93EFBC-5477-4893-9761-1107F55A0240
Update version to 1.2.3-1 on main
(cherry picked from commit c27e289dc929d363c5b5ba20efa5af2bf2681904)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9f59017d2753..90b05049900c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001020300
- versionName "1.2.3-0"
+ versionCode 1001020301
+ versionName "1.2.3-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 33d546d95a50..2d07404f29d3 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.3.0
+ 1.2.3.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ed1115811875..18fcc5740c18 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.3.0
+ 1.2.3.1
diff --git a/package-lock.json b/package-lock.json
index a958ecb5b239..381654919375 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.3-0",
+ "version": "1.2.3-1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.3-0",
+ "version": "1.2.3-1",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index ab920aedd8ab..34cfaafd4c08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.3-0",
+ "version": "1.2.3-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 08efe34804329957021874780facc6b62eb2b803 Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Wed, 21 Sep 2022 12:04:20 -0600
Subject: [PATCH 2/2] Merge pull request #11173 from
Expensify/cmartins-fixOfflineError
Remove offline message from BaseOptionsSelector
(cherry picked from commit dffea9767db22725304ab1baa165bde8e3edb87d)
---
src/components/IOUConfirmationList.js | 1 -
.../OptionsSelector/BaseOptionsSelector.js | 18 +-----------------
.../optionsSelectorPropTypes.js | 4 ----
src/languages/en.js | 1 -
src/languages/es.js | 1 -
5 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index 33e8a668bd3d..fc63985dd19f 100755
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -351,7 +351,6 @@ class IOUConfirmationList extends Component {
forceTextUnreadStyle
autoFocus
shouldTextInputAppearBelowOptions
- shouldShowOfflineMessage
optionHoveredStyle={canModifyParticipants ? styles.hoveredComponentBG : {}}
footerContent={shouldShowSettlementButton
? (
diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index cbcb0faa415c..690e21b6b073 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -3,19 +3,15 @@ import lodashGet from 'lodash/get';
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import {View, findNodeHandle} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
import Button from '../Button';
import FixedFooter from '../FixedFooter';
import OptionsList from '../OptionsList';
-import Text from '../Text';
-import compose from '../../libs/compose';
import CONST from '../../CONST';
import styles from '../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import TextInput from '../TextInput';
import ArrowKeyFocusManager from '../ArrowKeyFocusManager';
import KeyboardShortcut from '../../libs/KeyboardShortcut';
-import ONYXKEYS from '../../ONYXKEYS';
import FullScreenLoadingIndicator from '../FullscreenLoadingIndicator';
import {propTypes as optionsSelectorPropTypes, defaultProps as optionsSelectorDefaultProps} from './optionsSelectorPropTypes';
@@ -301,11 +297,6 @@ class BaseOptionsSelector extends Component {
{shouldShowFooter && (
- {this.props.shouldShowOfflineMessage && this.props.network.isOffline && (
-
- {this.props.translate('session.offlineMessage')}
-
- )}
{shouldShowDefaultConfirmButton && (