Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Directly create a workspace and add the Edit Workspace page #4310

Merged
merged 17 commits into from
Aug 3, 2021
Merged

Directly create a workspace and add the Edit Workspace page #4310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b35b17f
Directly create the workspace instead of navigating to the new worksp…
jasperhuangg Jul 29, 2021
876bf43
localizations
jasperhuangg Jul 29, 2021
9b82605
Setup navigation for EditWorkspacePage
jasperhuangg Jul 29, 2021
7295214
Create the EditWorkspacePage from the NewWorkspacePage
jasperhuangg Jul 29, 2021
062ab10
style
jasperhuangg Jul 29, 2021
c0aafd1
add uncommitted file
jasperhuangg Jul 29, 2021
00bba73
update translation
jasperhuangg Jul 29, 2021
d7a27fe
update translations
jasperhuangg Jul 29, 2021
2aefb5f
update translations
jasperhuangg Jul 29, 2021
22bf2e2
update translations
jasperhuangg Jul 29, 2021
eb631a3
Merge branch 'jasper-updateWorkspaceSpanishTranslations' of github.co…
jasperhuangg Jul 29, 2021
574fc67
update translations
jasperhuangg Jul 29, 2021
2f0d731
Revert conflicting changes
jasperhuangg Jul 30, 2021
c7f6b2e
Fix unnecessary changes
jasperhuangg Jul 30, 2021
76e16dd
Revert accidentally removed
jasperhuangg Jul 30, 2021
af8b07e
Revert accidentally added changes
jasperhuangg Jul 30, 2021
2d70658
Merge branch 'main' into jasper-editWorkspacePage
jasperhuangg Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,11 @@ export default {
workspace: 'Espacio de trabajo',
},
new: {
newWorkspace: 'Nuevo Workspace',
newWorkspace: 'Nuevo Espacio de trabajo',
getTheExpensifyCardAndMore: 'Consigue la Expensify Card y más',
welcome: 'Bienvenido/a',
chooseAName: 'Elige un nombre',
helpText: '¡Dale un nombre a tu Workspace antes de activar tus Expensify Cards!',
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.',
},
Expand Down
5 changes: 3 additions & 2 deletions src/libs/actions/Policy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ function invite(logins, welcomeNote, policyID) {
/**
* Merges the passed in login into the specified policy
*
* @param {String} name
* @param {String} [name]
*/
function create(name) {
function create(name = '') {
API.Policy_Create({type: CONST.POLICY.TYPE.FREE, policyName: name})
.then((response) => {
if (response.jsonCode !== 200) {
Expand All @@ -203,6 +203,7 @@ function create(name) {
});
Navigation.dismissModal();
Navigation.navigate(ROUTES.getWorkspaceCardRoute(response.policyID));
Growl.success(translateLocal('workspace.new.successMessage'));
});
}

Expand Down
3 changes: 2 additions & 1 deletion src/pages/home/sidebar/SidebarScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
import Permissions from '../../../libs/Permissions';
import ONYXKEYS from '../../../ONYXKEYS';
import Firebase from '../../../libs/Firebase';
import {create} from '../../../libs/actions/Policy';

const propTypes = {
/** Beta features list */
Expand Down Expand Up @@ -147,7 +148,7 @@ class SidebarScreen extends Component {
iconHeight: 40,
text: this.props.translate('workspace.new.newWorkspace'),
description: this.props.translate('workspace.new.getTheExpensifyCardAndMore'),
onSelected: () => Navigation.navigate(ROUTES.WORKSPACE_NEW),
onSelected: () => create(),
},
] : []),
]}
Expand Down