Merge pull request #263 from DFXswiss/develop

[DEV-2141] Adapted merge text

app/i18n/de.json

@@ -223,7 +223,7 @@
         "vip_title": "Herzlich willkommen in der Black Squad",
         "vip_description": "Die Black Squad ist eine elitäre Gruppe für Großinvestoren über DFX und ermöglicht dir einen direkten Sprachkanal zur Führungsebene von DFX.",
         "vip_link": "Die Black Squad versammelt sich in einer Telegram-Gruppe - folge einfach dem Link:",
-        "merge": "Wie es aussieht, hast du bereits ein Konto bei DFX. Wir haben dir gerade eine E-Mail geschickt. Klicke auf den gesendeten Link, um diese Adresse zu deinem bestehenden Konto hinzuzufügen. Auf diese Weise musst du KYC nicht erneut durchlaufen.\n\nWenn du diese Adresse nicht mit deinem Konto verknüpfen möchtest, ignoriere die E-Mail einfach.",
+        "merge": "Wie es aussieht, hast du bereits ein Konto bei DFX. Wir haben dir gerade eine E-Mail geschickt. Klicke auf den gesendeten Link, um deine E-Mail-Adresse zu bestätigen.",
         "delete_wallet": "Wallet deaktivieren",
         "delete_wallet_hint": "Bist du sicher, dass du diese Wallet für die Verwendung bei DFX deaktivieren willst? Du kannst sie danach bei DFX nicht mehr benutzen.",
         "delete_account": "Account löschen",

app/i18n/en.json

@@ -222,7 +222,7 @@
         "vip_title": "Welcome to the Black Squad",
         "vip_description": "The Black Squad is an elite group for major investors on DFX and gives you a direct voice channel to DFX leadership.",
         "vip_link": "The Black Squad gathers in a Telegram group - just follow the link:",
-        "merge": "It looks like you already have an account with DFX. We have just sent you an E-Mail. Click on the sent link to add this address to your existing account. This way you don't need to go through KYC again.\n\nIf you don't want to link this address to your account, simply ignore the E-Mail.",
+        "merge": "It looks like you already have an account with DFX. We have just sent you an E-Mail. Click on the sent link to confirm your mail address.",
         "delete_wallet": "Deactivate wallet",
         "delete_wallet_hint": "Are you sure you want to deactivate this wallet for use at DFX? You will not be able to use it on DFX after that.",
         "delete_account": "Delete account",

app/i18n/es.json

@@ -206,7 +206,7 @@
         "vip_title": "Welcome to the Black Squad",
         "vip_description": "The Black Squad is an elite group for major investors on DFX and gives you a direct voice channel to DFX leadership.",
         "vip_link": "The Black Squad gathers in a Telegram group - just follow the link:",
-        "merge": "Parece que ya tiene una cuenta en DFX. Acabamos de enviarle un correo electrónico. Haga clic en el enlace enviado para añadir esta dirección a su cuenta existente. De esta manera usted no necesita ir a través de KYC de nuevo.\n\nSi no desea vincular esta dirección a su cuenta, simplemente ignore el correo electrónico.",
+        "merge": "Parece que ya tiene una cuenta en DFX. Acabamos de enviarle un correo electrónico. Haga clic en el enlace enviado para confirmar su dirección de correo.",
         "delete_wallet": "Desactivar billetera",
         "delete_wallet_hint": "¿Está seguro de que desea desactivar esta billetera para su uso en DFX? Ya no podrá utilizarlo con DFX.",
         "delete_account": "Borrar cuenta",

app/i18n/fr.json

@@ -222,7 +222,7 @@
         "vip_title": "Welcome to the Black Squad",
         "vip_description": "The Black Squad is an elite group for major investors on DFX and gives you a direct voice channel to DFX leadership.",
         "vip_link": "The Black Squad gathers in a Telegram group - just follow the link:",
-        "merge": "Il semble que vous ayez déjà un compte chez DFX. Nous venons de vous envoyer un e-mail. Cliquez sur le lien envoyé pour ajouter cette adresse à votre compte existant. De cette façon, vous n'aurez pas besoin de refaire le KYC.\n\nSi vous ne souhaitez pas lier cette adresse à votre compte, ignorez simplement l'e-mail.",
+        "merge": "Il semble que vous ayez déjà un compte chez DFX. Nous venons de vous envoyer un e-mail. Cliquez sur le lien envoyé pour confirmer votre adresse e-mail.",
         "delete_wallet": "Désactiver le portefeuille",
         "delete_wallet_hint": "Êtes-vous sûr de vouloir désactiver ce portefeuille pour l'utiliser avec DFX ? Vous ne pourrez plus l'utiliser avec DFX.",
         "delete_account": "Supprimer le compte",

app/i18n/it.json

@@ -222,7 +222,7 @@
         "vip_title": "Welcome to the Black Squad",
         "vip_description": "The Black Squad is an elite group for major investors on DFX and gives you a direct voice channel to DFX leadership.",
         "vip_link": "The Black Squad gathers in a Telegram group - just follow the link:",
-        "merge": "Sembra che tu abbia già un account con DFX. Le abbiamo appena inviato un'e-mail. Clicca sul link inviato per aggiungere questo indirizzo al tuo conto esistente. In questo modo non sarà necessario ripetere la procedura KYC.\n\nSe non volete collegare questo indirizzo al vostro conto, ignorate semplicemente l'e-mail.",
+        "merge": "Sembra che tu abbia già un account con DFX. Le abbiamo appena inviato un'e-mail. Fare clic sul link inviato per confermare il tuo indirizzo e-mail.",
         "delete_wallet": "Disattivare il portafoglio",
         "delete_wallet_hint": "Sei sicuro di voler disattivare questo portafoglio per l'uso su DFX? Non sarà più possibile utilizzarlo con DFX.",
         "delete_account": "Elimina conto",

app/i18n/pt.json

@@ -219,7 +219,7 @@
         "vip_title": "Welcome to the Black Squad",
         "vip_description": "The Black Squad is an elite group for major investors on DFX and gives you a direct voice channel to DFX leadership.",
         "vip_link": "The Black Squad gathers in a Telegram group - just follow the link:",
-        "merge": "Parece que já tem uma conta na DFX. Acabámos de lhe enviar um E-Mail. Clique no link enviado para adicionar este endereço à sua conta existente. Desta forma, não precisa de passar novamente pela KYC.\n\nSe não quiser ligar este endereço à sua conta, simplesmente ignore o E-Mail.",
+        "merge": "Parece que já tem uma conta no DFX. Acabámos de lhe enviar um e-mail. Clique no link enviado para confirmar o seu endereço de correio eletrónico.",
         "delete_wallet": "Desativar a carteira",
         "delete_wallet_hint": "Tem certeza de que deseja desativar esta carteira para uso no DFX? Você não poderá mais usá-la no DFX.",
         "delete_account": "Apagar conta",

app/screens/KycScreen.tsx

@@ -71,7 +71,7 @@ const KycScreen = ({ settings }: { settings?: AppSettings }) => {
 
     let url = `${Environment.services}/kyc?code=${params.code}`;
     params.headless && (url += "&headless=true");
-    params.redirect_uri && (url += `&kyc-redirect=${params.redirect_uri}`);
+    params.redirect_uri && (url += `&kyc-redirect=${encodeURIComponent(params.redirect_uri)}`);
     openUrl(url, false);
 
     setInputParams(params);