From c3e3de3bd5075b6d8d2a6657947ecdd343e869ab Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Mon, 11 Oct 2021 12:27:05 -0700 Subject: [PATCH 1/7] Change Edit Workspace title to General Settings --- src/languages/en.js | 1 - src/languages/es.js | 1 - src/pages/workspace/WorkspaceSettingsPage.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index be6cdc0bf765..abe85adb1025 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -624,7 +624,6 @@ export default { common: { card: 'Issue corporate cards', workspace: 'Workspace', - edit: 'Edit workspace', settings: 'General settings', reimburse: 'Reimburse receipts', bills: 'Pay bills', diff --git a/src/languages/es.js b/src/languages/es.js index 44514918e504..359bccfbc5ae 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -626,7 +626,6 @@ export default { common: { card: 'Emitir tarjetas corporativas', workspace: 'Espacio de trabajo', - edit: 'Editar espacio de trabajo', settings: 'Configuración general', reimburse: 'Reembolsar recibos', bills: 'Pagar facturas', diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js index 72185e9b6a89..1d3e86ce9ef8 100644 --- a/src/pages/workspace/WorkspaceSettingsPage.js +++ b/src/pages/workspace/WorkspaceSettingsPage.js @@ -134,7 +134,7 @@ class WorkspaceSettingsPage extends React.Component { return ( {hasVBA => ( From a415b687ff8cb7fa1fbe474ae6e7637ac49cb6e1 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Mon, 11 Oct 2021 12:30:02 -0700 Subject: [PATCH 2/7] Make c lowercase in Default Currency --- src/languages/en.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.js b/src/languages/en.js index abe85adb1025..ce909d809b2e 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -712,7 +712,7 @@ export default { nameInputLabel: 'Name', nameInputHelpText: 'This is the name you will see on your workspace.', nameIsRequiredError: 'You need to define a name for your workspace', - currencyInputLabel: 'Default Currency', + currencyInputLabel: 'Default currency', currencyInputHelpText: 'All expenses on this workspace will be converted to this currency.', save: 'Save', genericFailureMessage: 'An error occurred updating the workspace, please try again.', From 6de48f8b41feb1207bc52c81f8272a0d16508af6 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Mon, 11 Oct 2021 13:10:14 -0700 Subject: [PATCH 3/7] Add growl for profile save --- src/languages/en.js | 1 + src/languages/es.js | 1 + src/libs/actions/Policy.js | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/languages/en.js b/src/languages/en.js index ce909d809b2e..6f8a8c0c3130 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -633,6 +633,7 @@ export default { bankAccount: 'Connect bank account', issueAndManageCards: 'Issue and manage cards', reconcileCards: 'Reconcile cards', + growlMessageOnSave: 'Your workspace settings were successfully saved!', }, new: { newWorkspace: 'New workspace', diff --git a/src/languages/es.js b/src/languages/es.js index 359bccfbc5ae..682d72048e64 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -635,6 +635,7 @@ export default { bankAccount: 'Conectar cuenta bancaria', issueAndManageCards: 'Emitir y gestionar tarjetas', reconcileCards: 'Reconciliar tarjetas', + growlMessageOnSave: '¡Tus configuraciónes del espacio de trabajo se han guardado correctamente!', }, new: { newWorkspace: 'Nuevo espacio de trabajo', diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index b4b4994ab51c..b5d1a375441c 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -300,8 +300,9 @@ function uploadAvatar(file) { * * @param {String} policyID * @param {Object} values + * @param {Boolean} [shouldGrowl] */ -function update(policyID, values) { +function update(policyID, values, shouldGrowl = false) { API.UpdatePolicy({policyID, value: JSON.stringify(values), lastModified: null}) .then((policyResponse) => { if (policyResponse.jsonCode !== 200) { @@ -314,6 +315,7 @@ function update(policyID, values) { const updatedValues = {...values, ...{isPolicyUpdating: false}}; Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, updatedValues); + Growl.show(translateLocal('workspace.common.growlMessageOnSave'), CONST.GROWL.SUCCESS, 3000); }).catch(() => { Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {isPolicyUpdating: false}); const errorMessage = translateLocal('workspace.editor.genericFailureMessage'); From 2f4a6c729fb2ab8a37a228a7227b53816c5cf933 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Mon, 11 Oct 2021 13:10:47 -0700 Subject: [PATCH 4/7] Only growl if shouldGrowl is true --- src/libs/actions/Policy.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index b5d1a375441c..b933a03efca0 100644 --- a/src/libs/actions/Policy.js +++ b/src/libs/actions/Policy.js @@ -315,7 +315,9 @@ function update(policyID, values, shouldGrowl = false) { const updatedValues = {...values, ...{isPolicyUpdating: false}}; Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, updatedValues); - Growl.show(translateLocal('workspace.common.growlMessageOnSave'), CONST.GROWL.SUCCESS, 3000); + if (shouldGrowl) { + Growl.show(translateLocal('workspace.common.growlMessageOnSave'), CONST.GROWL.SUCCESS, 3000); + } }).catch(() => { Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {isPolicyUpdating: false}); const errorMessage = translateLocal('workspace.editor.genericFailureMessage'); From 1967319a9e17a71e7b3817091f53ba2678d5a32e Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Mon, 11 Oct 2021 13:11:23 -0700 Subject: [PATCH 5/7] Growl on Workspace settings page when policy updates --- src/pages/workspace/WorkspaceSettingsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js index 1d3e86ce9ef8..53db39638bff 100644 --- a/src/pages/workspace/WorkspaceSettingsPage.js +++ b/src/pages/workspace/WorkspaceSettingsPage.js @@ -114,7 +114,7 @@ class WorkspaceSettingsPage extends React.Component { const policyID = this.props.policy.id; const currency = this.state.currency; - Policy.update(policyID, {name, avatarURL, outputCurrency: currency}); + Policy.update(policyID, {name, avatarURL, outputCurrency: currency}, true); }).catch(() => { Policy.updateLocalPolicyValues(this.props.policy.id, {isPolicyUpdating: false}); }); From 9e6d29f59f7773ee15b3b60adbf10a19be46b1a1 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Mon, 11 Oct 2021 13:36:57 -0700 Subject: [PATCH 6/7] More simple copy changes --- src/languages/en.js | 6 +++--- src/languages/es.js | 4 ++-- src/pages/ReportDetailsPage.js | 2 +- src/pages/ReportParticipantsPage.js | 2 +- src/pages/workspace/WorkspaceMembersPage.js | 2 +- .../workspace/invoices/WorkspaceInvoicesFirstSection.js | 2 +- src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 6f8a8c0c3130..f2246732fba2 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -205,7 +205,6 @@ export default { always: 'Always', daily: 'Daily', mute: 'Mute', - members: 'Members', }, loginField: { addYourPhoneToSettleViaVenmo: 'Add your phone number to settle up via Venmo.', @@ -664,7 +663,7 @@ export default { fastReimbursementsHappyMembers: 'Fast reimbursements = happy members!', viewAllReceipts: 'View all receipts', reimburseReceipts: 'Reimburse receipts', - unlockNextDayReimbursements: 'Unlock next day reimbursements', + unlockNextDayReimbursements: 'Unlock next-day reimbursements', captureNoVBACopyBeforeEmail: 'Ask your workspace members to forward receipts to ', captureNoVBACopyAfterEmail: ' and download the Expensify App to track cash expenses on the go.', unlockNoVBACopy: 'Connect a bank account to reimburse your workspace members online.', @@ -684,11 +683,12 @@ export default { invoiceClientsAndCustomers: 'Invoice clients and customers', invoiceFirstSectionCopy: 'Send beautiful, professional invoices directly to your clients and customers right from within the Expensify app.', viewAllInvoices: 'View all invoices', - unlockOnlineInvoicesCollection: 'Unlock online invoices collection', + unlockOnlineInvoiceCollection: 'Unlock online invoice collection', unlockNoVBACopy: 'Connect your bank account to accept online payments for invoices - by ACH or credit card - to be deposited straight into your account.', moneyBackInAFlash: 'Money back, in a flash!', unlockVBACopy: 'You\'re all set to accept payments by ACH or credit card!', viewUnpaidInvoices: 'View unpaid invoices', + sendInvoice: 'Send invoice', }, travel: { unlockConciergeBookingTravel: 'Unlock Concierge travel booking', diff --git a/src/languages/es.js b/src/languages/es.js index 682d72048e64..e7585ce51ad7 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -205,7 +205,6 @@ export default { always: 'Siempre', daily: 'Cada día', mute: 'Nunca', - members: 'Miembros', }, loginField: { addYourPhoneToSettleViaVenmo: 'Agrega tu número de teléfono para pagar usando Venmo.', @@ -686,11 +685,12 @@ export default { invoiceClientsAndCustomers: 'Emite facturas a tus clientes', invoiceFirstSectionCopy: 'Envía facturas detalladas y profesionales directamente a tus clientes desde la app de Expensify.', viewAllInvoices: 'Ver facturas emitidas', - unlockOnlineInvoicesCollection: 'Desbloquea el cobro de facturas online', + unlockOnlineInvoiceCollection: 'Desbloquea el cobro de facturas online', unlockNoVBACopy: 'Conecta tu cuenta bancaria para recibir pagos online de facturas - por transferencia o con tarjeta - directamente en tu cuenta.', moneyBackInAFlash: '¡Tu dinero de vuelta en un momento!', unlockVBACopy: '¡Todo listo para recibir pagos por transferencia o con tarjeta!', viewUnpaidInvoices: 'Ver facturas emitidas pendientes', + sendInvoice: 'Enviar factura', }, travel: { unlockConciergeBookingTravel: 'Desbloquea la reserva de viajes con Concierge', diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js index c8e54fd02dec..371805e80293 100644 --- a/src/pages/ReportDetailsPage.js +++ b/src/pages/ReportDetailsPage.js @@ -92,7 +92,7 @@ class ReportDetailsPage extends Component { this.menuItems = isArchivedRoom(this.props.report) ? [] : [ { - translationKey: 'reportDetailsPage.members', + translationKey: 'common.members', icon: Users, subtitle: props.report.participants.length, action: () => { Navigation.navigate(ROUTES.getReportParticipantsRoute(props.report.reportID)); }, diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js index e922786f4c48..3c8651393a24 100755 --- a/src/pages/ReportParticipantsPage.js +++ b/src/pages/ReportParticipantsPage.js @@ -85,7 +85,7 @@ const ReportParticipantsPage = ({ return ( Navigation.dismissModal()} onBackButtonPress={() => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID))} shouldShowBackButton diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js index 9d6ee4fc46a1..7b748e21a7cd 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js @@ -26,7 +26,7 @@ const WorkspaceInvoicesFirstSection = ({translate, policyID}) => ( icon={MoneyEnvelopeBlue} menuItems={[ { - title: translate('workspace.common.invoices'), + title: translate('workspace.invoices.sendInvoice'), onPress: () => openSignedInLink('reports?param={"createInvoice":true}'), icon: Send, shouldShowRightIcon: true, diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js index 882a1b4c986f..8db86ce7160c 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js @@ -26,7 +26,7 @@ const WorkspaceInvoicesNoVBAView = ({translate, policyID}) => ( Date: Mon, 11 Oct 2021 16:14:22 -0700 Subject: [PATCH 7/7] Fix translation --- 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 e7585ce51ad7..97ba5a6dedd8 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -634,7 +634,7 @@ export default { bankAccount: 'Conectar cuenta bancaria', issueAndManageCards: 'Emitir y gestionar tarjetas', reconcileCards: 'Reconciliar tarjetas', - growlMessageOnSave: '¡Tus configuraciónes del espacio de trabajo se han guardado correctamente!', + growlMessageOnSave: '¡La configuración del espacio de trabajo se ha guardado correctamente!', }, new: { newWorkspace: 'Nuevo espacio de trabajo',