From f513a086728ae88c6a6bb98ec460617275e0afd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Thu, 17 Jun 2021 12:43:20 +0200
Subject: [PATCH 01/10] Remove code that won't ship in V1

---
 src/languages/en.js                     |  5 +-
 src/languages/es.js                     |  5 +-
 src/pages/workspace/NewWorkspacePage.js | 87 -------------------------
 3 files changed, 2 insertions(+), 95 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 74623a29a6f5..f9e1cf3f8526 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -370,11 +370,8 @@ export default {
         new: {
             welcome: 'Welcome',
             chooseAName: 'Choose a name',
-            helpText: 'Need help getting setup? Request a call below and we’ll have someone reach out to you.',
+            helpText: 'Name your Workspace before enabling your Expensify Cards!',
             getStarted: 'Get started!',
-            editPhoto: 'Edit Photo',
-            uploadPhoto: 'Upload Photo',
-            requestCall: 'Request a call',
         },
         invite: {
             invitePeople: 'Invite People',
diff --git a/src/languages/es.js b/src/languages/es.js
index d1e1d0e4e231..ed2b2de96e24 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -311,11 +311,8 @@ export default {
         new: {
             welcome: 'Bienvenido/a',
             chooseAName: 'Elige un nombre',
-            helpText: '¿Necesitas ayuda con la configuración? Pídenos una llamada y una persona de nuestro equipo te ayudará.',
+            helpText: '¡Dale un nombre a tu Workspace antes de activar tus Expensify Cards!',
             getStarted: '¡Empezar!',
-            uploadPhoto: 'Subir Foto',
-            editPhoto: 'Editar Foto',
-            requestCall: 'Concertar una llamada',
         },
         invite: {
             invitePeople: 'Invitar a la gente',
diff --git a/src/pages/workspace/NewWorkspacePage.js b/src/pages/workspace/NewWorkspacePage.js
index 3a70fa29a130..8410486d44aa 100644
--- a/src/pages/workspace/NewWorkspacePage.js
+++ b/src/pages/workspace/NewWorkspacePage.js
@@ -12,11 +12,6 @@ import styles from '../../styles/styles';
 import WorkspaceDefaultAvatar from '../../../assets/images/workspace-default-avatar.svg';
 import TextInputWithLabel from '../../components/TextInputWithLabel';
 import Button from '../../components/Button';
-import AttachmentPicker from '../../components/AttachmentPicker';
-import Icon from '../../components/Icon';
-import {DownArrow, Upload} from '../../components/Icon/Expensicons';
-import CreateMenu from '../../components/CreateMenu';
-import Switch from '../../components/Switch';
 import compose from '../../libs/compose';
 
 
@@ -32,38 +27,8 @@ class NewWorkspacePage extends React.Component {
         super(props);
 
         this.state = {
-            isEditPhotoMenuVisible: false,
             name: '',
-            requestCall: false,
         };
-
-        this.createMenuItems = this.createMenuItems.bind(this);
-    }
-
-    /**
-     * Create menu items list for avatar menu
-     *
-     * @param {Function} openPicker
-     * @returns {Array}
-     */
-    createMenuItems(openPicker) {
-        const menuItems = [
-            {
-                icon: Upload,
-                text: this.props.translate('workspace.new.uploadPhoto'),
-                onSelected: () => {
-                    openPicker({
-                        onPicked: () => {
-                            // TODO: connect with setWorkspaceAvatar function
-                        },
-                    });
-                },
-            },
-        ];
-
-        // TODO: Add option to remove avatar if the user doesn't like the one they chose.
-
-        return menuItems;
     }
 
     render() {
@@ -80,39 +45,8 @@ class NewWorkspacePage extends React.Component {
                 />
 
                 <View style={[styles.pageWrapper, styles.flex1]}>
-                    {/* TODO: replace this with the Avatar component once we connect it with the backend */}
                     <WorkspaceDefaultAvatar height={100} width={100} />
 
-                    <AttachmentPicker>
-                        {({openPicker}) => (
-                            <>
-                                <Button
-                                    style={[styles.alignSelfCenter, styles.mt3]}
-                                    onPress={() => this.setState({isEditPhotoMenuVisible: true})}
-                                    ContentComponent={() => (
-                                        <View style={[styles.flexRow]}>
-                                            <Icon src={DownArrow} />
-                                            <View style={styles.justifyContentCenter}>
-                                                <Text style={[styles.headerText, styles.ml2]}>
-                                                    {this.props.translate('workspace.new.editPhoto')}
-                                                </Text>
-                                            </View>
-                                        </View>
-                                    )}
-                                />
-                                <CreateMenu
-                                    isVisible={this.state.isEditPhotoMenuVisible}
-                                    onClose={() => this.setState({isEditPhotoMenuVisible: false})}
-                                    onItemSelected={() => this.setState({isEditPhotoMenuVisible: false})}
-                                    menuItems={this.createMenuItems(openPicker)}
-                                    anchorPosition={styles.createMenuPositionProfile}
-                                    animationIn="fadeInRight"
-                                    animationOut="fadeOutRight"
-                                />
-                            </>
-                        )}
-                    </AttachmentPicker>
-
                     <View style={[styles.mt6, styles.w100, styles.flex1]}>
                         <TextInputWithLabel
                             label={this.props.translate('workspace.new.chooseAName')}
@@ -120,27 +54,6 @@ class NewWorkspacePage extends React.Component {
                             onChangeText={name => this.setState({name})}
                         />
                         <Text style={[styles.mt6, styles.textP]}>{this.props.translate('workspace.new.helpText')}</Text>
-                        <View
-                            style={[
-                                styles.mt3,
-                                styles.flexRow,
-                                styles.mb6,
-                                styles.justifyContentBetween,
-                                styles.alignItemsCenter,
-                            ]}
-                        >
-                            <View style={styles.flex4}>
-                                <Text style={styles.textMicro}>
-                                    {this.props.translate('workspace.new.requestCall')}
-                                </Text>
-                            </View>
-                            <View style={[styles.flex1, styles.alignItemsEnd]}>
-                                <Switch
-                                    isOn={this.state.requestCall}
-                                    onToggle={requestCall => this.setState({requestCall})}
-                                />
-                            </View>
-                        </View>
                     </View>
 
                     <Button success style={[styles.w100]} text={this.props.translate('workspace.new.getStarted')} />

From 72536a078b20f9e08156f5eda2fb87df950176e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Thu, 17 Jun 2021 13:07:37 +0200
Subject: [PATCH 02/10] Update WorkspaceDefaultAvatar image to match the v1
 design

---
 assets/images/workspace-default-avatar.svg | 2 +-
 src/pages/workspace/NewWorkspacePage.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/images/workspace-default-avatar.svg b/assets/images/workspace-default-avatar.svg
index 6b17c170fdbe..e4166560724a 100644
--- a/assets/images/workspace-default-avatar.svg
+++ b/assets/images/workspace-default-avatar.svg
@@ -1 +1 @@
-<svg viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg"><rect x=".5" width="80" height="80" rx="40" fill="#C6C9CA"/><path d="M51.125 24.25h-20.25c-.675 0-1.125.45-1.125 1.125v31.5c0 .675.45 1.125 1.125 1.125h7.2v-7.875c0-.675.45-1.125 1.125-1.125h3.825c.675 0 1.125.45 1.125 1.125V58h7.2c.675 0 1.125-.45 1.125-1.125v-31.5c-.225-.675-.675-1.125-1.35-1.125zm-4.5 20.25h-11.25c-.675 0-1.125-.45-1.125-1.125s.45-1.125 1.125-1.125h11.25c.675 0 1.125.45 1.125 1.125S47.3 44.5 46.625 44.5zm0-6.75h-11.25c-.675 0-1.125-.45-1.125-1.125s.45-1.125 1.125-1.125h11.25c.675 0 1.125.45 1.125 1.125s-.45 1.125-1.125 1.125zm0-6.75h-11.25c-.675 0-1.125-.45-1.125-1.125s.45-1.125 1.125-1.125h11.25c.675 0 1.125.45 1.125 1.125S47.3 31 46.625 31z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg"><rect x=".5" width="80" height="80" rx="40" fill="#03d47c"/><path d="M51.125 24.25h-20.25c-.675 0-1.125.45-1.125 1.125v31.5c0 .675.45 1.125 1.125 1.125h7.2v-7.875c0-.675.45-1.125 1.125-1.125h3.825c.675 0 1.125.45 1.125 1.125V58h7.2c.675 0 1.125-.45 1.125-1.125v-31.5c-.225-.675-.675-1.125-1.35-1.125zm-4.5 20.25h-11.25c-.675 0-1.125-.45-1.125-1.125s.45-1.125 1.125-1.125h11.25c.675 0 1.125.45 1.125 1.125S47.3 44.5 46.625 44.5zm0-6.75h-11.25c-.675 0-1.125-.45-1.125-1.125s.45-1.125 1.125-1.125h11.25c.675 0 1.125.45 1.125 1.125s-.45 1.125-1.125 1.125zm0-6.75h-11.25c-.675 0-1.125-.45-1.125-1.125s.45-1.125 1.125-1.125h11.25c.675 0 1.125.45 1.125 1.125S47.3 31 46.625 31z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/src/pages/workspace/NewWorkspacePage.js b/src/pages/workspace/NewWorkspacePage.js
index 8410486d44aa..ce241c255a7a 100644
--- a/src/pages/workspace/NewWorkspacePage.js
+++ b/src/pages/workspace/NewWorkspacePage.js
@@ -45,7 +45,7 @@ class NewWorkspacePage extends React.Component {
                 />
 
                 <View style={[styles.pageWrapper, styles.flex1]}>
-                    <WorkspaceDefaultAvatar height={100} width={100} />
+                    <WorkspaceDefaultAvatar height={80} width={80} />
 
                     <View style={[styles.mt6, styles.w100, styles.flex1]}>
                         <TextInputWithLabel

From 54af3a7c76532c47128300091a5c56e238318ab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Thu, 17 Jun 2021 13:50:28 +0200
Subject: [PATCH 03/10] Add Policy_Create API call

---
 src/libs/API.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/libs/API.js b/src/libs/API.js
index 4a7e93120196..9fbdd374d9b4 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -929,6 +929,17 @@ function GetCurrencyList() {
     return Mobile_GetConstants({data: ['currencyList']});
 }
 
+/**
+ * @param {object} parameters
+ * @param {string} [parameters.type]
+ * @param {string} [parameters.policyName]
+ * @returns {Promise}
+ */
+function Policy_Create(parameters) {
+    const commandName = 'Policy_Create';
+    return Network.post(commandName, parameters);
+}
+
 export {
     Authenticate,
     BankAccount_Create,
@@ -978,4 +989,5 @@ export {
     Wallet_GetOnfidoSDKToken,
     GetPreferredCurrency,
     GetCurrencyList,
+    Policy_Create,
 };

From f8e62a7ef7c21eed0be0d77f2e4dbe6578ce2f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Thu, 17 Jun 2021 16:48:11 +0200
Subject: [PATCH 04/10] Add getWorkspaceRoute function to the ROUTES.js file

---
 src/ROUTES.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ROUTES.js b/src/ROUTES.js
index c4598312a3ac..6bbe1da70701 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -51,6 +51,7 @@ export default {
     WORKSPACE_NEW: 'workspace/new',
     WORKSPACE_INVITE: 'workspace/:policyID/invite',
     getWorkspaceInviteRoute: policyID => `workspace/${policyID}/invite`,
+    getWorkspaceRoute: policyID => `workspace/${policyID}`,
 
     /**
      * @param {String} route

From c7078b7617f0da48c165fdc2d46d6e3a0556577b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Thu, 17 Jun 2021 17:01:25 +0200
Subject: [PATCH 05/10] Add create function in the Policy actions file

---
 src/languages/en.js        |  1 +
 src/languages/es.js        |  1 +
 src/libs/actions/Policy.js | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index f9e1cf3f8526..b36688f06e43 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -372,6 +372,7 @@ export default {
             chooseAName: 'Choose a name',
             helpText: 'Name your Workspace before enabling your Expensify Cards!',
             getStarted: 'Get started!',
+            genericFailureMessage: 'An error occurred creating the workspace, please try again.',
         },
         invite: {
             invitePeople: 'Invite People',
diff --git a/src/languages/es.js b/src/languages/es.js
index ed2b2de96e24..b204aa06514c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -313,6 +313,7 @@ export default {
             chooseAName: 'Elige un nombre',
             helpText: '¡Dale un nombre a tu Workspace antes de activar tus Expensify Cards!',
             getStarted: '¡Empezar!',
+            genericFailureMessage: 'Se ha producido un error al intentar crear el Workspace. Por favor intentalo de nuevo.',
         },
         invite: {
             invitePeople: 'Invitar a la gente',
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 15867a448c5f..0d4a4dae2601 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -1,11 +1,15 @@
 import _ from 'underscore';
 import Onyx from 'react-native-onyx';
-import {GetPolicySummaryList, GetPolicyList, Policy_Employees_Merge} from '../API';
+import {
+    GetPolicySummaryList, GetPolicyList, Policy_Employees_Merge, Policy_Create,
+} from '../API';
 import ONYXKEYS from '../../ONYXKEYS';
 import {formatPersonalDetails} from './PersonalDetails';
 import Growl from '../Growl';
 import CONST from '../../CONST';
 import {translate} from '../translate';
+import Navigation from '../Navigation/Navigation';
+import ROUTES from '../../ROUTES';
 
 const allPolicies = {};
 Onyx.connect({
@@ -136,8 +140,35 @@ function invite(login, welcomeNote, policyID) {
         });
 }
 
+/**
+ * Merges the passed in login into the specified policy
+ *
+ * @param {String} name
+ */
+function create(name) {
+    Policy_Create({type: 'free', policyName: name})
+        .then((data) => {
+            if (data.jsonCode !== 200) {
+                // Show the user feedback
+                const errorMessage = translateLocal('workspace.new.genericFailureMessage');
+                Growl.show(errorMessage, CONST.GROWL.ERROR, 5000);
+
+                return;
+            }
+
+            Onyx.merge(ONYXKEYS.COLLECTION.POLICY + data.policyID, {
+                policyID: data.policyID,
+                type: data.policy.type,
+                name: data.policy.name,
+            });
+
+            Navigation.navigate(ROUTES.getWorkspaceRoute(data.policyID));
+        });
+}
+
 export {
     getPolicySummaries,
     getPolicyList,
     invite,
+    create,
 };

From 566d20108d93e4ab001824073afe3cdc24a74ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Thu, 17 Jun 2021 17:06:11 +0200
Subject: [PATCH 06/10] Create new free policy when clicking the submit button
 in the New Workspace page

---
 src/pages/workspace/NewWorkspacePage.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/NewWorkspacePage.js b/src/pages/workspace/NewWorkspacePage.js
index ce241c255a7a..3e106a95bb9a 100644
--- a/src/pages/workspace/NewWorkspacePage.js
+++ b/src/pages/workspace/NewWorkspacePage.js
@@ -13,6 +13,7 @@ import WorkspaceDefaultAvatar from '../../../assets/images/workspace-default-ava
 import TextInputWithLabel from '../../components/TextInputWithLabel';
 import Button from '../../components/Button';
 import compose from '../../libs/compose';
+import {create} from '../../libs/actions/Policy';
 
 
 const propTypes = {
@@ -29,6 +30,13 @@ class NewWorkspacePage extends React.Component {
         this.state = {
             name: '',
         };
+
+        this.submit = this.submit.bind(this);
+    }
+
+    submit() {
+        const name = this.state.name.trim();
+        create(name);
     }
 
     render() {
@@ -56,7 +64,12 @@ class NewWorkspacePage extends React.Component {
                         <Text style={[styles.mt6, styles.textP]}>{this.props.translate('workspace.new.helpText')}</Text>
                     </View>
 
-                    <Button success style={[styles.w100]} text={this.props.translate('workspace.new.getStarted')} />
+                    <Button
+                        success
+                        style={[styles.w100]}
+                        text={this.props.translate('workspace.new.getStarted')}
+                        onPress={this.submit}
+                    />
                 </View>
             </ScreenWrapper>
         );

From 26188326e40b64210937bd1059166e5af4e34489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Fri, 18 Jun 2021 10:33:57 +0200
Subject: [PATCH 07/10] Add POLICY.TYPE.FREE constant

---
 src/CONST.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/CONST.js b/src/CONST.js
index dc432c949881..0471879a51e2 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -294,6 +294,12 @@ const CONST = {
     },
 
     DEFAULT_LOCALE: 'en',
+
+    POLICY: {
+        TYPE: {
+            FREE: 'free',
+        },
+    },
 };
 
 export default CONST;

From b1da6ffa059d275c48e8881fbf84611f5197a306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Fri, 18 Jun 2021 11:24:51 +0200
Subject: [PATCH 08/10] Apply requested changes

---
 src/libs/API.js            | 12 ++++++------
 src/libs/actions/Policy.js |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/libs/API.js b/src/libs/API.js
index 9fbdd374d9b4..e3a7edd23895 100644
--- a/src/libs/API.js
+++ b/src/libs/API.js
@@ -912,9 +912,9 @@ function Mobile_GetConstants(parameters) {
 }
 
 /**
- * @param {object} parameters
- * @param {number} [parameters.latitude]
- * @param {number} [parameters.longitude]
+ * @param {Object} parameters
+ * @param {Number} [parameters.latitude]
+ * @param {Number} [parameters.longitude]
  * @returns {Promise}
  */
 function GetPreferredCurrency(parameters) {
@@ -930,9 +930,9 @@ function GetCurrencyList() {
 }
 
 /**
- * @param {object} parameters
- * @param {string} [parameters.type]
- * @param {string} [parameters.policyName]
+ * @param {Object} parameters
+ * @param {String} [parameters.type]
+ * @param {String} [parameters.policyName]
  * @returns {Promise}
  */
 function Policy_Create(parameters) {
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 0d4a4dae2601..c9b217e4df94 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -146,17 +146,16 @@ function invite(login, welcomeNote, policyID) {
  * @param {String} name
  */
 function create(name) {
-    Policy_Create({type: 'free', policyName: name})
+    Policy_Create({type: CONST.POLICY.TYPE.FREE, policyName: name})
         .then((data) => {
             if (data.jsonCode !== 200) {
                 // Show the user feedback
                 const errorMessage = translateLocal('workspace.new.genericFailureMessage');
                 Growl.show(errorMessage, CONST.GROWL.ERROR, 5000);
-
                 return;
             }
 
-            Onyx.merge(ONYXKEYS.COLLECTION.POLICY + data.policyID, {
+            Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${data.policyID}`, {
                 policyID: data.policyID,
                 type: data.policy.type,
                 name: data.policy.name,

From 6ebc2299117231cc88c116773bf0a5b027be8270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Fri, 18 Jun 2021 11:54:02 +0200
Subject: [PATCH 09/10] Locale corrections

---
 src/languages/es.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.js b/src/languages/es.js
index b204aa06514c..c10bc1980778 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -313,7 +313,7 @@ export default {
             chooseAName: 'Elige un nombre',
             helpText: '¡Dale un nombre a tu Workspace antes de activar tus Expensify Cards!',
             getStarted: '¡Empezar!',
-            genericFailureMessage: 'Se ha producido un error al intentar crear el Workspace. Por favor intentalo de nuevo.',
+            genericFailureMessage: 'Se ha producido un error al intentar crear el Workspace. Por favor, inténtalo de nuevo.',
         },
         invite: {
             invitePeople: 'Invitar a la gente',

From a9f362561f1c680c62cef568ded98a80eb8e2084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Horus=20Lugo=20L=C3=B3pez?= <horus@expensify.com>
Date: Fri, 18 Jun 2021 12:23:45 +0200
Subject: [PATCH 10/10] Fix merge error

---
 src/ROUTES.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ROUTES.js b/src/ROUTES.js
index bc24cd89dbfc..21a8dffbc749 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -52,7 +52,6 @@ export default {
     getWorkspaceRoute: policyID => `workspace/${policyID}`,
     WORKSPACE_INVITE: 'workspace/:policyID/invite',
     getWorkspaceInviteRoute: policyID => `workspace/${policyID}/invite`,
-    getWorkspaceRoute: policyID => `workspace/${policyID}`,
 
     /**
      * @param {String} route