-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #37869 from burczu/feature/35716-changing-owner-flow
Feature/35716 changing owner flow
- Loading branch information
Showing
31 changed files
with
1,268 additions
and
25 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -312,6 +312,7 @@ export default { | |
update: 'Update', | ||
member: 'Member', | ||
role: 'Role', | ||
currency: 'Currency', | ||
}, | ||
location: { | ||
useCurrent: 'Use current location', | ||
|
@@ -1949,6 +1950,7 @@ export default { | |
removeMemberButtonTitle: 'Remove from workspace', | ||
removeMemberPrompt: ({memberName}) => `Are you sure you want to remove ${memberName}`, | ||
removeMemberTitle: 'Remove member', | ||
transferOwner: 'Transfer owner', | ||
makeMember: 'Make member', | ||
makeAdmin: 'Make admin', | ||
selectAll: 'Select all', | ||
|
@@ -2097,6 +2099,49 @@ export default { | |
updateCurrencyPrompt: 'It looks like your Workspace is currently set to a different currency than USD. Please click the button below to update your currency to USD now.', | ||
updateToUSD: 'Update to USD', | ||
}, | ||
changeOwner: { | ||
changeOwnerPageTitle: 'Transfer owner', | ||
addPaymentCardTitle: 'Enter your payment card to transfer ownership', | ||
addPaymentCardButtonText: 'Accept terms & add payment card', | ||
addPaymentCardReadAndAcceptTextPart1: 'Read and accept', | ||
addPaymentCardReadAndAcceptTextPart2: 'policy to add your card', | ||
addPaymentCardTerms: 'terms', | ||
addPaymentCardPrivacy: 'privacy', | ||
addPaymentCardAnd: '&', | ||
addPaymentCardPciCompliant: 'PCI-DSS compliant', | ||
addPaymentCardBankLevelEncrypt: 'Bank level encryption', | ||
addPaymentCardRedundant: 'Redundant infrastructure', | ||
addPaymentCardLearnMore: 'Learn more about our', | ||
addPaymentCardSecurity: 'security', | ||
amountOwedTitle: 'Outstanding balance', | ||
amountOwedButtonText: 'OK', | ||
amountOwedText: 'This account has an outstanding balance from a previous month.\n\nDo you want to clear balance and take over billing of this workspace?', | ||
ownerOwesAmountTitle: 'Outstanding balance', | ||
ownerOwesAmountButtonText: 'Transfer balance', | ||
ownerOwesAmountText: ({email, amount}) => | ||
`The account owning this workspace (${email}) has an outstanding balance from a previous month.\n\nDo you want to transfer this amount (${amount}) in order to take over billing for this workspace? Your payment card will be charged immediately.`, | ||
subscriptionTitle: 'Take over annual subscription', | ||
subscriptionButtonText: 'Transfer subscription', | ||
subscriptionText: ({usersCount, finalCount}) => | ||
`Taking over this workspace will merge its associated annual subscription with your current subscription. This will increase your subscription size by ${usersCount} users making your new subscription size ${finalCount}. Would you like to continue?`, | ||
duplicateSubscriptionTitle: 'Duplicate subscription alert', | ||
duplicateSubscriptionButtonText: 'Continue', | ||
duplicateSubscriptionText: ({email, workspaceName}) => | ||
`It looks like you may be trying to take over billing for ${email}'s workspaces, but to do that, you need to be an admin on all their workspaces first.\n\nClick "Continue" if you only want to take over billing for the workspace ${workspaceName}.\n\nIf you want to take over billing for their entire subscription, please have them add you as an admin to all their workspaces first before taking over billing.`, | ||
hasFailedSettlementsTitle: 'Cannot transfer ownership', | ||
hasFailedSettlementsButtonText: 'Got it', | ||
hasFailedSettlementsText: ({email}) => | ||
`You cannot take over billing because ${email} has an overdue expensify Expensify Card settlement. Please advise them to reach out to [email protected] to resolve the issue. Then, you can take over billing for this workspace.`, | ||
failedToClearBalanceTitle: 'Failed to clear balance', | ||
failedToClearBalanceButtonText: 'OK', | ||
failedToClearBalanceText: 'We were unable to clear the balance. Please try again later.', | ||
successTitle: 'Woohoo! All set.', | ||
successDescription: "You're now the owner if this workspace.", | ||
errorTitle: 'Oops! Not so fast...', | ||
errorDescriptionPartOne: 'There was a problem transferring ownership of this workspace. Try again, or', | ||
errorDescriptionPartTwo: 'reach out to Concierge', | ||
errorDescriptionPartThree: 'for help.', | ||
}, | ||
}, | ||
getAssistancePage: { | ||
title: 'Get assistance', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -302,6 +302,7 @@ export default { | |
update: 'Actualizar', | ||
member: 'Miembro', | ||
role: 'Role', | ||
currency: 'Divisa', | ||
}, | ||
location: { | ||
useCurrent: 'Usar ubicación actual', | ||
|
@@ -1976,6 +1977,7 @@ export default { | |
removeMemberButtonTitle: 'Quitar del espacio de trabajo', | ||
removeMemberPrompt: ({memberName}) => `¿Estás seguro de que deseas eliminar a ${memberName}`, | ||
removeMemberTitle: 'Eliminar miembro', | ||
transferOwner: 'Transferir la propiedad', | ||
makeMember: 'Hacer miembro', | ||
makeAdmin: 'Hacer administrador', | ||
selectAll: 'Seleccionar todo', | ||
|
@@ -2126,6 +2128,50 @@ export default { | |
'Parece que tu espacio de trabajo está configurado actualmente en una moneda diferente a USD. Por favor, haz clic en el botón de abajo para actualizar tu moneda a USD ahora.', | ||
updateToUSD: 'Actualizar a USD', | ||
}, | ||
changeOwner: { | ||
changeOwnerPageTitle: 'Dueño de la transferencia', | ||
addPaymentCardTitle: 'Ingrese su tarjeta de pago para transferir la propiedad', | ||
addPaymentCardButtonText: 'Aceptar términos y agregar tarjeta de pago', | ||
addPaymentCardReadAndAcceptTextPart1: 'Lea y acepte', | ||
addPaymentCardReadAndAcceptTextPart2: 'para agregar su tarjeta', | ||
addPaymentCardTerms: 'los términos', | ||
addPaymentCardPrivacy: 'la política de privacidad', | ||
addPaymentCardAnd: 'y', | ||
addPaymentCardPciCompliant: 'PCI-DSS obediente', | ||
addPaymentCardBankLevelEncrypt: 'Cifrado a nivel bancario', | ||
addPaymentCardRedundant: 'Infraestructura redundante', | ||
addPaymentCardLearnMore: 'Conozca más sobre nuestra', | ||
addPaymentCardSecurity: 'seguridad', | ||
// TODO: add spanish translations below | ||
amountOwedTitle: 'Saldo pendiente', | ||
amountOwedButtonText: 'OK', | ||
amountOwedText: 'Esta cuenta tiene un saldo pendiente de un mes anterior.\n\n¿Quiere liquidar el saldo y hacerse cargo de la facturación de este espacio de trabajo?', | ||
ownerOwesAmountTitle: 'Saldo pendiente', | ||
ownerOwesAmountButtonText: 'Transferir saldo', | ||
ownerOwesAmountText: ({email, amount}) => | ||
`La cuenta propietaria de este espacio de trabajo (${email}) tiene un saldo pendiente de un mes anterior.\n\n¿Desea transferir este monto (${amount}) para hacerse cargo de la facturación de este espacio de trabajo? Su tarjeta de pago se cargará inmediatamente.`, | ||
subscriptionTitle: 'Asumir la suscripción anual', | ||
subscriptionButtonText: 'Transferir suscripción', | ||
subscriptionText: ({usersCount, finalCount}) => | ||
`Al hacerse cargo de este espacio de trabajo se fusionará su suscripción anual asociada con su suscripción actual. Esto aumentará el tamaño de su suscripción en ${usersCount} usuarios, lo que hará que su nuevo tamaño de suscripción sea ${finalCount}. ¿Te gustaria continuar?`, | ||
duplicateSubscriptionTitle: 'Alerta de suscripción duplicada', | ||
duplicateSubscriptionButtonText: 'Continuar', | ||
duplicateSubscriptionText: ({email, workspaceName}) => | ||
`Parece que estás intentando hacerte cargo de la facturación de los espacios de trabajo de ${email}, pero para hacerlo, primero debes ser administrador de todos sus espacios de trabajo.\n\nHaz clic en "Continuar" si solo quieres tomar sobrefacturación para el espacio de trabajo ${workspaceName}.\n\nSi desea hacerse cargo de la facturación de toda su suscripción, pídales que lo agreguen como administrador a todos sus espacios de trabajo antes de hacerse cargo de la facturación.`, | ||
hasFailedSettlementsTitle: 'No se puede transferir la propiedad', | ||
hasFailedSettlementsButtonText: 'Entiendo', | ||
hasFailedSettlementsText: ({email}) => | ||
`No puede hacerse cargo de la facturación porque ${email} tiene una liquidación vencida de la tarjeta Expensify. Avíseles que se comuniquen con [email protected] para resolver el problema. Luego, podrá hacerse cargo de la facturación de este espacio de trabajo.`, | ||
failedToClearBalanceTitle: 'Failed to clear balance', | ||
failedToClearBalanceButtonText: 'OK', | ||
failedToClearBalanceText: 'We were unable to clear the balance. Please try again later.', | ||
successTitle: '¡Guau! Todo listo.', | ||
successDescription: 'Ahora eres el propietario de este espacio de trabajo.', | ||
errorTitle: '¡Ups! No tan rapido...', | ||
errorDescriptionPartOne: 'Hubo un problema al transferir la propiedad de este espacio de trabajo. Inténtalo de nuevo, o', | ||
errorDescriptionPartTwo: 'contacta con el conserje', | ||
errorDescriptionPartThree: 'por ayuda.', | ||
}, | ||
}, | ||
getAssistancePage: { | ||
title: 'Obtener ayuda', | ||
|
12 changes: 12 additions & 0 deletions
12
src/libs/API/parameters/AddBillingCardAndRequestWorkspaceOwnerChangeParams.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
type AddBillingCardAndRequestWorkspaceOwnerChangeParams = { | ||
policyID: string; | ||
cardNumber: string; | ||
cardYear: string; | ||
cardMonth: string; | ||
cardCVV: string; | ||
addressName: string; | ||
addressZip: string; | ||
currency: string; | ||
}; | ||
|
||
export default AddBillingCardAndRequestWorkspaceOwnerChangeParams; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
import type {PolicyOwnershipChangeChecks} from '@src/types/onyx'; | ||
|
||
type RequestWorkspaceOwnerChangeParams = PolicyOwnershipChangeChecks & { | ||
policyID: string; | ||
}; | ||
|
||
export default RequestWorkspaceOwnerChangeParams; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.