Skip to content

Commit

Permalink
Merge pull request #4091 from Expensify/tgolen-password-copy
Browse files Browse the repository at this point in the history
Update copy to refer to new URL
  • Loading branch information
iwiznia authored Aug 2, 2021
2 parents 8033dc4 + 66612e1 commit a57f9eb
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 25 deletions.
8 changes: 4 additions & 4 deletions desktop/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const quitAndInstallWithUpdate = () => {

// Defines the system-level menu item for manually triggering an update after
const updateAppMenuItem = new MenuItem({
label: 'Update Expensify.cash',
label: 'Update New Expensify',
enabled: false,
click: quitAndInstallWithUpdate,
});
Expand Down Expand Up @@ -120,7 +120,7 @@ const mainWindow = (() => {
// Prod and staging set the icon in the electron-builder config, so only update it here for dev
if (isDev) {
app.dock.setIcon(`${__dirname}/icon-dev.png`);
app.setName('Expensify.cash');
app.setName('New Expensify');
}

return app.whenReady()
Expand All @@ -137,7 +137,7 @@ const mainWindow = (() => {

// Prod and staging overwrite the app name in the electron-builder config, so only update it here for dev
if (isDev) {
browserWindow.setTitle('Expensify.cash');
browserWindow.setTitle('New Expensify');
}

// List the Expensify Chat instance under the Window menu, even when it's hidden
Expand Down Expand Up @@ -172,7 +172,7 @@ const mainWindow = (() => {
const windowMenu = systemMenu.items.find(item => item.role === 'windowmenu');
windowMenu.submenu.append(new MenuItem({type: 'separator'}));
windowMenu.submenu.append(new MenuItem({
label: 'Expensify.cash',
label: 'New Expensify',
accelerator: 'CmdOrCtrl+1',
click: () => browserWindow.show(),
}));
Expand Down
2 changes: 1 addition & 1 deletion src/CONFIG.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default {
APP_KEY: lodashGet(Config, 'PUSHER_APP_KEY', '268df511a204fbb60884'),
CLUSTER: 'mt1',
},
SITE_TITLE: 'Expensify.cash',
SITE_TITLE: 'New Expensify',
FAVICON: {
DEFAULT: '/favicon.png',
UNREAD: '/favicon-unread.png',
Expand Down
9 changes: 4 additions & 5 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default {
},
attachmentPicker: {
cameraPermissionRequired: 'Camera Permission Required',
expensifyDoesntHaveAccessToCamera: 'Expensify.cash does not have access to your camera, please enable the permission and try again.',
expensifyDoesntHaveAccessToCamera: 'This app does not have access to your camera, please enable the permission and try again.',
attachmentError: 'Attachment Error',
errorWhileSelectingAttachment: 'An error occurred while selecting an attachment, please try again',
errorWhileSelectingCorruptedImage: 'An error occurred while selecting a corrupted attachment, please try another file',
Expand All @@ -84,7 +84,7 @@ export default {
},
baseUpdateAppModal: {
updateApp: 'Update App',
updatePrompt: 'A new version of Expensify.cash is available.\nUpdate now or restart the app at a later time to download the latest changes.',
updatePrompt: 'A new version of this app is available.\nUpdate now or restart the app at a later time to download the latest changes.',
},
iOUConfirmationList: {
whoPaid: 'WHO PAID?',
Expand Down Expand Up @@ -237,7 +237,7 @@ export default {
},
passwordPage: {
changePassword: 'Change Password',
changingYourPasswordPrompt: 'Changing your password will update your password for both your Expensify.com\nand Expensify.cash accounts.',
changingYourPasswordPrompt: 'Changing your password will update your password for both your Expensify.com\nand New Expensify accounts.',
currentPassword: 'Current Password',
newPassword: 'New Password',
newPasswordPrompt: 'New password must be different than your old password, have at least 8 characters,\n1 capital letter, 1 lowercase letter, 1 number.',
Expand Down Expand Up @@ -274,8 +274,7 @@ export default {
},
},
signInPage: {
expensifyDotCash: 'Expensify.cash',
expensifyIsOpenSource: 'The New Expensify is open source',
expensifyDotCash: 'New Expensify',
theCode: 'the code',
openJobs: 'open jobs',
heroHeading: 'Split bills\nand chat with friends.',
Expand Down
19 changes: 9 additions & 10 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default {
},
attachmentPicker: {
cameraPermissionRequired: 'Se necesita permiso para usar la cámara',
expensifyDoesntHaveAccessToCamera: 'Expensify.cash no tiene acceso a tu cámara, por favor activa el permiso y vuelve a intentarlo.',
expensifyDoesntHaveAccessToCamera: 'Esta aplicación no tiene acceso a tu cámara, por favor activa el permiso y vuelve a intentarlo.',
attachmentError: 'Error al adjuntar archivo',
errorWhileSelectingAttachment: 'Ha ocurrido un error al seleccionar un adjunto, por favor inténtalo de nuevo',
errorWhileSelectingCorruptedImage: 'Ha ocurrido un error al seleccionar un adjunto corrupto, por favor intentalo con otro archivo',
Expand All @@ -84,7 +84,7 @@ export default {
},
baseUpdateAppModal: {
updateApp: 'Actualizar App',
updatePrompt: 'Existe una nueva versión de Expensify.cash.\nActualiza ahora or reinicia la aplicación más tarde para recibir la última versión.',
updatePrompt: 'Existe una nueva versión de esta aplicación.\nActualiza ahora or reinicia la aplicación más tarde para recibir la última versión.',
},
iOUConfirmationList: {
whoPaid: '¿QUIÉN PAGO?',
Expand All @@ -105,7 +105,7 @@ export default {
hello: 'Hola',
phoneCountryCode: '34',
welcomeText: {
phrase1: 'Con Expensify.cash, chat y pagos son lo mismo.',
phrase1: 'Con el Nuevo Expensify, chat y pagos son lo mismo.',
phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
},
Expand Down Expand Up @@ -237,7 +237,7 @@ export default {
},
passwordPage: {
changePassword: 'Cambiar Contraseña',
changingYourPasswordPrompt: 'El cambio de contraseña va a afectar tanto a la cuenta de Expensify.com\ncomo la de Expensify.cash.',
changingYourPasswordPrompt: 'El cambio de contraseña va a afectar tanto a la cuenta de Expensify.com\ncomo la de Nuevo Expensify.',
currentPassword: 'Contraseña Actual',
newPassword: 'Nueva contraseña',
newPasswordPrompt: 'La nueva contraseña tiene que ser diferente de la antigua, tener al menos 8 letras,\n1 letra mayúscula, 1 letra minúscula y 1 número.',
Expand Down Expand Up @@ -274,8 +274,7 @@ export default {
},
},
signInPage: {
expensifyDotCash: 'Expensify.cash',
expensifyIsOpenSource: 'Expensify.cash es open source',
expensifyDotCash: 'Nuevo Expensify',
theCode: 'el código',
openJobs: 'trabajos disponibles',
heroHeading: 'Dividir cuentas\ny chatear con amigos.',
Expand All @@ -288,13 +287,13 @@ export default {
},
},
termsOfUse: {
phrase1: 'Al usar Expensify.cash, estás aceptando los',
phrase1: 'Al iniciar sesión, estás accediendo a los',
phrase2: 'términos de servicio',
phrase3: 'y',
phrase4: 'política de privacidad',
phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus',
phrase6: 'licencias',
phrase7: 'licenses',
phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS',
phrase6: 'ID:2017010) de conformidad con sus',
phrase7: 'licencias',
},
passwordForm: {
pleaseFillOutAllFields: 'Por favor completa todos los campos',
Expand Down
4 changes: 2 additions & 2 deletions src/libs/Navigation/AppNavigator/AuthScreens.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ class AuthScreens extends React.Component {
name={SCREENS.HOME}
options={{
headerShown: false,
title: 'Expensify.cash',
title: 'New Expensify',

// prevent unnecessary scrolling
cardStyle: {
Expand All @@ -281,7 +281,7 @@ class AuthScreens extends React.Component {
name="ValidateLogin"
options={{
headerShown: false,
title: 'Expensify.cash',
title: 'New Expensify',
}}
component={ValidateLoginPage}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export default {
pushUpdateAvailableNotification() {
push({
title: 'Update available',
body: 'A new version of Expensify.cash is available!',
body: 'A new version of this app is available!',
delay: 0,
onClick: () => {
Onyx.merge(ONYXKEYS.UPDATE_AVAILABLE, true);
Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/BankAccounts.js
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ function fetchFreePlanVerifiedBankAccount(stepToOpen) {
? CONST.BANK_ACCOUNT.STEP.VALIDATION : CONST.BANK_ACCOUNT.STEP.COMPANY;
achData.bankAccountInReview = hasTriedToUpgrade;
} else {
// In Expensify.cash we do not show a specific view for the EnableStep since we
// We do not show a specific view for the EnableStep since we
// will enable the Expensify card automatically. However, we will still handle
// that step and show the Validate view.
currentStep = CONST.BANK_ACCOUNT.STEP.ENABLE;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/roundToNearestMultipleOfFour.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* The Expensify.cash repo is very consistent about doing spacing in multiples of 4.
* This repo is very consistent about doing spacing in multiples of 4.
* In an effort to maintain that consistency, we'll make sure that any distance we're shifting the components
* are a multiple of 4.
*
Expand Down

0 comments on commit a57f9eb

Please sign in to comment.