Merge pull request #5855 from Expensify/AndrewGable-cherry-pick-stagi…

…ng-5759
Expensify · Oct 14, 2021 · ad917f2 · ad917f2
2 parents 546669d + e3a4022
commit ad917f2
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 22 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010720
-        versionName "1.1.7-20"
+        versionCode 1001010721
+        versionName "1.1.7-21"
     }
     splits {
         abi {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.7.20</string>
+	<string>1.1.7.21</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.7.20</string>
+	<string>1.1.7.21</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.7-20",
+  "version": "1.1.7-21",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git 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.',
@@ -623,7 +622,6 @@ export default {
         common: {
             card: 'Issue corporate cards',
             workspace: 'Workspace',
-            edit: 'Edit workspace',
             settings: 'General settings',
             reimburse: 'Reimburse receipts',
             bills: 'Pay bills',
@@ -633,6 +631,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',
@@ -663,7 +662,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.',
@@ -683,11 +682,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',
@@ -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.',

diff --git 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.',
@@ -625,7 +624,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',
@@ -635,6 +633,7 @@ export default {
             bankAccount: 'Conectar cuenta bancaria',
             issueAndManageCards: 'Emitir y gestionar tarjetas',
             reconcileCards: 'Reconciliar tarjetas',
+            growlMessageOnSave: '¡La configuración del espacio de trabajo se ha guardado correctamente!',
         },
         new: {
             newWorkspace: 'Nuevo espacio de trabajo',
@@ -685,11 +684,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/libs/actions/Policy.js b/src/libs/actions/Policy.js
@@ -299,8 +299,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) {
@@ -313,6 +314,9 @@ function update(policyID, values) {
 
             const updatedValues = {...values, ...{isPolicyUpdating: false}};
             Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, updatedValues);
+            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');

diff --git 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
@@ -85,7 +85,7 @@ const ReportParticipantsPage = ({
     return (
         <ScreenWrapper>
             <HeaderWithCloseButton
-                title={translate(isDefaultRoom(report) ? 'reportDetailsPage.members' : 'common.details')}
+                title={translate(isDefaultRoom(report) ? 'common.members' : 'common.details')}
                 onCloseButtonPress={Navigation.dismissModal}
                 onBackButtonPress={Navigation.dismissModal}
                 shouldShowBackButton={isDefaultRoom(report)}

diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
@@ -223,7 +223,7 @@ class WorkspaceMembersPage extends React.Component {
         return (
             <ScreenWrapper style={[styles.defaultModalContainer]}>
                 <HeaderWithCloseButton
-                    title={this.props.translate('common.members')}
+                    title={this.props.translate('workspace.common.members')}
                     onCloseButtonPress={() => Navigation.dismissModal()}
                     onBackButtonPress={() => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID))}
                     shouldShowBackButton

diff --git 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});
         });
@@ -134,7 +134,7 @@ class WorkspaceSettingsPage extends React.Component {
 
         return (
             <WorkspacePageWithSections
-                headerText={this.props.translate('workspace.common.edit')}
+                headerText={this.props.translate('workspace.common.settings')}
                 route={this.props.route}
             >
                 {hasVBA => (

diff --git 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: () => openOldDotLink('reports?param={"createInvoice":true}'),
                 icon: Send,
                 shouldShowRightIcon: true,

diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js
@@ -26,7 +26,7 @@ const WorkspaceInvoicesNoVBAView = ({translate, policyID}) => (
         <WorkspaceInvoicesFirstSection policyID={policyID} />
 
         <WorkspaceSection
-            title={translate('workspace.invoices.unlockOnlineInvoicesCollection')}
+            title={translate('workspace.invoices.unlockOnlineInvoiceCollection')}
             icon={JewelBoxGreen}
             menuItems={[
                 {