From 4849e38a6a27a5140d8570eea445e3b43f64a895 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 16 Jul 2021 12:37:15 -0700
Subject: [PATCH 1/2] Merge pull request #4124 from
 Expensify/version-BUILD-92fd456846907b28ef5270d6d284ce1deceb98b8

(cherry picked from commit fc965f68d308167d19d00a29b91e85ca33707882)
---
 android/app/build.gradle          | 4 ++--
 ios/ExpensifyCash/Info.plist      | 2 +-
 ios/ExpensifyCashTests/Info.plist | 2 +-
 package-lock.json                 | 2 +-
 package.json                      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index c9dbe247a35d..fd1c17438c33 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001007900
-        versionName "1.0.79-0"
+        versionCode 1001007901
+        versionName "1.0.79-1"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 343260331f24..2f023b073f2c 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.79.0</string>
+	<string>1.0.79.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index f836b53a0441..2ef90f227082 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.79.0</string>
+	<string>1.0.79.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 2965e000a6d3..2f87199e63bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.79-0",
+  "version": "1.0.79-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 2a8ad1bb9208..cc972d8accbe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.79-0",
+  "version": "1.0.79-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 8301c521c82da12029d26bd069e4ee239d33792b Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Fri, 16 Jul 2021 13:35:01 -0600
Subject: [PATCH 2/2] Merge pull request #4117 from Expensify/tgolen-fix-fields

[CP Staging] Remove duplicate form fields

(cherry picked from commit 92fd456846907b28ef5270d6d284ce1deceb98b8)
---
 src/pages/workspace/WorkspaceInvitePage.js | 43 +++++-----------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js
index c4d96005e949..764362bf60c4 100644
--- a/src/pages/workspace/WorkspaceInvitePage.js
+++ b/src/pages/workspace/WorkspaceInvitePage.js
@@ -98,40 +98,15 @@ class WorkspaceInvitePage extends React.Component {
                             <Text style={[styles.mb2]}>
                                 {this.props.translate('workspace.invite.enterEmailOrPhone')}
                             </Text>
-                            <View style={styles.mb6}>
-                                <Text style={[styles.mb2]}>
-                                    {this.props.translate('workspace.invite.enterEmailOrPhone')}
-                                </Text>
-                                <TextInput
-                                    autoCompleteType="email"
-                                    autoCorrect={false}
-                                    autoCapitalize="none"
-                                    style={[styles.textInput]}
-                                    value={this.state.emailOrPhone}
-                                    keyboardType={getEmailKeyboardType()}
-                                    onChangeText={text => this.setState({emailOrPhone: text})}
-                                />
-                            </View>
-                            <View style={styles.mb6}>
-                                <Text style={[styles.mb2]}>
-                                    {this.props.translate('workspace.invite.personalMessagePrompt')}
-                                </Text>
-                                <TextInput
-                                    autoCompleteType="off"
-                                    autoCorrect={false}
-                                    style={[styles.textInput, styles.workspaceInviteWelcome, styles.mb6]}
-                                    numberOfLines={10}
-                                    textAlignVertical="top"
-                                    multiline
-                                    value={this.state.welcomeNote}
-                                    placeholder={this.getWelcomeNotePlaceholder()}
-                                    placeholderTextColor={themeColors.placeholderText}
-                                    onChangeText={text => this.setState({welcomeNote: text})}
-                                />
-                                <TextLink href="https://use.expensify.com/privacy">
-                                    {this.props.translate('common.privacy')}
-                                </TextLink>
-                            </View>
+                            <TextInput
+                                autoCompleteType="email"
+                                autoCorrect={false}
+                                autoCapitalize="none"
+                                style={[styles.textInput]}
+                                value={this.state.emailOrPhone}
+                                keyboardType={getEmailKeyboardType()}
+                                onChangeText={text => this.setState({emailOrPhone: text})}
+                            />
                         </View>
                         <View style={styles.mb6}>
                             <Text style={[styles.mb2]}>