Merge branch 'main' into tomm/earn-layout-large-fonts

valora-inc · Dec 11, 2024 · d695764 · d695764
2 parents 97010ed + 5bde01c
commit d695764
Show file tree

Hide file tree

Showing 57 changed files with 162 additions and 678 deletions.
diff --git a/__mocks__/secrets.json b/__mocks__/secrets.json
@@ -2,13 +2,11 @@
   "alfajores": {
     "SEGMENT_API_KEY": "SEGMENT_API_KEY",
     "SENTRY_CLIENT_URL": "SENTRY_CLIENT_URL",
-    "RECAPTCHA_SITE_KEY": "RECAPTCHA_SITE_KEY",
     "BIDALI_URL": "BIDALI_URL"
   },
   "mainnet": {
     "SEGMENT_API_KEY": "SEGMENT_API_KEY",
     "SENTRY_CLIENT_URL": "SENTRY_CLIENT_URL",
-    "RECAPTCHA_SITE_KEY": "RECAPTCHA_SITE_KEY",
     "BIDALI_URL": "BIDALI_URL"
   }
 }
diff --git a/locales/base/translation.json b/locales/base/translation.json
@@ -2313,14 +2313,6 @@
     "network": "Network",
     "fees": "Fees"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "New! Ethereum is on {{appName}}",
-    "description1": "We’re opening up this feature to a select group of people first. You’re one of the lucky ones!",
-    "description2": "This is still new, and our team is still working hard to make things perfect. We’d love to hear your feedback.",
-    "primaryCta": "Try it now",
-    "secondaryCta": "No thanks"
-  },
   "getStartedHome": {
     "title": "Buy crypto or transfer tokens",
     "body": "Buy or transfer compatible tokens to send crypto and explore web3!",

diff --git a/locales/de/translation.json b/locales/de/translation.json
@@ -2311,14 +2311,6 @@
     "network": "Netzwerk",
     "fees": "Gebühren"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Neu! Ethereum ist auf {{appName}}",
-    "description1": "Wir öffnen dieses Feature zuerst für eine ausgewählte Gruppe von Menschen. Du bist einer der Glücklichen!",
-    "description2": "Das Feature ist jedoch noch neu und unser Team arbeitet noch hart daran, alles zu perfektionieren. Wir würden uns über dein Feedback freuen.",
-    "primaryCta": "Jetzt testen",
-    "secondaryCta": "Nein, danke"
-  },
   "getStartedHome": {
     "title": "Krypto kaufen oder Tokens überweisen",
     "body": "Kaufe oder überweise kompatible Token, um Krypto zu senden und web3 zu erkunden!",

diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
@@ -2311,14 +2311,6 @@
     "network": "Network",
     "fees": "Fees"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "New! Ethereum is on {{appName}}",
-    "description1": "We’re opening up this feature to a select group of people first. You’re one of the lucky ones!",
-    "description2": "This is still new, and our team is still working hard to make things perfect. We’d love to hear your feedback.",
-    "primaryCta": "Try it now",
-    "secondaryCta": "No thanks"
-  },
   "getStartedHome": {
     "title": "Buy crypto or transfer tokens",
     "body": "Buy or transfer compatible tokens to send crypto and explore web3!",

diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
@@ -2311,14 +2311,6 @@
     "network": "Red",
     "fees": "Tarifas"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "¡Nuevo! Ethereum está en {{appName}}",
-    "description1": "Estamos abriendo esta función a un grupo selecto primero. ¡Eres uno de los afortunados!",
-    "description2": "Esto todavía es nuevo, y nuestro equipo sigue trabajando duro para perfeccionar las cosas. Nos encantaría conocer tu opinión.",
-    "primaryCta": "Pruébalo ahora",
-    "secondaryCta": "No, gracias"
-  },
   "getStartedHome": {
     "title": "Comprar cripto o transferir tokens",
     "body": "Compra o transfiere tokens compatibles para enviar cripto y explora web3",

diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
@@ -2311,14 +2311,6 @@
     "network": "Réseau",
     "fees": "Frais"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Nouveau ! L'Ethereum est sur {{appName}}",
-    "description1": "Nous ouvrons cette fonctionnalité en avant-première à un groupe de personnes restreint. Vous êtes l'un de ces chanceux !",
-    "description2": "Tout cela est encore nouveau et notre équipe travaille pour que tout soit parfait. Nous serions ravis de recevoir vos commentaires.",
-    "primaryCta": "Essayer",
-    "secondaryCta": "Non merci"
-  },
   "getStartedHome": {
     "title": "Acheter des cryptomonnaies ou des jetons de transfert",
     "body": "Achetez ou transférez des jetons compatibles pour envoyer des cryptomonnaies et découvrir le web3 !",

diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
@@ -2311,14 +2311,6 @@
     "network": "Rete",
     "fees": "Commissioni"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Novità! Ethereum è in {{appName}}",
-    "description1": "Inizialmente, stiamo rendendo disponibile questa funzionalità a un gruppo selezionato di persone. Tu sei tra i fortunati!",
-    "description2": "È ancora una novità e il nostro team si sta impegnando per rendere tutto perfetto. Saremo lieti di ricevere il tuo feedback.",
-    "primaryCta": "Provala ora",
-    "secondaryCta": "No grazie"
-  },
   "getStartedHome": {
     "title": "Acquista criptovalute o trasferisci token",
     "body": "Compra o trasferisci token compatibili per inviare criptovalute ed esplorare il Web3!",

diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
@@ -2315,14 +2315,6 @@
     "network": "Sieć",
     "fees": "Opłaty"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Nowość – Ethereum jest na {{appName}}!",
-    "description1": "Najpierw udostępniamy tę funkcję wybranej grupie osób. Jesteś jednym z tych szczęśliwców!",
-    "description2": "To wciąż nowość, a nasz zespół wciąż ciężko pracuje, aby wszystko działało idealnie. Chętnie poznamy Twoją opinię.",
-    "primaryCta": "Wypróbuj teraz",
-    "secondaryCta": "Nie, dziękuję"
-  },
   "getStartedHome": {
     "title": "Kup kryptowaluty lub prześlij tokeny",
     "body": "Kupuj lub przesyłaj kompatybilne tokeny, aby wysyłać kryptowaluty i odkrywać web3!",

diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
@@ -2311,14 +2311,6 @@
     "network": "Rede",
     "fees": "Taxas"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Novo! Ethereum agora disponível na {{appName}}",
-    "description1": "Primeiro, estamos disponibilizando este recurso para um grupo seleto de pessoas. Você é um dos sortudos!",
-    "description2": "Isso ainda é novo e a nossa equipe ainda está trabalhando duro para aperfeiçoar tudo. Gostaríamos muito de receber o seu feedback.",
-    "primaryCta": "Experimentar agora",
-    "secondaryCta": "Não, obrigado"
-  },
   "getStartedHome": {
     "title": "Comprar cripto ou transferir tokens",
     "body": "Compre ou transfira tokens compatíveis para enviar cripto e explorar a web3!",

diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
@@ -2315,14 +2315,6 @@
     "network": "Сообщество",
     "fees": "Комиссия"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Новинка! Ethereum в {{appName}}",
-    "description1": "Сначала мы открываем эту функцию для избранных. Вы в числе счастливчиков!",
-    "description2": "Это новая функция, и наша команда продолжает упорно работать над тем, чтобы сделать все идеально. Мы будем рады получить ваш отзыв.",
-    "primaryCta": "Попробовать",
-    "secondaryCta": "Нет, спасибо"
-  },
   "getStartedHome": {
     "title": "Покупайте криптовалюту или переводите токены",
     "body": "Покупайте или переводите совместимые токены, чтобы отправлять криптовалюту и исследовать web3!",

diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
@@ -2309,14 +2309,6 @@
     "network": "เครือข่าย",
     "fees": "ค่าธรรมเนียม"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "ใหม่! Ethereum บน {{appName}}",
-    "description1": "เรากำลังจะเปิดตัวคุณสมบัตินี้ให้กับบุคคลกลุุ่มแรกที่ได้รับเลือก และคุณเป็นหนึ่งในผู้โชคดี!",
-    "description2": "นี่เป็นคุณสมบัติใหม่และทีมงานของเรายังคงทำงานอย่างหนักเพื่อทำให้ทุกอย่างสมบูรณ์แบบ เรายินดีรับฟังความคิดเห็นของคุณ",
-    "primaryCta": "ลองเลย",
-    "secondaryCta": "ไม่ ขอบคุณ"
-  },
   "getStartedHome": {
     "title": "ซื้อคริปโตหรือโอนโทเค็น",
     "body": "ซื้อหรือโอนโทเค็นที่เข้ากันได้เพื่อส่งคริปโตและสำรวจ web3!",

diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
@@ -2311,14 +2311,6 @@
     "network": "Ağ",
     "fees": "Ücretler"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Yeni! Ethereum {{appName}} uygulamasında",
-    "description1": "Bu özelliği ilk olarak seçkin bir grup kullanıcıya sunuyoruz. Siz şanslı olanlardan birisiniz!",
-    "description2": "Bu henüz yeni ve ekibimiz işleri mükemmel hale getirmek için hâlâ çok çalışıyor. Geri bildirimlerinizi duymak isteriz.",
-    "primaryCta": "Şimdi deneyin",
-    "secondaryCta": "Hayır, teşekkürler"
-  },
   "getStartedHome": {
     "title": "Kripto satın alın veya token transfer edin",
     "body": "Kripto göndermek ve web3'ü keşfetmek için uyumlu tokenları satın alın veya transfer edin!",

diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
@@ -2315,14 +2315,6 @@
     "network": "Мережа",
     "fees": "Комісії"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Новинка! Ethereum з’явився в {{appName}}",
-    "description1": "Ми відібрали групу користувачів, для якої спершу відкриваємо цю функцію. Ви серед тих, кому пощастило!",
-    "description2": "Це нова функція, тому наша команда досі наполегливо працює, щоб удосконалити її роботу. Ваші відгуки радо вітаються.",
-    "primaryCta": "Спробуйте зараз",
-    "secondaryCta": "Не варто дякувати"
-  },
   "getStartedHome": {
     "title": "Придбайте криптовалюту чи переведіть токени",
     "body": "Купуйте чи переводьте сумісні токени, щоб надсилати криптовалюту й досліджувати web3!",

diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
@@ -2309,14 +2309,6 @@
     "network": "Mạng lưới",
     "fees": "Phí"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "Tin nóng! Ethereum đã có trên {{appName}}",
-    "description1": "Chúng tôi mở rộng tính năng này cho một nhóm người dùng được chọn trước. Bạn là một trong những người may mắn!",
-    "description2": "Tính năng này vẫn còn mới và nhóm của chúng tôi vẫn đang nỗ lực để hoàn chỉnh mọi thứ. Chúng tôi rất mong nhận được phản hồi của bạn.",
-    "primaryCta": "Thử ngay",
-    "secondaryCta": "Không, cảm ơn"
-  },
   "getStartedHome": {
     "title": "Mua tiền kỹ thuật số hoặc chuyển token",
     "body": "Mua hoặc chuyển token tương thích để gửi tiền điện tử và khám phá web3!",

diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
@@ -2309,14 +2309,6 @@
     "network": "网络",
     "fees": "费用"
   },
-  "multichainBeta": {
-    "beta": "BETA",
-    "title": "新消息！Ethereum 登陆 {{appName}} 了",
-    "description1": "我们将首先向特定人群开放这项功能。您是幸运儿之一！",
-    "description2": "这还是个新产品，我们的团队仍在努力使其更加完美。我们希望听到您的反馈意见。",
-    "primaryCta": "立即试试看",
-    "secondaryCta": "不，谢谢"
-  },
   "getStartedHome": {
     "title": "购买加密货币或转移代币。",
     "body": "购买或转移兼容的代币，发送加密货币并探索 Web3！",

diff --git a/secrets.json.enc b/secrets.json.enc
diff --git a/src/account/SupportContact.test.tsx b/src/account/SupportContact.test.tsx
@@ -4,7 +4,6 @@ import 'react-native'
 import { Provider } from 'react-redux'
 import SupportContact, { validateEmail } from 'src/account/SupportContact'
 import { sendSupportRequest } from 'src/account/zendesk'
-import { MultichainBetaStatus } from 'src/app/actions'
 import { APP_NAME } from 'src/config'
 import i18n from 'src/i18n'
 import { Screens } from 'src/navigator/Screens'
@@ -54,9 +53,7 @@ describe('Contact', () => {
     mockedLogAttachments.mockResolvedValue(logAttachments)
 
     const { getByTestId } = render(
-      <Provider
-        store={createMockStore({ app: { multichainBetaStatus: MultichainBetaStatus.OptedOut } })}
-      >
+      <Provider store={createMockStore()}>
         <SupportContact {...mockScreenProps} />
       </Provider>
     )
@@ -81,7 +78,6 @@ describe('Contact', () => {
         deviceId: 'someDeviceId',
         deviceModel: 'someModel',
         hooksPreviewEnabled: false,
-        multichainBetaStatus: 'OptedOut',
         network: 'alfajores',
         numberVerifiedCentralized: false,
         os: 'android',

diff --git a/src/account/SupportContact.tsx b/src/account/SupportContact.tsx
@@ -6,11 +6,7 @@ import DeviceInfo from 'react-native-device-info'
 import { e164NumberSelector, nameSelector } from 'src/account/selectors'
 import { sendSupportRequest } from 'src/account/zendesk'
 import { showMessage } from 'src/alert/actions'
-import {
-  multichainBetaStatusSelector,
-  phoneNumberVerifiedSelector,
-  sessionIdSelector,
-} from 'src/app/selectors'
+import { phoneNumberVerifiedSelector, sessionIdSelector } from 'src/app/selectors'
 import Button, { BtnTypes } from 'src/components/Button'
 import KeyboardSpacer from 'src/components/KeyboardSpacer'
 import Switch from 'src/components/Switch'
@@ -69,7 +65,6 @@ function SupportContact({ route }: Props) {
   const currentAccount = useSelector(currentAccountSelector)
   const sessionId = useSelector(sessionIdSelector)
   const numberVerifiedCentralized = useSelector(phoneNumberVerifiedSelector)
-  const multichainBetaStatus = useSelector(multichainBetaStatusSelector)
   const { countryCodeAlpha2: country, region } = useSelector(userLocationDataSelector)
   const hooksPreviewApiUrl = useSelector(hooksPreviewApiUrlSelector)
   const dispatch = useDispatch()
@@ -103,7 +98,6 @@ function SupportContact({ route }: Props) {
       address: currentAccount,
       sessionId,
       numberVerifiedCentralized,
-      multichainBetaStatus,
       hooksPreviewEnabled: !!hooksPreviewApiUrl,
       network: DEFAULT_TESTNET,
     }

diff --git a/src/analytics/Events.tsx b/src/analytics/Events.tsx
@@ -25,10 +25,6 @@ export enum AppEvents {
   in_app_review_impression = 'in_app_review_impression',
   in_app_review_error = 'in_app_review_error',
 
-  multichain_beta_opt_in = 'multichain_beta_opt_in',
-  multichain_beta_opt_out = 'multichain_beta_opt_out',
-  multichain_beta_contact_support = 'multichain_beta_contact_support',
-
   handle_deeplink = 'handle_deeplink',
 }
 

diff --git a/src/analytics/Properties.tsx b/src/analytics/Properties.tsx
@@ -147,10 +147,6 @@ interface AppEventsProperties {
   [AppEvents.in_app_review_error]: {
     error: string
   }
-  [AppEvents.multichain_beta_opt_in]: undefined
-  [AppEvents.multichain_beta_opt_out]: undefined
-  [AppEvents.multichain_beta_contact_support]: undefined
-
   [AppEvents.handle_deeplink]: {
     pathStartsWith: string
     fullPath: string | null

diff --git a/src/analytics/docs.ts b/src/analytics/docs.ts
@@ -66,9 +66,6 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   [AppEvents.account_liquidated]: `Fired when user balance (total fiat value of all supported tokens) falls below $0.01 USD and the last known value was greater than this`,
   [AppEvents.in_app_review_impression]: `User sees an in-app review request`,
   [AppEvents.in_app_review_error]: `Error while attempting to display in-app review`,
-  [AppEvents.multichain_beta_opt_in]: `When the user taps the Try it Now button on the multichain beta screen`,
-  [AppEvents.multichain_beta_opt_out]: `When the user taps the No Thanks button on the multichain beta screen`,
-  [AppEvents.multichain_beta_contact_support]: `When the user taps the Contact Support button on the multichain beta screen`,
   [AppEvents.handle_deeplink]: `When a deeplink that leads into the app is detected and handled`,
   [HomeEvents.account_circle_tapped]: `When the account circle used in the tab navigation is tapped`,
   [HomeEvents.profile_address_copy]: `When a user copies their wallet address from the profile screen`,
@@ -661,4 +658,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
   // [EarnEvents.earn_exit_pool_press]: `When the user taps on the exit pool button from the earn card in discover tab`,
   // [EarnEvents.earn_deposit_more_press]: `When the user taps deposit more button from the earn card in discover tab`,
   // [EarnEvents.earn_active_pools_card_press]: `When the user taps on the active pool card in discover tab.`,
+  // [AppEvents.multichain_beta_opt_in]: `When the user taps the Try it Now button on the multichain beta screen`,
+  // [AppEvents.multichain_beta_opt_out]: `When the user taps the No Thanks button on the multichain beta screen`,
+  // [AppEvents.multichain_beta_contact_support]: `When the user taps the Contact Support button on the multichain beta screen`,
 }