Merge pull request #14434 from Expensify/update-staging-from-main

Update version to 1.2.57-2 on staging
Expensify · Jan 20, 2023 · 21fccb7 · 21fccb7
2 parents 787a201 + c0f3316
commit 21fccb7
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 25 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001025701
-        versionName "1.2.57-1"
+        versionCode 1001025702
+        versionName "1.2.57-2"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.57.1</string>
+	<string>1.2.57.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.57.1</string>
+	<string>1.2.57.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.57-1",
+  "version": "1.2.57-2",
   "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.",

diff --git a/src/components/ButtonWithMenu.js b/src/components/ButtonWithMenu.js
@@ -43,7 +43,7 @@ class ButtonWithMenu extends PureComponent {
         super(props);
 
         this.state = {
-            selectedItem: props.options[0],
+            selectedItemIndex: 0,
             isMenuVisible: false,
         };
     }
@@ -53,15 +53,15 @@ class ButtonWithMenu extends PureComponent {
     }
 
     render() {
-        const selectedItemText = this.state.selectedItem.text;
+        const selectedItem = this.props.options[this.state.selectedItemIndex];
         return (
             <View>
                 {this.props.options.length > 1 ? (
                     <ButtonWithDropdown
-                        buttonText={selectedItemText}
+                        buttonText={selectedItem.text}
                         isLoading={this.props.isLoading}
                         isDisabled={this.props.isDisabled}
-                        onButtonPress={event => this.props.onPress(event, this.state.selectedItem.value)}
+                        onButtonPress={event => this.props.onPress(event, selectedItem.value)}
                         onDropdownPress={() => {
                             this.setMenuVisibility(true);
                         }}
@@ -72,7 +72,7 @@ class ButtonWithMenu extends PureComponent {
                         isDisabled={this.props.isDisabled}
                         style={[styles.w100]}
                         isLoading={this.props.isLoading}
-                        text={selectedItemText}
+                        text={selectedItem.text}
                         onPress={event => this.props.onPress(event, this.props.options[0].value)}
                         pressOnEnter
                     />
@@ -84,10 +84,10 @@ class ButtonWithMenu extends PureComponent {
                         onItemSelected={() => this.setMenuVisibility(false)}
                         anchorPosition={styles.createMenuPositionRightSidepane}
                         headerText={this.props.menuHeaderText}
-                        menuItems={_.map(this.props.options, item => ({
+                        menuItems={_.map(this.props.options, (item, index) => ({
                             ...item,
                             onSelected: () => {
-                                this.setState({selectedItem: item});
+                                this.setState({selectedItemIndex: index});
                             },
                         }))}
                     />

diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
@@ -101,16 +101,6 @@ class IOUConfirmationList extends Component {
             ...participant, selected: true,
         }));
 
-        this.splitOrRequestOptions = [{
-            text: props.translate(props.hasMultipleParticipants ? 'iou.split' : 'iou.request', {
-                amount: props.numberFormat(
-                    props.iouAmount,
-                    {style: 'currency', currency: props.iou.selectedCurrencyCode},
-                ),
-            }),
-            value: props.hasMultipleParticipants ? CONST.IOU.IOU_TYPE.SPLIT : CONST.IOU.IOU_TYPE.REQUEST,
-        }];
-
         this.state = {
             participants: formattedParticipants,
         };
@@ -119,6 +109,22 @@ class IOUConfirmationList extends Component {
         this.confirm = this.confirm.bind(this);
     }
 
+    /**
+     * Get the confirmation button options
+     * @returns {Array}
+     */
+    getSplitOrRequestOptions() {
+        return [{
+            text: this.props.translate(this.props.hasMultipleParticipants ? 'iou.split' : 'iou.request', {
+                amount: this.props.numberFormat(
+                    this.props.iouAmount,
+                    {style: 'currency', currency: this.props.iou.selectedCurrencyCode},
+                ),
+            }),
+            value: this.props.hasMultipleParticipants ? CONST.IOU.IOU_TYPE.SPLIT : CONST.IOU.IOU_TYPE.REQUEST,
+        }];
+    }
+
     /**
      * Get selected participants
      * @returns {Array}
@@ -309,7 +315,7 @@ class IOUConfirmationList extends Component {
                         <ButtonWithMenu
                             isDisabled={shouldDisableButton}
                             onPress={(_event, value) => this.confirm(value)}
-                            options={this.splitOrRequestOptions}
+                            options={this.getSplitOrRequestOptions()}
                         />
                     )}
             />