From 7365dc36478d6fcf6bd4376ce8d7582d38802a01 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 12 Jul 2021 15:28:00 -0700
Subject: [PATCH 1/2] Merge pull request #3990 from
 Expensify/version-BUILD-bb042f5810d4861abdc59b42177348d86233390f

(cherry picked from commit 5b90ea6638788d9f9b5fed52bef4961d17e07c11)
---
 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 77993f699b9f..d09f167b777e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001007700
-        versionName "1.0.77-0"
+        versionCode 1001007701
+        versionName "1.0.77-1"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index b82035c98fe4..7cb33316c03d 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.77.0</string>
+	<string>1.0.77.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index f8e8e19a9d3d..1799afe57673 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.77.0</string>
+	<string>1.0.77.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index f1601bc4657d..5268181d5c86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.77-0",
+  "version": "1.0.77-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6288ed1701f7..b2ae56e4c99c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.77-0",
+  "version": "1.0.77-1",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 4885078331b8d9648f783a3c1e4134ca9c4bdf52 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 12 Jul 2021 16:25:35 -0600
Subject: [PATCH 2/2] Merge pull request #3989 from
 Expensify/Rory-FixMobileInviteForm

Make button visible in WorkspaceInvitePage

(cherry picked from commit bb042f5810d4861abdc59b42177348d86233390f)
---
 src/pages/workspace/WorkspaceInvitePage.js | 96 +++++++++++-----------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js
index 0fbf26c490fa..8a6e47a66203 100644
--- a/src/pages/workspace/WorkspaceInvitePage.js
+++ b/src/pages/workspace/WorkspaceInvitePage.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {TextInput, View} from 'react-native';
+import {ScrollView, TextInput, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import Str from 'expensify-common/lib/str';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
@@ -17,6 +17,8 @@ import TextLink from '../../components/TextLink';
 import getEmailKeyboardType from '../../libs/getEmailKeyboardType';
 import themeColors from '../../styles/themes/default';
 import Growl from '../../libs/Growl';
+import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
+import FixedFooter from '../../components/FixedFooter';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -83,51 +85,53 @@ class WorkspaceInvitePage extends React.Component {
     render() {
         return (
             <ScreenWrapper>
-                <HeaderWithCloseButton
-                    title={this.props.translate('workspace.invite.invitePeople')}
-                    onCloseButtonPress={Navigation.dismissModal}
-                />
-                <View style={[styles.p5, styles.flex1, styles.overflowAuto]}>
-                    <View style={styles.flexGrow1}>
-                        <Text style={[styles.mb6]}>
-                            {this.props.translate('workspace.invite.invitePeoplePrompt')}
-                        </Text>
-                        <View style={styles.mb6}>
-                            <Text style={[styles.mb2]}>
-                                {this.props.translate('workspace.invite.enterEmailOrPhone')}
+                <KeyboardAvoidingView>
+                    <HeaderWithCloseButton
+                        title={this.props.translate('workspace.invite.invitePeople')}
+                        onCloseButtonPress={Navigation.dismissModal}
+                    />
+                    <ScrollView style={[styles.p5, styles.flex1, styles.overflowAuto]}>
+                        <View style={styles.flexGrow1}>
+                            <Text style={[styles.mb6]}>
+                                {this.props.translate('workspace.invite.invitePeoplePrompt')}
                             </Text>
-                            <TextInput
-                                autoCompleteType="email"
-                                autoCorrect={false}
-                                autoCapitalize="none"
-                                style={[styles.textInput]}
-                                value={this.state.emailOrPhone}
-                                keyboardType={getEmailKeyboardType()}
-                                onChangeText={text => this.setState({emailOrPhone: 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>
                         </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>
-                    </View>
-                    <View style={styles.flexGrow0}>
+                    </ScrollView>
+                    <FixedFooter style={[styles.flexGrow0]}>
                         <Button
                             success
                             style={[styles.mb2]}
@@ -135,8 +139,8 @@ class WorkspaceInvitePage extends React.Component {
                             text={this.props.translate('common.invite')}
                             onPress={this.inviteUser}
                         />
-                    </View>
-                </View>
+                    </FixedFooter>
+                </KeyboardAvoidingView>
             </ScreenWrapper>
         );
     }