Merge pull request #8890 from Expensify/sketchydroide-cherry-pick-sta…

…ging-8882

🍒 Cherry pick PR #8882 to staging 🍒

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015704
-        versionName "1.1.57-4"
+        versionCode 1001015706
+        versionName "1.1.57-6"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.4</string>
+	<string>1.1.57.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.4</string>
+	<string>1.1.57.6</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-4",
+  "version": "1.1.57-6",
   "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.",

src/pages/workspace/WorkspaceInitialPage.js

@@ -6,7 +6,8 @@ import ROUTES from '../../ROUTES';
 import styles from '../../styles/styles';
 import Tooltip from '../../components/Tooltip';
 import Text from '../../components/Text';
-import ConfirmModal from '../../components/ConfirmModal';
+
+// import ConfirmModal from '../../components/ConfirmModal';
 import Icon from '../../components/Icon';
 import * as Expensicons from '../../components/Icon/Expensicons';
 import ScreenWrapper from '../../components/ScreenWrapper';
@@ -37,7 +38,7 @@ class WorkspaceInitialPage extends React.Component {
         this.confirmDeleteAndHideModal = this.confirmDeleteAndHideModal.bind(this);
 
         this.state = {
-            isDeleteModalOpen: false,
+            // isDeleteModalOpen: false,
         };
     }
 
@@ -52,8 +53,9 @@ class WorkspaceInitialPage extends React.Component {
      * Toggle delete confirm modal visibility
      * @param {Boolean} shouldOpen
      */
+    // eslint-disable-next-line
     toggleDeleteModal(shouldOpen) {
-        this.setState({isDeleteModalOpen: shouldOpen});
+        // this.setState({isDeleteModalOpen: shouldOpen});
     }
 
     /**
@@ -131,7 +133,8 @@ class WorkspaceInitialPage extends React.Component {
                         }, {
                             icon: Expensicons.Trashcan,
                             text: this.props.translate('workspace.common.delete'),
-                            onSelected: () => this.setState({isDeleteModalOpen: true}),
+
+                            // onSelected: () => this.setState({isDeleteModalOpen: true}),
                         },
                     ]}
                     threeDotsAnchorPosition={styles.threeDotsPopoverOffset}
@@ -204,6 +207,7 @@ class WorkspaceInitialPage extends React.Component {
                         ))}
                     </View>
                 </ScrollView>
+                {/* TODO: this is to test something in staging we are having a hard time figuring out in dev. Will revert once we test on staging - More details in https://github.com/Expensify/App/issues/8791
                 <ConfirmModal
                     title={this.props.translate('workspace.common.delete')}
                     isVisible={this.state.isDeleteModalOpen}
@@ -213,7 +217,8 @@ class WorkspaceInitialPage extends React.Component {
                     confirmText={this.props.translate('common.delete')}
                     cancelText={this.props.translate('common.cancel')}
                     danger
-                />
+                >
+                */}
             </ScreenWrapper>
         );
     }