Merge branch 'develop' into refactor/swap-module

Author: jorbuedo

apps/wallet-mobile/android/app/src/production/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "526970676782",
+    "project_id": "yoroi-mobile-99140",
+    "storage_bucket": "yoroi-mobile-99140.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:526970676782:android:7eafa93ccb53f41ca021bf",
+        "android_client_info": {
+          "package_name": "com.emurgo"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDRxPyhvvI1QSSE7cjc12ac7uJnOa7SY1w"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

apps/wallet-mobile/src/AppNavigator.tsx

@@ -56,7 +56,7 @@ const changeNavigationBarColor = (colorScheme: 'default-dark' | 'default-light',
 }
 
 export const AppNavigator = () => {
-  useInitNotifications({localEnabled: features.localNotifications, pushEnabled: features.pushNotifications})
+  useInitNotifications({localEnabled: true, pushEnabled: features.pushNotifications})
   useDeepLinkWatcher()
   const strings = useStrings()
   const [routeName, setRouteName] = React.useState<string>()

apps/wallet-mobile/src/components/Modal/ModalScreen.tsx

@@ -160,6 +160,7 @@ const useStyles = () => {
       ...atoms.self_stretch,
     },
     title: {
+      ...atoms.text_center,
       ...atoms.heading_3_medium,
       ...atoms.p_lg,
       color: color.text_gray_max,

apps/wallet-mobile/src/components/TextInput/TextInput.tsx

@@ -249,7 +249,7 @@ const useStyles = () => {
     background: color.bg_color_max,
     gray: color.gray_400,
     textInput: color.gray_600,
-    actionGray: color.gray_500,
+    actionGray: color.el_gray_medium,
     black: color.gray_max,
     text: color.gray_900,
     textError: color.sys_magenta_500,

apps/wallet-mobile/src/features/Legal/Disclaimer/thirdParty/fr-FR.md

@@ -1,8 +1,8 @@
-By clicking "Proceed," you acknowledge that you will be redirected to a third-party service provider offering ADA-Cardano native tokens exchanges. You may be required to agree to the terms, conditions, and privacy policies of the third-party provider to complete the transaction. Yoroi Wallet does not control, endorse, or assume responsibility for the content, security, policies, or services provided by the third party.
 
-**Please note:**
 
-1. Yoroi Wallet is not liable for any losses, delays, or errors that may occur while using the third-party service.
+
+
+1.
 2. Transactions may be subject to restrictions based on your geographic location, applicable laws, financial institution policies, or the service provider's limitations.
 3. Ensure you review and understand the third party's terms, as your interactions are solely governed by their agreements.
 4. Yoroi Wallet does not collect or store any personal or financial data submitted through the third-party platform.

apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx

@@ -11,7 +11,6 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 import {Icon} from '../../../../components/Icon'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {DIALOG_BUTTONS, showConfirmationDialog} from '../../../../kernel/dialogs'
-import {features} from '../../../../kernel/features'
 import {confirmationMessages} from '../../../../kernel/i18n/global-messages'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
 import {SettingsRouteNavigation, useWalletNavigation} from '../../../../kernel/navigation'
@@ -137,17 +136,13 @@ export const WalletSettingsScreen = () => {
 
         <Spacer height={24} />
 
-        {features.localNotifications && (
-          <>
-            <SettingsSection title={strings.inAppNotifications}>
-              <SettingsItem icon={<Icon.Bell {...iconProps} />} label={strings.allowNotifications}>
-                <NotificationDisplaySwitcher />
-              </SettingsItem>
-            </SettingsSection>
-
-            <Spacer height={24} />
-          </>
-        )}
+        <SettingsSection title={strings.inAppNotifications}>
+          <SettingsItem icon={<Icon.Bell {...iconProps} />} label={strings.allowNotifications}>
+            <NotificationDisplaySwitcher />
+          </SettingsItem>
+        </SettingsSection>
+
+        <Spacer height={24} />
 
         <SettingsSection title={strings.about}>
           <SettingsBuildItem label={strings.walletType} value={intl.formatMessage(getWalletType(implementation))} />

apps/wallet-mobile/src/kernel/features.ts

@@ -5,7 +5,6 @@ export const features = {
   prefillWalletInfo: false,
   showProdPoolsInDev: isDev,
   moderatingNftsEnabled: false,
-  localNotifications: true,
   pushNotifications: isDev,
   poolTransition: true,
   portfolioPerformance: false,

apps/wallet-mobile/src/kernel/i18n/locales/es-ES.json

@@ -485,7 +485,7 @@
   "components.settings.walletsettingscreen.tabTitle": "Billetera",
   "components.settings.walletsettingscreen.title": "Configuración",
   "components.settings.walletsettingscreen.unknownWalletType": "Tipo de monedero desconocido",
-  "components.settings.walletsettingscreen.fcmToken": "FCM Token",
+  "components.settings.walletsettingscreen.fcmToken": "Token de Mensajería en la nube de Firebase (FCM)",
   "components.settings.walletsettingscreen.walletName": "Nombre de la billetera",
   "components.settings.walletsettingscreen.walletType": "Tipo de billetera:",
   "components.settings.walletsettingscreen.inAppNotifications": "In-app notifications",

apps/wallet-mobile/src/kernel/i18n/locales/fr-FR.json

@@ -7,43 +7,43 @@
   "analytics.noip": "We <b>are not</b> recording IP addresses",
   "analytics.nosell": "We <b>do not</b> sell data",
   "analytics.optout": "You can always opt-out via Settings",
-  "analytics.privacyNotice": "Privacy Notice",
-  "analytics.privacyPolicy": "Privacy Policy",
+  "analytics.privacyNotice": "Avis de confidentialité",
+  "analytics.privacyPolicy": "Politique de confidentialité",
   "analytics.private": "We <b>cannot</b> access private keys",
-  "analytics.selectLanguage": "Select Language",
+  "analytics.selectLanguage": "Choisissez la langue",
   "analytics.skip": "Skip",
   "analytics.toggle": "Allow Yoroi analytics",
-  "analytics.tosAgreement": "Terms Of Service Agreement",
-  "analytics.tosAnd": "and",
-  "analytics.tosIAgreeWith": "I agree with",
-  "api.error.badRequest": "Server could not understand the request",
-  "api.error.conflict": "The request could not be completed due to a conflict",
-  "api.error.forbidden": "You are not allowed to access this resource",
-  "api.error.gone": "The requested resource is no longer available",
-  "api.error.invalidState": "Invalid state",
-  "api.error.network": "Something went wrong with the network",
-  "api.error.notFound": "The requested resource could not be found",
-  "api.error.responseMalformed": "The server response is malformed we can't interpret it",
-  "api.error.serverSide": "The server encountered an unexpected condition",
-  "api.error.title": "Oops! API error",
-  "api.error.tooEarly": "The requested resource is not yet available, try again later",
-  "api.error.tooManyRequests": "Too many requests, wait a bit and try again",
-  "api.error.unauthorized": "You are not authorized to access this resource",
-  "api.error.unknown": "An error that is unknown for the app happened, please try again",
-  "catalyst.snapshot.start": "Snapshot start",
-  "catalyst.registration.start": "Registration start",
-  "catalyst.voting.start": "Voting start",
-  "catalyst.voting.end": "Voting end",
-  "catalyst.voting.results": "Results",
-  "claim.accepted.message": "Claim has been accepted, you will receive your asset(s) soon, please scan the code again to check the status",
-  "claim.accepted.title": "Claim accepted 👍",
-  "claim.addressSharingWarning": "You will be sharing with the domain listed here your address",
-  "claim.apiError.alreadyClaimed": "This claim has already been done",
-  "claim.apiError.expired": "This claim has ended, it is no longer availble",
-  "claim.apiError.invalidRequest": "The server rejecte the request, check the address provided by the wallet is on the wrong network for this claim, and if the code is still avaible",
-  "claim.apiError.notFound": "The claim could not be found",
-  "claim.apiError.rateLimited": "Too many claims happening, wait a bit and try again",
-  "claim.apiError.title": "The claim failed",
+  "analytics.tosAgreement": "Conditions générales d'utilisation",
+  "analytics.tosAnd": "et",
+  "analytics.tosIAgreeWith": "Je consens",
+  "api.error.badRequest": "Le serveur n'a pas pu interpréter la requête",
+  "api.error.conflict": "La requête n'a pas pu aboutir en raison d'un conflit",
+  "api.error.forbidden": "Vous n'êtes pas autorisé à accéder à cette ressource",
+  "api.error.gone": "La ressource demandée n'est plus disponible",
+  "api.error.invalidState": "État invalide",
+  "api.error.network": "Un problème a été détecté avec le réseau",
+  "api.error.notFound": "La ressource demandée est introuvable",
+  "api.error.responseMalformed": "La réponse du serveur ne peut être interprétée",
+  "api.error.serverSide": "Le serveur a rencontré un problème inattendu de condition",
+  "api.error.title": "Oups ! Erreur API",
+  "api.error.tooEarly": "La ressource demandée n'est pas encore disponible, réessayez plus tard",
+  "api.error.tooManyRequests": "Trop de requêtes, attendez un peu et réessayez",
+  "api.error.unauthorized": "Vous n'êtes pas autorisé à accéder à cette ressource.",
+  "api.error.unknown": "Une erreur inconnue s'est produite, veuillez réessayer",
+  "catalyst.snapshot.start": "Début du snapshot",
+  "catalyst.registration.start": "Début de l'inscription",
+  "catalyst.voting.start": "Début du vote",
+  "catalyst.voting.end": "Fin du vote",
+  "catalyst.voting.results": "Résultats",
+  "claim.accepted.message": "La demande a été acceptée, vous allez bientôt recevoir vos fonds. Veuillez scanner le code à nouveau pour consulter le statut",
+  "claim.accepted.title": "Demande acceptée 👍",
+  "claim.addressSharingWarning": "Vous allez partager votre adresse avec le domaine listé ici",
+  "claim.apiError.alreadyClaimed": "Cette demande a déjà été effectuée",
+  "claim.apiError.expired": "Cette demande est terminée et n'est plus disponible",
+  "claim.apiError.invalidRequest": "Le serveur a rejeté la demande, vérifiez que l'adresse fournie par le portefeuille n'est pas sur le mauvais réseau pour cette demande, et si le code est toujours disponible",
+  "claim.apiError.notFound": "La demande n'a pas pu être trouvée",
+  "claim.apiError.rateLimited": "Trop de requêtes, attendez un peu et réessayez",
+  "claim.apiError.title": "La demande a échoué",
   "claim.apiError.tooEarly": "This claim hasn't started yet, please try again later",
   "claim.askConfirmation.title": "Confirm claim",
   "claim.code": "Code",

apps/wallet-mobile/translations/messages/src/AppNavigator.json

@@ -6,12 +6,12 @@
     "start": {
       "line": 261,
       "column": 17,
-      "index": 9836
+      "index": 9813
     },
     "end": {
       "line": 264,
       "column": 3,
-      "index": 9926
+      "index": 9903
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 265,
       "column": 18,
-      "index": 9946
+      "index": 9923
     },
     "end": {
       "line": 268,
       "column": 3,
-      "index": 10044
+      "index": 10021
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 269,
       "column": 25,
-      "index": 10071
+      "index": 10048
     },
     "end": {
       "line": 272,
       "column": 3,
-      "index": 10185
+      "index": 10162
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 273,
       "column": 27,
-      "index": 10214
+      "index": 10191
     },
     "end": {
       "line": 276,
       "column": 3,
-      "index": 10335
+      "index": 10312
     }
   }
 ]