Skip to content

Commit 4992e25

Browse files
committed
refactor: Rename requestEarlyCancellation to cancelSubscription in constants, page, and i18n
1 parent a6b6cae commit 4992e25

22 files changed

Lines changed: 56 additions & 56 deletions

File tree

src/CONST/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9507,7 +9507,7 @@ const CONST = {
95079507
AUTHENTICATE_PAYMENT: 'SettingsSubscription-AuthenticatePayment',
95089508
VIEW_PAYMENT_HISTORY: 'SettingsSubscription-ViewPaymentHistory',
95099509
REQUEST_REFUND: 'SettingsSubscription-RequestRefund',
9510-
REQUEST_EARLY_CANCELLATION: 'SettingsSubscription-RequestEarlyCancellation',
9510+
CANCEL_SUBSCRIPTION: 'SettingsSubscription-CancelSubscription',
95119511
},
95129512
SETTINGS_HELP: {
95139513
CONCIERGE_CHAT: 'SettingsHelp-ConciergeChat',

src/ONYXKEYS.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -966,8 +966,8 @@ const ONYXKEYS = {
966966
PERSONAL_BANK_ACCOUNT_FORM_DRAFT: 'personalBankAccountDraft',
967967
DISABLE_AUTO_RENEW_SURVEY_FORM: 'disableAutoRenewSurveyForm',
968968
DISABLE_AUTO_RENEW_SURVEY_FORM_DRAFT: 'disableAutoRenewSurveyFormDraft',
969-
REQUEST_EARLY_CANCELLATION_FORM: 'requestEarlyCancellationForm',
970-
REQUEST_EARLY_CANCELLATION_FORM_DRAFT: 'requestEarlyCancellationFormDraft',
969+
CANCEL_SUBSCRIPTION_FORM: 'cancelSubscriptionForm',
970+
CANCEL_SUBSCRIPTION_FORM_DRAFT: 'cancelSubscriptionFormDraft',
971971
EXIT_SURVEY_RESPONSE_FORM: 'exitSurveyResponseForm',
972972
EXIT_SURVEY_RESPONSE_FORM_DRAFT: 'exitSurveyResponseFormDraft',
973973
WALLET_ADDITIONAL_DETAILS: 'walletAdditionalDetails',
@@ -1133,7 +1133,7 @@ type OnyxFormValuesMapping = {
11331133
[ONYXKEYS.FORMS.NEW_TASK_FORM]: FormTypes.NewTaskForm;
11341134
[ONYXKEYS.FORMS.EDIT_TASK_FORM]: FormTypes.EditTaskForm;
11351135
[ONYXKEYS.FORMS.DISABLE_AUTO_RENEW_SURVEY_FORM]: FormTypes.FeedbackSurveyForm;
1136-
[ONYXKEYS.FORMS.REQUEST_EARLY_CANCELLATION_FORM]: FormTypes.FeedbackSurveyForm;
1136+
[ONYXKEYS.FORMS.CANCEL_SUBSCRIPTION_FORM]: FormTypes.FeedbackSurveyForm;
11371137
[ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM]: FormTypes.ExitSurveyResponseForm;
11381138
[ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM]: FormTypes.MoneyRequestDescriptionForm;
11391139
[ONYXKEYS.FORMS.MONEY_REQUEST_MERCHANT_FORM]: FormTypes.MoneyRequestMerchantForm;

src/ROUTES.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ const ROUTES = {
509509
SETTINGS_SUBSCRIPTION_CHANGE_BILLING_CURRENCY: 'settings/subscription/change-billing-currency',
510510
SETTINGS_SUBSCRIPTION_CHANGE_PAYMENT_CURRENCY: 'settings/subscription/add-payment-card/change-payment-currency',
511511
SETTINGS_SUBSCRIPTION_DISABLE_AUTO_RENEW_SURVEY: 'settings/subscription/disable-auto-renew-survey',
512-
SETTINGS_SUBSCRIPTION_REQUEST_EARLY_CANCELLATION: 'settings/subscription/request-early-cancellation-survey',
512+
SETTINGS_SUBSCRIPTION_CANCEL_SUBSCRIPTION: 'settings/subscription/cancel-subscription-survey',
513513
SETTINGS_SUBSCRIPTION_DOWNGRADE_BLOCKED: {
514514
route: 'settings/subscription/downgrade-blocked',
515515

src/SCREENS.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ const SCREENS = {
259259
DISABLE_AUTO_RENEW_SURVEY: 'Settings_Subscription_DisableAutoRenewSurvey',
260260
CHANGE_BILLING_CURRENCY: 'Settings_Subscription_Change_Billing_Currency',
261261
CHANGE_PAYMENT_CURRENCY: 'Settings_Subscription_Change_Payment_Currency',
262-
REQUEST_EARLY_CANCELLATION: 'Settings_Subscription_RequestEarlyCancellation',
262+
CANCEL_SUBSCRIPTION: 'Settings_Subscription_CancelSubscription',
263263
SUBSCRIPTION_DOWNGRADE_BLOCKED: 'Settings_Subscription_DowngradeBlocked',
264264
},
265265
},

src/components/FeedbackSurvey.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import TextInput from './TextInput';
2121

2222
type FeedbackSurveyProps = {
2323
/** A unique Onyx key identifying the form */
24-
formID: typeof ONYXKEYS.FORMS.DISABLE_AUTO_RENEW_SURVEY_FORM | typeof ONYXKEYS.FORMS.REQUEST_EARLY_CANCELLATION_FORM;
24+
formID: typeof ONYXKEYS.FORMS.DISABLE_AUTO_RENEW_SURVEY_FORM | typeof ONYXKEYS.FORMS.CANCEL_SUBSCRIPTION_FORM;
2525

2626
/** Title of the survey */
2727
title: string;

src/languages/de.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8665,7 +8665,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
86658665
collectBillingDescription: 'Collect-Arbeitsbereiche werden monatlich pro Mitglied ohne jährliche Verpflichtung abgerechnet.',
86668666
pricing: 'Preise',
86678667
},
8668-
requestEarlyCancellation: {
8668+
cancelSubscription: {
86698669
title: 'Abonnement kündigen',
86708670
subtitle: 'Was ist der Hauptgrund, warum du dein Abonnement kündigst?',
86718671
subscriptionCanceled: {
@@ -8680,7 +8680,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
86808680
subtitle:
86818681
'Danke, dass du uns mitgeteilt hast, dass du dein Abonnement kündigen möchtest. Wir prüfen deine Anfrage und melden uns in Kürze über deinen Chat mit <concierge-link>Concierge</concierge-link>.',
86828682
},
8683-
acknowledgement: `Mit dem Antrag auf vorzeitige Kündigung erkenne ich an und stimme zu, dass Expensify gemäß den Expensify-<a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Nutzungsbedingungen</a> oder einer sonstigen anwendbaren Servicevereinbarung zwischen mir und Expensify nicht verpflichtet ist, einem solchen Antrag stattzugeben, und dass Expensify das alleinige Ermessen in Bezug auf die Genehmigung eines solchen Antrags behält.`,
8683+
acknowledgement: `Mit dem Antrag auf Kündigung erkenne ich an und stimme zu, dass Expensify gemäß den Expensify-<a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Nutzungsbedingungen</a> oder einer sonstigen anwendbaren Servicevereinbarung zwischen mir und Expensify nicht verpflichtet ist, einem solchen Antrag stattzugeben, und dass Expensify das alleinige Ermessen in Bezug auf die Genehmigung eines solchen Antrags behält.`,
86848684
},
86858685
},
86868686
feedbackSurvey: {

src/languages/en.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8647,7 +8647,7 @@ const translations = {
86478647
collectBillingDescription: 'Collect workspaces are billed monthly per member, with no annual commitment.',
86488648
pricing: 'Pricing',
86498649
},
8650-
requestEarlyCancellation: {
8650+
cancelSubscription: {
86518651
title: 'Cancel subscription',
86528652
subtitle: 'What’s the main reason you’re canceling your subscription?',
86538653
subscriptionCanceled: {
@@ -8662,7 +8662,7 @@ const translations = {
86628662
subtitle:
86638663
'Thanks for letting us know you’re interested in canceling your subscription. We’re reviewing your request and will be in touch soon via your chat with <concierge-link>Concierge</concierge-link>.',
86648664
},
8665-
acknowledgement: `By requesting early cancellation, I acknowledge and agree that Expensify has no obligation to grant such request under the Expensify <a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Terms of Service</a> or other applicable services agreement between me and Expensify and that Expensify retains sole discretion with regard to granting any such request.`,
8665+
acknowledgement: `By requesting cancellation, I acknowledge and agree that Expensify has no obligation to grant such request under the Expensify <a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Terms of Service</a> or other applicable services agreement between me and Expensify and that Expensify retains sole discretion with regard to granting any such request.`,
86668666
},
86678667
},
86688668
feedbackSurvey: {

src/languages/es.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8876,7 +8876,7 @@ ${amount} para ${merchant} - ${date}`,
88768876
collectBillingDescription: 'Los espacios de trabajo del plan Collect se facturan mensualmente por miembro, sin compromiso anual.',
88778877
pricing: 'Precios',
88788878
},
8879-
requestEarlyCancellation: {
8879+
cancelSubscription: {
88808880
title: 'Cancelar suscripción',
88818881
subtitle: '¿Cuál es la razón principal por la que solicitas cancelar tu suscripción?',
88828882
subscriptionCanceled: {
@@ -8891,7 +8891,7 @@ ${amount} para ${merchant} - ${date}`,
88918891
subtitle:
88928892
'Gracias por hacernos saber que deseas cancelar tu suscripción. Estamos revisando tu solicitud y nos comunicaremos contigo en breve a través de tu chat con <concierge-link>Concierge</concierge-link>.',
88938893
},
8894-
acknowledgement: `Al solicitar la cancelación anticipada, reconozco y acepto que Expensify no tiene ninguna obligación de conceder dicha solicitud en virtud de las <a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Condiciones de Servicio</a> de Expensify u otro acuerdo de servicios aplicable entre Expensify y yo, y que Expensify se reserva el derecho exclusivo a conceder dicha solicitud.`,
8894+
acknowledgement: `Al solicitar la cancelación, reconozco y acepto que Expensify no tiene ninguna obligación de conceder dicha solicitud en virtud de las <a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Condiciones de Servicio</a> de Expensify u otro acuerdo de servicios aplicable entre Expensify y yo, y que Expensify se reserva el derecho exclusivo a conceder dicha solicitud.`,
88958895
},
88968896
},
88978897
feedbackSurvey: {

src/languages/fr.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8686,7 +8686,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
86868686
collectBillingDescription: 'Les espaces de travail Collect sont facturés mensuellement par membre, sans engagement annuel.',
86878687
pricing: 'Tarification',
86888688
},
8689-
requestEarlyCancellation: {
8689+
cancelSubscription: {
86908690
title: "Annuler l'abonnement",
86918691
subtitle: 'Quelle est la principale raison pour laquelle vous souhaitez résilier votre abonnement ?',
86928692
subscriptionCanceled: {
@@ -8701,7 +8701,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
87018701
subtitle:
87028702
'Merci de nous avoir informés que vous souhaitez résilier votre abonnement. Nous examinons votre demande et nous vous contacterons bientôt via votre discussion avec <concierge-link>Concierge</concierge-link>.',
87038703
},
8704-
acknowledgement: `En demandant une résiliation anticipée, je reconnais et j’accepte qu’Expensify n’a aucune obligation d’accéder à une telle demande en vertu des <a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Conditions d’utilisation</a> d’Expensify ou de tout autre contrat de services applicable entre Expensify et moi, et qu’Expensify conserve toute latitude quant à l’acceptation ou non de cette demande.`,
8704+
acknowledgement: `En demandant une résiliation, je reconnais et j’accepte qu’Expensify n’a aucune obligation d’accéder à une telle demande en vertu des <a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Conditions d’utilisation</a> d’Expensify ou de tout autre contrat de services applicable entre Expensify et moi, et qu’Expensify conserve toute latitude quant à l’acceptation ou non de cette demande.`,
87058705
},
87068706
},
87078707
feedbackSurvey: {

src/languages/it.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8652,7 +8652,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
86528652
collectBillingDescription: 'Gli spazi di lavoro Collect vengono fatturati mensilmente per membro, senza impegno annuale.',
86538653
pricing: 'Prezzi',
86548654
},
8655-
requestEarlyCancellation: {
8655+
cancelSubscription: {
86568656
title: 'Annulla abbonamento',
86578657
subtitle: 'Qual è il motivo principale per cui vuoi annullare il tuo abbonamento?',
86588658
subscriptionCanceled: {
@@ -8667,7 +8667,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
86678667
subtitle:
86688668
'Grazie per averci informato che sei interessato/a a disdire il tuo abbonamento. Stiamo esaminando la tua richiesta e ti contatteremo presto tramite la tua chat con <concierge-link>Concierge</concierge-link>.',
86698669
},
8670-
acknowledgement: `Richiedendo la cancellazione anticipata, riconosco e accetto che Expensify non ha alcun obbligo di concedere tale richiesta ai sensi dei <a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Termini di servizio</a> di Expensify o di altri contratti di servizio applicabili tra me ed Expensify e che Expensify mantiene esclusiva discrezionalità in merito alla concessione di qualsiasi tale richiesta.`,
8670+
acknowledgement: `Richiedendo la cancellazione, riconosco e accetto che Expensify non ha alcun obbligo di concedere tale richiesta ai sensi dei <a href=${CONST.OLD_DOT_PUBLIC_URLS.TERMS_URL}>Termini di servizio</a> di Expensify o di altri contratti di servizio applicabili tra me ed Expensify e che Expensify mantiene esclusiva discrezionalità in merito alla concessione di qualsiasi tale richiesta.`,
86718671
},
86728672
},
86738673
feedbackSurvey: {

0 commit comments

Comments
 (0)