Merge branch 'main' into tomm/act-918

valora-inc · Oct 9, 2023 · da5e692 · da5e692
2 parents 11a2010 + e2dcd67
commit da5e692
Show file tree

Hide file tree

Showing 58 changed files with 288 additions and 280 deletions.
diff --git a/locales/de/translation.json b/locales/de/translation.json
@@ -1411,13 +1411,6 @@
   "others": "Andere",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Letzte 24 Stunden",
-  "merchant": "Zahlung des Händlers",
-  "merchantMoneyEscrow": "Du bist dabei, eine direkte Zahlung an einen Händler zu senden.",
-  "merchantPaymentNumberVerificationMessage": "Du musst deine Nummer verbinden",
-  "merchantPaymentSubmitFail": "Die Übermittlung deiner Zahlung ist fehlgeschalgen",
-  "merchantPaymentSetup": "Beim Laden der Händlerinformation ist ein Fehler aufgetreten. Bitte versuche, den QR-Code erneut zu scannen",
-  "merchantPaymentSubmitSuccess": "Deine Zahlung wurde erfolgreich übermittelt",
-  "merchantWalletUnlockError": "Beim Entsperren deines Wallets ist etwas schief gelaufen, bitte versuche es erneut",
   "noMoreTransactions": "Es gibt keine weiteren Transaktionen",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Die Einkäufe werden über unsere Partneranbieter abgewickelt. Die Gebühren können variieren. Einige Zahlungsarten sind in deiner Region nicht verfügbar.",

diff --git a/locales/en-US/translation.json b/locales/en-US/translation.json
@@ -1411,13 +1411,6 @@
   "others": "Others",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Last 24 hrs",
-  "merchant": "Merchant Payment",
-  "merchantMoneyEscrow": "You're about to send a direct payment to a merchant.",
-  "merchantPaymentNumberVerificationMessage": "You need to connect your number",
-  "merchantPaymentSubmitFail": "Your payment failed to submit",
-  "merchantPaymentSetup": "There was an error loading the merchant information, please try scanning the QRCode again",
-  "merchantPaymentSubmitSuccess": "Your payment was successfully submitted",
-  "merchantWalletUnlockError": "Something went wrong when unlocking your wallet, please try again",
   "noMoreTransactions": "There are no more transactions",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Purchases are powered by our partner providers. Fees may vary. Some payment methods are unavailable in your region.",

diff --git a/locales/es-419/translation.json b/locales/es-419/translation.json
@@ -1411,13 +1411,6 @@
   "others": "Otros",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Últimas 24 horas",
-  "merchant": "Pago a comerciante",
-  "merchantMoneyEscrow": "Estás a punto de enviar un pago directo a un comerciante.",
-  "merchantPaymentNumberVerificationMessage": "Debes conectar tu número",
-  "merchantPaymentSubmitFail": "Hubo un error al completar el pago",
-  "merchantPaymentSetup": "Hubo un error al cargar la información del comerciante, intenta escanear el código QR de nuevo",
-  "merchantPaymentSubmitSuccess": "Tu pago se ha enviado correctamente",
-  "merchantWalletUnlockError": "Algo salió mal al desbloquear tu wallet, vuelve a intentarlo",
   "noMoreTransactions": "No hay más transacciones",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Las compras se realizan a través de nuestros proveedores asociados. Las tarifas pueden variar. Algunos métodos de pago no están disponibles en tu región.",

diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
@@ -1411,13 +1411,6 @@
   "others": "Autres",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "24 dernières heures",
-  "merchant": "Paiement commerçant",
-  "merchantMoneyEscrow": "Vous êtes sur le point d'envoyer un paiement direct à un vendeur.",
-  "merchantPaymentNumberVerificationMessage": "Vous devez connecter votre numéro",
-  "merchantPaymentSubmitFail": "Votre paiement n'a pas pu être envoyé",
-  "merchantPaymentSetup": "Une erreur s'est produite lors du chargement des informations du vendeur, veuillez réessayer de scanner le QR code",
-  "merchantPaymentSubmitSuccess": "Votre paiement a bien été envoyé",
-  "merchantWalletUnlockError": "Une erreur s'est produite lors du déverrouillage de votre wallet, veuillez réessayer",
   "noMoreTransactions": "Il n'y a plus de transactions",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Les achats sont effectués par nos prestataires partenaires. Les frais peuvent varier. Certains modes de paiement ne sont pas disponibles dans votre pays.",

diff --git a/locales/it-IT/translation.json b/locales/it-IT/translation.json
@@ -1411,13 +1411,6 @@
   "others": "Altri",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Ultime 24 ore",
-  "merchant": "Pagamento commerciante",
-  "merchantMoneyEscrow": "Stai per inviare un pagamento diretto a un commerciante.",
-  "merchantPaymentNumberVerificationMessage": "Devi collegare il tuo numero",
-  "merchantPaymentSubmitFail": "Impossibile inviare il pagamento",
-  "merchantPaymentSetup": "Si è verificato un errore durante il caricamento delle informazioni del commerciante, prova a inquadrare nuovamente il codice QR",
-  "merchantPaymentSubmitSuccess": "Pagamento inviato correttamente",
-  "merchantWalletUnlockError": "Si è verificato un errore durante lo sbloccaggio del tuo wallet, riprova",
   "noMoreTransactions": "Non ci sono altre transazioni",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Gli acquisti sono gestiti dai nostri fornitori partner. Le tariffe possono variare. Alcuni metodi di pagamento non sono disponibili nella tua area geografica.",

diff --git a/locales/pl-PL/translation.json b/locales/pl-PL/translation.json
@@ -1415,13 +1415,6 @@
   "others": "Inne",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Ostatnie 24 godz.",
-  "merchant": "Płatności dla sprzedawcy",
-  "merchantMoneyEscrow": "Zamierzasz wysłać płatność bezpośrednio do sprzedawcy.",
-  "merchantPaymentNumberVerificationMessage": "Musisz podłączyć swój numer",
-  "merchantPaymentSubmitFail": "Twoja płatność nie została przesłana",
-  "merchantPaymentSetup": "Wystąpił błąd podczas wczytywania danych sprzedawcy, spróbuj ponownie zeskanować kod QR",
-  "merchantPaymentSubmitSuccess": "Twoja płatność została pomyślnie przesłana",
-  "merchantWalletUnlockError": "Coś poszło nie tak podczas odblokowywania portfela, spróbuj ponownie",
   "noMoreTransactions": "Nie ma więcej transakcji",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Zakupy są obsługiwane przez naszych partnerów. Opłaty mogą się różnić. Niektóre metody płatności są niedostępne w Twoim regionie.",

diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
@@ -1411,13 +1411,6 @@
   "others": "Outros",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Últimas 24 horas",
-  "merchant": "Pagamento a comerciantes",
-  "merchantMoneyEscrow": "Você está prestes a enviar um pagamento direto a um comerciante.",
-  "merchantPaymentNumberVerificationMessage": "Você precisa conectar seu número",
-  "merchantPaymentSubmitFail": "Seu pagamento não pôde ser enviado",
-  "merchantPaymentSetup": "Ocorreu um erro ao carregar as informações do comerciante, tente escanear o QRCode novamente",
-  "merchantPaymentSubmitSuccess": "Seu pagamento foi enviado com sucesso",
-  "merchantWalletUnlockError": "Algo deu errado ao desbloquear sua carteira, tente novamente",
   "noMoreTransactions": "Não há mais transacções",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "As compras são fornecidas por nossos fornecedores parceiros. As taxas podem variar. Algumas formas de pagamento não estão disponíveis na sua região.",

diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
@@ -1415,13 +1415,6 @@
   "others": "Другие",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Последние 24 часа",
-  "merchant": "Платеж продавцу",
-  "merchantMoneyEscrow": "Вы собираетесь отправить прямой платеж продавцу.",
-  "merchantPaymentNumberVerificationMessage": "Вам нужно привязать свой номер",
-  "merchantPaymentSubmitFail": "Ваш платеж не удалось отправить",
-  "merchantPaymentSetup": "При загрузке информации о продавце произошла ошибка. Повторите попытку сканирования QR-кода",
-  "merchantPaymentSubmitSuccess": "Ваш платеж был успешно отправлен",
-  "merchantWalletUnlockError": "Что-то пошло не так при разблокировке кошелька, повторите попытку",
   "noMoreTransactions": "Больше транзакций нет",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Покупки осуществляются с помощью наших партнеров-провайдеров. Сборы могут варьироваться. Некоторые способы оплаты недоступны в вашем регионе.",

diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
@@ -1409,13 +1409,6 @@
   "others": "อื่นๆ",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "24 ชม. ที่ผ่านมา",
-  "merchant": "การชำระเงินร้านค้า",
-  "merchantMoneyEscrow": "คุณกำลังจะส่งการชำระเงินโดยตรงไปยังร้านค้า",
-  "merchantPaymentNumberVerificationMessage": "คุณต้องเชื่อมต่อหมายเลขของคุณ",
-  "merchantPaymentSubmitFail": "ไม่สามารถส่งการชำระเงินได้",
-  "merchantPaymentSetup": "มีข้อผิดพลาดขณะโหลดข้อมูลร้านค้า โปรดลองสแกน QR Code อีกครั้ง",
-  "merchantPaymentSubmitSuccess": "ส่งการชำระเงินสำเร็จแล้ว",
-  "merchantWalletUnlockError": "มีบางอย่างผิดปกติเมื่อปลดล็อกกระเป๋าเงินของคุณ โปรดลองอีกครั้ง",
   "noMoreTransactions": "ไม่มีธุรกรรมเพิ่มอีก",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "การซื้อดำเนินการโดยผู้ให้บริการที่เป็นพันธมิตรของเรา วิธีการชำระเงินบางอย่างอาจไม่สามารถใช้ได้ในประเทศของคุณ ค่าธรรมเนียมอาจแตกต่างกันไป",

diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
@@ -1411,13 +1411,6 @@
   "others": "Diğer",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Son 24 saat",
-  "merchant": "Satıcı Ödemesi",
-  "merchantMoneyEscrow": "Bir satıcıya doğrudan ödeme göndermek üzeresiniz.",
-  "merchantPaymentNumberVerificationMessage": "Numaranızı bağlamanız gerekiyor",
-  "merchantPaymentSubmitFail": "Ödemeniz gönderilemedi",
-  "merchantPaymentSetup": "Satıcı bilgileri yüklenirken bir hata oluştu, lütfen QRCode'u tekrar taramayı deneyin",
-  "merchantPaymentSubmitSuccess": "Ödemeniz başarıyla gönderildi",
-  "merchantWalletUnlockError": "Cüzdanınızın kilidini açarken bir şeyler ters gitti, lütfen tekrar deneyin",
   "noMoreTransactions": "Başka işlem yok",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Satın alımlar ortak sağlayıcılarımız tarafından desteklenmektedir. Ücretler değişebilir. Bazı ödeme yöntemleri bölgenizde kullanılamamaktadır.",

diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
@@ -1415,13 +1415,6 @@
   "others": "Інші",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "Останні 24 год",
-  "merchant": "Платіж для продавця",
-  "merchantMoneyEscrow": "Ви збираєтеся здійснити прямий платіж на користь продавця.",
-  "merchantPaymentNumberVerificationMessage": "Треба під'єднати свій номер",
-  "merchantPaymentSubmitFail": "Ваш платіж не вдалося надіслати",
-  "merchantPaymentSetup": "Під час завантаження інформації про продавця сталася помилка, зіскануйте QR-код ще раз",
-  "merchantPaymentSubmitSuccess": "Ваш платіж успішно надіслано",
-  "merchantWalletUnlockError": "Під час розблокування гаманця сталася помилка, спробуйте ще раз",
   "noMoreTransactions": "Більше немає транзакції",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Купівельні операції здійснюються за підтримки наших партнерів-провайдерів. Комісії можуть відрізнятися. Деякі способи оплати недоступні у вашому регіоні.",

diff --git a/locales/vi-VN/translation.json b/locales/vi-VN/translation.json
@@ -1409,13 +1409,6 @@
   "others": "Khác",
   "nomSpaceRecipient": "Nomspace: {{name}}",
   "lastDay": "24 giờ qua",
-  "merchant": "Thanh toán cho người bán",
-  "merchantMoneyEscrow": "Bạn sắp gửi một khoản thanh toán trực tiếp cho người bán.",
-  "merchantPaymentNumberVerificationMessage": "Bạn cần kết nối số điện thoại của mình",
-  "merchantPaymentSubmitFail": "Không gửi được khoản thanh toán của bạn",
-  "merchantPaymentSetup": "Đã xảy ra lỗi khi tải thông tin người bán, vui lòng thử quét lại mã QR",
-  "merchantPaymentSubmitSuccess": "Đã gửi thành công khoản thanh toán của bạn",
-  "merchantWalletUnlockError": "Đã xảy ra lỗi khi mở khóa ví của bạn, vui lòng thử lại",
   "noMoreTransactions": "Không còn giao dịch khác",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "Giao dịch mua hàng được hỗ trợ bởi các nhà cung cấp đối tác của chúng tôi. Lệ phí có thể khác nhau. Một số phương thức thanh toán không có sẵn tại khu vực của bạn.",

diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
@@ -1409,13 +1409,6 @@
   "others": "其他",
   "nomSpaceRecipient": "Nomspace：{{name}}",
   "lastDay": "最近 24 小时",
-  "merchant": "商户付款",
-  "merchantMoneyEscrow": "您即将向商户发送一笔直接付款。",
-  "merchantPaymentNumberVerificationMessage": "您需要关联手机号码",
-  "merchantPaymentSubmitFail": "您的付款提交失败",
-  "merchantPaymentSetup": "加载商户信息时出错，请尝试再次扫描二维码",
-  "merchantPaymentSubmitSuccess": "您的付款已成功提交",
-  "merchantWalletUnlockError": "解锁您的钱包时出现问题，请重试",
   "noMoreTransactions": "没有更多交易",
   "selectProviderScreen": {
     "somePaymentsUnavailable": "购买交易由我们的合作伙伴供应商提供支持。您所在地区可能无法使用某些付款方式。费用可能有所不同。",

diff --git a/package.json b/package.json
@@ -72,8 +72,8 @@
     "@celo/wallet-rpc": "^3.2.0",
     "@coinbase/cbpay-js": "^1.7.0",
     "@crowdin/ota-client": "^0.7.0",
-    "@fiatconnect/fiatconnect-sdk": "^0.5.14",
-    "@fiatconnect/fiatconnect-types": "^13.2.0",
+    "@fiatconnect/fiatconnect-sdk": "^0.5.16",
+    "@fiatconnect/fiatconnect-types": "^13.2.1",
     "@gorhom/bottom-sheet": "^4.5.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@noble/secp256k1": "^1.7.1",
@@ -103,7 +103,7 @@
     "@segment/analytics-react-native-plugin-firebase": "^0.3.9",
     "@segment/sovran-react-native": "^1.0.4",
     "@sentry/react-native": "^4.15.2",
-    "@sentry/types": "^7.29.0",
+    "@sentry/types": "^7.73.0",
     "@th3rdwave/react-navigation-bottom-sheet": "^0.2.7",
     "@toruslabs/fetch-node-details": "^8.1.1",
     "@toruslabs/torus.js": "^6.4.1",

diff --git a/src/account/SupportContact.tsx b/src/account/SupportContact.tsx
@@ -9,7 +9,7 @@ import { Email, sendEmail } from 'src/account/emailSender'
 import { e164NumberSelector, nameSelector } from 'src/account/selectors'
 import { sendSupportRequest } from 'src/account/zendesk'
 import { showMessage } from 'src/alert/actions'
-import { numberVerifiedCentrallySelector, sessionIdSelector } from 'src/app/selectors'
+import { phoneNumberVerifiedSelector, sessionIdSelector } from 'src/app/selectors'
 import { APP_NAME } from 'src/brandingConfig'
 import Button, { BtnTypes } from 'src/components/Button'
 import KeyboardSpacer from 'src/components/KeyboardSpacer'
@@ -70,7 +70,7 @@ function SupportContact({ route }: Props) {
   const e164PhoneNumber = useSelector(e164NumberSelector)
   const currentAccount = useSelector(currentAccountSelector)
   const sessionId = useSelector(sessionIdSelector)
-  const numberVerifiedCentralized = useSelector(numberVerifiedCentrallySelector)
+  const numberVerifiedCentralized = useSelector(phoneNumberVerifiedSelector)
   const { countryCodeAlpha2: country, region } = useSelector(userLocationDataSelector)
   const hooksPreviewApiUrl = useSelector(hooksPreviewApiUrlSelector)
   const dispatch = useDispatch()

diff --git a/src/app/reducers.ts b/src/app/reducers.ts
@@ -11,7 +11,6 @@ export interface State {
   loggedIn: boolean
   numberVerified: boolean // decentrally verified
   phoneNumberVerified: boolean // centrally verified
-  requireCPV: boolean
   analyticsEnabled: boolean
   requirePinOnAppOpen: boolean
   appState: AppState
@@ -62,7 +61,6 @@ const initialState = {
   loggedIn: false,
   numberVerified: false,
   phoneNumberVerified: false,
-  requireCPV: REMOTE_CONFIG_VALUES_DEFAULTS.requireCPV,
   analyticsEnabled: true,
   requirePinOnAppOpen: false,
   appState: AppState.Active,
@@ -217,7 +215,6 @@ export const appReducer = (
         maxSwapSlippagePercentage: action.configValues.maxSwapSlippagePercentage,
         networkTimeoutSeconds: action.configValues.networkTimeoutSeconds,
         celoNews: action.configValues.celoNews,
-        requireCPV: action.configValues.requireCPV,
         decentralizedVerificationEnabled: action.configValues.decentralizedVerificationEnabled,
       }
     case Actions.ACTIVE_SCREEN_CHANGED:

diff --git a/src/app/saga.ts b/src/app/saga.ts
@@ -263,7 +263,6 @@ export interface RemoteConfigValues {
   superchargeV2Enabled: boolean
   superchargeRewardContractAddress: string
   superchargeV1Addresses: string[]
-  requireCPV: boolean
   decentralizedVerificationEnabled: boolean
 }
 

diff --git a/src/app/selectors.ts b/src/app/selectors.ts
@@ -79,19 +79,11 @@ export const coinbasePayEnabledSelector = (state: RootState) => state.app.coinba
 export const maxSwapSlippagePercentageSelector = (state: RootState) =>
   state.app.maxSwapSlippagePercentage
 
-export const numberVerifiedCentrallySelector = (state: RootState) => state.app.phoneNumberVerified
-
-const requireCPVSelector = (state: RootState) => state.app.requireCPV
-
-export const phoneNumberVerifiedSelector = createSelector(
-  [numberVerifiedCentrallySelector, numberVerifiedDecentrallySelector, requireCPVSelector],
-  (numberVerifiedCentrally, numberVerifiedDecentrally, requireCPV) =>
-    requireCPV ? numberVerifiedCentrally : numberVerifiedCentrally || numberVerifiedDecentrally
-)
+export const phoneNumberVerifiedSelector = (state: RootState) => state.app.phoneNumberVerified
 
 export const phoneVerificationStatusSelector = createSelector(
   numberVerifiedDecentrallySelector,
-  numberVerifiedCentrallySelector,
+  phoneNumberVerifiedSelector,
   (numberVerifiedDecentralized, numberVerifiedCentralized) => {
     return {
       numberVerifiedDecentralized,
@@ -105,7 +97,7 @@ export const decentralizedVerificationEnabledSelector = (state: RootState) =>
 
 export const shouldRunVerificationMigrationSelector = createSelector(
   [
-    numberVerifiedCentrallySelector,
+    phoneNumberVerifiedSelector,
     numberVerifiedDecentrallySelector,
     decentralizedVerificationEnabledSelector,
   ],