Merge pull request #4533 from Expensify/timszot_autoCreateWorkspace

Always auto name and create new workspaces from oldDot
Expensify · Aug 11, 2021 · 4ec7474 · 4ec7474
2 parents 69df821 + 1e672f4
commit 4ec7474
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 135 deletions.
diff --git a/src/Expensify.js b/src/Expensify.js
@@ -16,10 +16,9 @@ import UpdateAppModal from './components/UpdateAppModal';
 import Visibility from './libs/Visibility';
 import GrowlNotification from './components/GrowlNotification';
 import {growlRef} from './libs/Growl';
-import Navigation from './libs/Navigation/Navigation';
-import ROUTES from './ROUTES';
 import StartupTimer from './libs/StartupTimer';
 import {setRedirectToWorkspaceNewAfterSignIn} from './libs/actions/Session';
+import {create} from './libs/actions/Policy';
 
 const propTypes = {
     /* Onyx Props */
@@ -116,7 +115,7 @@ class Expensify extends PureComponent {
             && !_.isEmpty(this.props.betas)
             && lodashGet(this.props, 'session.redirectToWorkspaceNewAfterSignIn', false)) {
             setRedirectToWorkspaceNewAfterSignIn(false);
-            Navigation.navigate(ROUTES.WORKSPACE_NEW);
+            create();
         }
 
         if (this.getAuthToken() && this.props.initialReportDataLoaded && this.props.isSidebarLoaded) {

diff --git a/src/ROUTES.js b/src/ROUTES.js
@@ -73,7 +73,6 @@ export default {
     VALIDATE_LOGIN_WITH_VALIDATE_CODE_NEW_WORKSPACE: 'v/:accountID/:validateCode/new-workspace',
     VALIDATE_LOGIN_WITH_VALIDATE_CODE_2FA_NEW_WORKSPACE: 'v/:accountID/:validateCode/2fa/new-workspace',
     ENABLE_PAYMENTS: 'enable-payments',
-    WORKSPACE_NEW: 'workspace/new',
     WORKSPACE: 'workspace',
     WORKSPACE_CARD: ':policyID/card',
     WORKSPACE_PEOPLE: ':policyID/people',

diff --git a/src/languages/en.js b/src/languages/en.js
@@ -563,12 +563,7 @@ export default {
         new: {
             newWorkspace: 'New Workspace',
             getTheExpensifyCardAndMore: 'Get the Expensify Card and more',
-            welcome: 'Welcome',
-            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.',
-            successMessage: 'Workspace created',
         },
         people: {
             assignee: 'Assignee',
@@ -605,7 +600,7 @@ export default {
             avatarUploadFailureMessage: 'An error occurred uploading the avatar, please try again.',
         },
         error: {
-            growlMessageInvalidPolicy: 'Invalid workspace! You can create a new workspace!',
+            growlMessageInvalidPolicy: 'Invalid workspace! A new workspace has been created.',
         },
     },
     requestCallPage: {

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -565,12 +565,7 @@ export default {
         new: {
             newWorkspace: 'Nuevo Espacio de trabajo',
             getTheExpensifyCardAndMore: 'Consigue la Expensify Card y más',
-            welcome: 'Bienvenido/a',
-            chooseAName: 'Elige un nombre',
-            helpText: 'Elige un nombre para el espacio de trabajo antes de activar las tarjetas Expensify',
-            getStarted: '¡Empezar!',
             genericFailureMessage: 'Se ha producido un error al intentar crear el Workspace. Por favor, inténtalo de nuevo.',
-            successMessage: 'Espacio de trabajo creado',
         },
         people: {
             assignee: 'Persona asignada',
@@ -607,7 +602,7 @@ export default {
             avatarUploadFailureMessage: 'No se pudo subir el avatar. Por favor, inténtalo de nuevo.',
         },
         error: {
-            growlMessageInvalidPolicy: '¡Espacio de trabajo no válido! ¡Puedes crear un nuevo espacio de trabajo!',
+            growlMessageInvalidPolicy: '¡Espacio de trabajo no válido! Un nuevo espacio de trabajo ha sido creado.',
         },
     },
     requestCallPage: {

diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -54,7 +54,6 @@ import {
     EnablePaymentsStackNavigator,
     AddPersonalBankAccountModalStackNavigator,
     ReimbursementAccountModalStackNavigator,
-    NewWorkspaceStackNavigator,
     WorkspaceInviteModalStackNavigator,
     RequestCallModalStackNavigator,
     ReportDetailsModalStackNavigator,
@@ -390,12 +389,6 @@ class AuthScreens extends React.Component {
                     component={AddPersonalBankAccountModalStackNavigator}
                     listeners={modalScreenListeners}
                 />
-                <RootStack.Screen
-                    name="NewWorkspace"
-                    options={modalScreenOptions}
-                    component={NewWorkspaceStackNavigator}
-                    listeners={modalScreenListeners}
-                />
                 <RootStack.Screen
                     name="ReimbursementAccount"
                     options={modalScreenOptions}

diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -25,7 +25,6 @@ import EnablePaymentsPage from '../../../pages/EnablePayments';
 import AddPersonalBankAccountPage from '../../../pages/AddPersonalBankAccountPage';
 import WorkspaceInvitePage from '../../../pages/workspace/WorkspaceInvitePage';
 import ReimbursementAccountPage from '../../../pages/ReimbursementAccount/ReimbursementAccountPage';
-import NewWorkspacePage from '../../../pages/workspace/NewWorkspacePage';
 import RequestCallPage from '../../../pages/RequestCallPage';
 import ReportDetailsPage from '../../../pages/ReportDetailsPage';
 import WorkspaceEditorPage from '../../../pages/workspace/WorkspaceEditorPage';
@@ -183,11 +182,6 @@ const ReimbursementAccountModalStackNavigator = createModalStackNavigator([{
     name: 'ReimbursementAccount_Root',
 }]);
 
-const NewWorkspaceStackNavigator = createModalStackNavigator([{
-    Component: NewWorkspacePage,
-    name: 'NewWorkspace_Root',
-}]);
-
 const WorkspaceInviteModalStackNavigator = createModalStackNavigator([{
     Component: WorkspaceInvitePage,
     name: 'WorkspaceInvite_Root',
@@ -218,7 +212,6 @@ export {
     EnablePaymentsStackNavigator,
     AddPersonalBankAccountModalStackNavigator,
     ReimbursementAccountModalStackNavigator,
-    NewWorkspaceStackNavigator,
     WorkspaceInviteModalStackNavigator,
     RequestCallModalStackNavigator,
     WorkspaceEditorNavigator,

diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
@@ -143,11 +143,6 @@ export default {
                     WorkspaceInvite_Root: ROUTES.WORKSPACE_INVITE,
                 },
             },
-            NewWorkspace: {
-                screens: {
-                    NewWorkspace_Root: ROUTES.WORKSPACE_NEW,
-                },
-            },
 
             WorkspaceSettings: {
                 path: ROUTES.WORKSPACE,

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
@@ -213,7 +213,6 @@ function create(name = '') {
         }).then(() => {
             Navigation.dismissModal();
             Navigation.navigate(ROUTES.getWorkspaceCardRoute(res.policyID));
-            Growl.success(translateLocal('workspace.new.successMessage'));
         });
 }
 

diff --git a/src/pages/ValidateLogin2FANewWorkspacePage.js b/src/pages/ValidateLogin2FANewWorkspacePage.js
@@ -17,7 +17,7 @@ import Text from '../components/Text';
 import compose from '../libs/compose';
 import ONYXKEYS from '../ONYXKEYS';
 import Navigation from '../libs/Navigation/Navigation';
-import ROUTES from '../ROUTES';
+import {create} from '../libs/actions/Policy';
 
 const propTypes = {
     /* Onyx Props */
@@ -71,7 +71,7 @@ class ValidateLogin2FANewWorkspacePage extends Component {
             if (_.isEmpty(this.props.betas)) {
                 setRedirectToWorkspaceNewAfterSignIn(true);
             } else {
-                Navigation.navigate(ROUTES.WORKSPACE_NEW);
+                create();
             }
         }
     }

diff --git a/src/pages/ValidateLoginNewWorkspacePage.js b/src/pages/ValidateLoginNewWorkspacePage.js
@@ -7,8 +7,8 @@ import validateLinkPropTypes from './validateLinkPropTypes';
 import compose from '../libs/compose';
 import ONYXKEYS from '../ONYXKEYS';
 import Navigation from '../libs/Navigation/Navigation';
-import ROUTES from '../ROUTES';
 import {continueSessionFromECom, setRedirectToWorkspaceNewAfterSignIn} from '../libs/actions/Session';
+import {create} from '../libs/actions/Policy';
 
 const propTypes = {
     /* Onyx Props */
@@ -47,7 +47,7 @@ class ValidateLoginNewWorkspacePage extends Component {
             if (_.isEmpty(this.props.betas)) {
                 setRedirectToWorkspaceNewAfterSignIn(true);
             } else {
-                Navigation.navigate(ROUTES.WORKSPACE_NEW);
+                create();
             }
             return;
         }

diff --git a/src/pages/workspace/NewWorkspacePage.js b/src/pages/workspace/NewWorkspacePage.js
diff --git a/src/pages/workspace/WorkspaceSidebar.js b/src/pages/workspace/WorkspaceSidebar.js
@@ -25,6 +25,7 @@ import Growl from '../../libs/Growl';
 import ONYXKEYS from '../../ONYXKEYS';
 import Avatar from '../../components/Avatar';
 import CONST from '../../CONST';
+import {create} from '../../libs/actions/Policy';
 
 const propTypes = {
     /** Policy for the current route */
@@ -68,7 +69,7 @@ const WorkspaceSidebar = ({translate, isSmallScreenWidth, policy}) => {
         if (_.isEmpty(policy)) {
             Growl.error(translate('workspace.error.growlMessageInvalidPolicy'), CONST.GROWL.DURATION_LONG);
             Navigation.dismissModal();
-            Navigation.navigate(ROUTES.WORKSPACE_NEW);
+            create();
             return null;
         }
     }, [policy]);