From 7f28aee79c91343f67c32e19e32e2b2df44b205f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?= Date: Thu, 27 Jun 2024 12:39:28 +0200 Subject: [PATCH] (core) Billing updates Summary: - Adding confirmation dialog when user doesn't want to cancel site - Changing `Cancel subscription` to `Cancel plan` - Removing `Pro` from upgrade header on pricing modal - Better handling situation when there is no default price - Removing mentions about sprouts program - Removing cache for stripe plans Test Plan: Updated tests Reviewers: georgegevoian Reviewed By: georgegevoian Differential Revision: https://phab.getgrist.com/D4273 --- app/client/ui/HomeIntro.ts | 5 ++--- app/common/gristUrls.ts | 1 - static/locales/bg.client.json | 2 +- static/locales/de.client.json | 2 +- static/locales/en.client.json | 2 +- static/locales/es.client.json | 2 +- static/locales/fr.client.json | 2 +- static/locales/it.client.json | 2 +- static/locales/pt_BR.client.json | 2 +- static/locales/sl.client.json | 2 +- test/nbrowser/HomeIntro.ts | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/client/ui/HomeIntro.ts b/app/client/ui/HomeIntro.ts index 4c830da7..23ea1cd1 100644 --- a/app/client/ui/HomeIntro.ts +++ b/app/client/ui/HomeIntro.ts @@ -83,7 +83,6 @@ function makeViewerTeamSiteIntro(homeModel: HomeModel) { } function makeTeamSiteIntro(homeModel: HomeModel) { - const sproutsProgram = cssLink({href: commonUrls.sproutsProgram, target: '_blank'}, t("Sprouts Program")); return [ css.docListHeader( t("Welcome to {{- orgName}}", {orgName: homeModel.app.currentOrgName}), @@ -94,8 +93,8 @@ function makeTeamSiteIntro(homeModel: HomeModel) { (!isFeatureEnabled('helpCenter') ? null : cssIntroLine( t( - 'Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.', - {helpCenterLink: helpCenterLink(), sproutsProgram} + 'Learn more in our {{helpCenterLink}}.', + {helpCenterLink: helpCenterLink()} ), testId('welcome-text') ) diff --git a/app/common/gristUrls.ts b/app/common/gristUrls.ts index 8e6eb505..1f66291e 100644 --- a/app/common/gristUrls.ts +++ b/app/common/gristUrls.ts @@ -93,7 +93,6 @@ export const commonUrls = { contactSupport: getContactSupportUrl(), termsOfService: getTermsOfServiceUrl(), plans: "https://www.getgrist.com/pricing", - sproutsProgram: "https://www.getgrist.com/sprouts-program", contact: "https://www.getgrist.com/contact", templates: 'https://www.getgrist.com/templates', community: 'https://community.getgrist.com', diff --git a/static/locales/bg.client.json b/static/locales/bg.client.json index fcfef72e..a5865040 100644 --- a/static/locales/bg.client.json +++ b/static/locales/bg.client.json @@ -499,7 +499,7 @@ "Sign in": "Вписване", "To use Grist, please either sign up or sign in.": "За да използвате Grist, моля, регистрирайте се или се впишете.", "Visit our {{link}} to learn more about Grist.": "Посетете {{link}}, за да научите повече за Grist.", - "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Научете повече в нашия {{helpCenterLink}} или намерете експерт чрез нашата {{sproutsProgram}}.", + "Learn more in our {{helpCenterLink}}.": "Научете повече в нашия {{helpCenterLink}}.", "Get started by creating your first Grist document.": "Започнете, като създадете първия си Grist документ.", "Get started by exploring templates, or creating your first Grist document.": "Започнете, като проучите образците или създадете първия си Grist документ.", "Invite Team Members": "Поканете членове на екипа", diff --git a/static/locales/de.client.json b/static/locales/de.client.json index 8bb45bba..c16e2911 100644 --- a/static/locales/de.client.json +++ b/static/locales/de.client.json @@ -555,7 +555,7 @@ "Visit our {{link}} to learn more about Grist.": "Besuchen Sie unsere {{link}}, um mehr über Grist zu erfahren.", "Sign in": "Anmelden", "To use Grist, please either sign up or sign in.": "Um Grist zu nutzen, melden Sie sich bitte an oder registrieren Sie sich.", - "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Erfahren Sie mehr in unserem {{helpCenterLink}}, oder finden Sie einen Experten über unser {{sproutsProgram}}." + "Learn more in our {{helpCenterLink}}.": "Erfahren Sie mehr in unserem {{helpCenterLink}}." }, "HomeLeftPane": { "Access Details": "Zugangsdetails", diff --git a/static/locales/en.client.json b/static/locales/en.client.json index 420e580e..c1df1049 100644 --- a/static/locales/en.client.json +++ b/static/locales/en.client.json @@ -523,7 +523,7 @@ "Sign in": "Sign in", "To use Grist, please either sign up or sign in.": "To use Grist, please either sign up or sign in.", "Visit our {{link}} to learn more about Grist.": "Visit our {{link}} to learn more about Grist.", - "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}." + "Learn more in our {{helpCenterLink}}.": "Learn more in our {{helpCenterLink}}." }, "HomeLeftPane": { "Access Details": "Access Details", diff --git a/static/locales/es.client.json b/static/locales/es.client.json index b52afd76..f59ad29e 100644 --- a/static/locales/es.client.json +++ b/static/locales/es.client.json @@ -471,7 +471,7 @@ "Visit our {{link}} to learn more about Grist.": "Visita nuestra {{link}} para obtener más información sobre Grist.", "Sign in": "Iniciar sesión", "To use Grist, please either sign up or sign in.": "Para utilizar Grist, regístrate o inicia sesión.", - "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Obtenga más información en nuestro {{helpCenterLink}}, o busque un experto a través de nuestro {{sproutsProgram}}." + "Learn more in our {{helpCenterLink}}.": "Obtenga más información en nuestro {{helpCenterLink}}." }, "HomeLeftPane": { "Access Details": "Detalles de Acceso", diff --git a/static/locales/fr.client.json b/static/locales/fr.client.json index 6f5a9536..463acae1 100644 --- a/static/locales/fr.client.json +++ b/static/locales/fr.client.json @@ -520,7 +520,7 @@ "Visit our {{link}} to learn more about Grist.": "Visitez notre {{link}} pour en savoir plus sur Grist.", "Sign in": "Connexion", "To use Grist, please either sign up or sign in.": "Pour utiliser Grist, connectez-vous ou créez-vous un compte.", - "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Pour en savoir plus, consultez notre {{helpCenterLink}}, ou trouvez un expert via notre {{sproutsProgram}}." + "Learn more in our {{helpCenterLink}}.": "Pour en savoir plus, consultez notre {{helpCenterLink}}." }, "HomeLeftPane": { "All Documents": "Tous les documents", diff --git a/static/locales/it.client.json b/static/locales/it.client.json index bdae0869..4c46628b 100644 --- a/static/locales/it.client.json +++ b/static/locales/it.client.json @@ -25,7 +25,7 @@ "Visit our {{link}} to learn more about Grist.": "Vai a {{link}} per saperne di più su Grist.", "Sign in": "Accedi", "To use Grist, please either sign up or sign in.": "Per usare Grist, iscriviti o accedi.", - "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Approfondisci nel nostro {{helpCenterLink}}, o trova un esperto con il nostro {{sproutsProgram}}." + "Learn more in our {{helpCenterLink}}.": "Approfondisci nel nostro {{helpCenterLink}}." }, "HomeLeftPane": { "Manage Users": "Gestisci gli utenti", diff --git a/static/locales/pt_BR.client.json b/static/locales/pt_BR.client.json index 74685c75..c41e9b0e 100644 --- a/static/locales/pt_BR.client.json +++ b/static/locales/pt_BR.client.json @@ -555,7 +555,7 @@ "Visit our {{link}} to learn more about Grist.": "Visite nosso site {{link}} para saber mais sobre o Grist.", "Sign in": "Entrar", "To use Grist, please either sign up or sign in.": "Para usar o Grist, inscreva-se ou faça login.", - "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Saiba mais em nosso {{helpCenterLink}}, ou encontre um especialista através do nosso {{sproutsProgram}}." + "Learn more in our {{helpCenterLink}}.": "Saiba mais em nosso {{helpCenterLink}}." }, "HomeLeftPane": { "Access Details": "Detalhes de Acesso", diff --git a/static/locales/sl.client.json b/static/locales/sl.client.json index 7eeb44eb..a2d62da0 100644 --- a/static/locales/sl.client.json +++ b/static/locales/sl.client.json @@ -922,7 +922,7 @@ "Visit our {{link}} to learn more about Grist.": "Obiščite našo spletno stran {{link}} da izveste več o Grisstu.", "Sign in": "Prijavi se", "To use Grist, please either sign up or sign in.": "Če želiš uporabljati Grist, se prijavi ali prvič prijavi.", - "Learn more in our {{helpCenterLink}}, or find an expert via our {{sproutsProgram}}.": "Izvedi več v našem {{helpCenterLink}} ali poišči strokovnjaka prek našega {{sproutsProgram}}." + "Learn more in our {{helpCenterLink}}.": "Izvedi več v našem {{helpCenterLink}}." }, "WelcomeSitePicker": { "You have access to the following Grist sites.": "Imate dostop do naslednjih Grist spletnih mest .", diff --git a/test/nbrowser/HomeIntro.ts b/test/nbrowser/HomeIntro.ts index 3d3b1863..92ee9c58 100644 --- a/test/nbrowser/HomeIntro.ts +++ b/test/nbrowser/HomeIntro.ts @@ -87,7 +87,7 @@ describe('HomeIntro', function() { // Check message specific to logged-in user and an empty team site. assert.match(await driver.find('.test-welcome-title').getText(), new RegExp(`Welcome.* ${session.orgName}`)); - assert.match(await driver.find('.test-welcome-text').getText(), /Learn more.*find an expert/); + assert.match(await driver.find('.test-welcome-text').getText(), /Learn more/); assert.notMatch(await driver.find('.test-welcome-text').getText(), /sign up/); });