From 21227f57ad68490d2d4bab2ae945f36a0c6e3e09 Mon Sep 17 00:00:00 2001
From: chloe <44501120+chloezxyy@users.noreply.github.com>
Date: Thu, 24 Aug 2023 11:03:54 +0800
Subject: [PATCH 1/6] fix(ui-ux): update copy text in convert screen

---
 .../Portfolio/screens/ConvertScreen.tsx       | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertScreen.tsx
index 4fac4da047..8d34dc4ff2 100644
--- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertScreen.tsx
+++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertScreen.tsx
@@ -69,17 +69,17 @@ export function ConvertScreen(props: Props): JSX.Element {
   const client = useWhaleApiClient();
   const logger = useLogger();
   const tokens = useSelector((state: RootState) =>
-    tokensSelector(state.wallet)
+    tokensSelector(state.wallet),
   );
   const toast = useToast();
   const TOAST_DURATION = 2000;
 
   // global state
   const hasPendingJob = useSelector((state: RootState) =>
-    hasTxQueued(state.transactionQueue)
+    hasTxQueued(state.transactionQueue),
   );
   const hasPendingBroadcastJob = useSelector((state: RootState) =>
-    hasOceanTXQueued(state.ocean)
+    hasOceanTXQueued(state.ocean),
   );
   const navigation = useNavigation<NavigationProp<PortfolioParamList>>();
   const [mode, setMode] = useState(props.route.params.mode);
@@ -89,7 +89,7 @@ export function ConvertScreen(props: Props): JSX.Element {
   const [fee, setFee] = useState<BigNumber>(new BigNumber(0.0001));
   const [amount, setAmount] = useState<string>("");
   const [inlineTextStatus, setInlineTextStatus] = useState<InlineTextStatus>(
-    InlineTextStatus.Default
+    InlineTextStatus.Default,
   );
 
   const { fromTokens } = useConvertibleTokens();
@@ -106,7 +106,7 @@ export function ConvertScreen(props: Props): JSX.Element {
     setSourceToken(source);
     setTargetToken(target);
     const sourceNum = new BigNumber(
-      source?.amount !== undefined && source.amount !== "" ? source.amount : 0
+      source?.amount !== undefined && source.amount !== "" ? source.amount : 0,
     );
     const conversionNum = new BigNumber(amount).isNaN()
       ? new BigNumber(0)
@@ -140,12 +140,12 @@ export function ConvertScreen(props: Props): JSX.Element {
         sourceUnit: sourceToken.unit,
         sourceBalance: BigNumber.maximum(
           new BigNumber(sourceToken.amount).minus(convAmount),
-          0
+          0,
         ),
         targetUnit: targetToken.unit,
         targetBalance: BigNumber.maximum(
           new BigNumber(targetToken.amount).plus(convAmount),
-          0
+          0,
         ),
         mode,
         amount: new BigNumber(amount),
@@ -219,7 +219,7 @@ export function ConvertScreen(props: Props): JSX.Element {
     <ThemedScrollViewV2 testID="convert_screen">
       <ThemedTextV2
         style={tailwind(
-          "mx-10 text-xs font-normal-v2 mt-8 mb-4 tracking-wide-v2 uppercase"
+          "mx-10 text-xs font-normal-v2 mt-8 mb-4 tracking-wide-v2 uppercase",
         )}
         light={tailwind("text-mono-light-v2-500")}
         dark={tailwind("text-mono-dark-v2-500")}
@@ -234,7 +234,7 @@ export function ConvertScreen(props: Props): JSX.Element {
                 ? BigNumber(sourceToken.amount).toFixed(8)
                 : "",
             token: sourceToken != null ? sourceToken.unit : "",
-          }
+          },
         )}
       </ThemedTextV2>
       <View style={tailwind("mx-5")}>
@@ -268,14 +268,14 @@ export function ConvertScreen(props: Props): JSX.Element {
                 onChangeText={setAmount}
                 placeholder="0.00"
                 placeholderTextColor={getColor(
-                  isLight ? "mono-light-v2-900" : "mono-dark-v2-900"
+                  isLight ? "mono-light-v2-900" : "mono-dark-v2-900",
                 )}
                 testID="convert_input"
               />
               <NumberFormat
                 value={getNumberFormatValue(
                   getTokenPrice(sourceToken.symbol, BigNumber(amount)),
-                  2
+                  2,
                 )}
                 thousandSeparator
                 displayType="text"
@@ -345,7 +345,7 @@ export function ConvertScreen(props: Props): JSX.Element {
             {
               amount: new BigNumber(sourceToken.amount).toFixed(8),
               unit: sourceToken.unit,
-            }
+            },
           )}
         </ThemedTextV2>
 
@@ -369,12 +369,12 @@ export function ConvertScreen(props: Props): JSX.Element {
           dark={tailwind("text-mono-dark-v2-500")}
           testID="tokenB_displaySymbol"
         >
-          {translate("screens/ConvertScreen", "TO RECEIVE")}
+          {translate("screens/ConvertScreen", "TO CONVERT")}
         </ThemedTextV2>
 
         <View
           style={tailwind(
-            "flex flex-row justify-between items-center pl-5 mt-4"
+            "flex flex-row justify-between items-center pl-5 mt-4",
           )}
         >
           <View style={tailwind("w-6/12 mr-2")}>
@@ -400,7 +400,7 @@ export function ConvertScreen(props: Props): JSX.Element {
             <NumberFormat
               value={getNumberFormatValue(
                 getTokenPrice(targetToken.symbol, BigNumber(convAmount)),
-                2
+                2,
               )}
               thousandSeparator
               displayType="text"
@@ -450,7 +450,7 @@ export function ConvertScreen(props: Props): JSX.Element {
               amount !== ""
                 ? BigNumber.maximum(
                     new BigNumber(targetToken.amount).plus(convAmount),
-                    0
+                    0,
                   ).toFixed(8)
                 : "-"
             }
@@ -464,7 +464,7 @@ export function ConvertScreen(props: Props): JSX.Element {
             >
               {`${translate(
                 "screens/ConvertScreen",
-                "Review full details in the next screen"
+                "Review full details in the next screen",
               )}`}
             </ThemedTextV2>
           )}
@@ -494,7 +494,7 @@ export function ConvertScreen(props: Props): JSX.Element {
 
 function getSourceAddressToken(
   mode: ConversionMode,
-  tokens: AddressToken[]
+  tokens: AddressToken[],
 ): AddressToken {
   switch (mode) {
     case ConversionMode.utxosToAccount:
@@ -512,7 +512,7 @@ function getSourceAddressToken(
 
 function getDestinationAddressToken(
   mode: ConversionMode,
-  tokens: AddressToken[]
+  tokens: AddressToken[],
 ): AddressToken {
   switch (mode) {
     case ConversionMode.accountToEvm:
@@ -552,7 +552,7 @@ function getTargetTokenUnit(mode: ConversionMode): ConvertTokenUnit {
 
 function getDFIBalances(
   mode: ConversionMode,
-  tokens: AddressToken[]
+  tokens: AddressToken[],
 ): [source: ConversionIO, target: ConversionIO] {
   const source: AddressToken = getSourceAddressToken(mode, tokens);
   const sourceUnit = getSourceTokenUnit(mode);
@@ -682,7 +682,7 @@ function canConvert(amount: string, balance: string): boolean {
 
 function getConvertibleUtxoAmount(
   mode: ConversionMode,
-  source: AddressToken
+  source: AddressToken,
 ): string {
   if (
     [
@@ -696,7 +696,7 @@ function getConvertibleUtxoAmount(
 
   const utxoToReserve = "0.1";
   const leftover = new BigNumber(source.amount).minus(
-    new BigNumber(utxoToReserve)
+    new BigNumber(utxoToReserve),
   );
   return leftover.isLessThan(0) ? "0" : leftover.toFixed();
 }

From 9576fa2ba13898389a2e69d9db9dc2c3ac14682a Mon Sep 17 00:00:00 2001
From: chloe <44501120+chloezxyy@users.noreply.github.com>
Date: Thu, 24 Aug 2023 11:04:15 +0800
Subject: [PATCH 2/6] fix(ui-ux): update translations

---
 shared/translations/languages/de.json      | 15 ++++++++++++---
 shared/translations/languages/es.json      | 15 ++++++++++++---
 shared/translations/languages/fr.json      | 15 ++++++++++++---
 shared/translations/languages/it.json      | 17 +++++++++++++----
 shared/translations/languages/zh-Hans.json | 15 ++++++++++++---
 shared/translations/languages/zh-Hant.json | 15 ++++++++++++---
 6 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/shared/translations/languages/de.json b/shared/translations/languages/de.json
index c1c960aabd..efd2071caf 100644
--- a/shared/translations/languages/de.json
+++ b/shared/translations/languages/de.json
@@ -109,7 +109,8 @@
     "AVAILABLE ASSETS": "VERFÜGBARE AKTIVA",
     "Asset value": "Wert der Aktiva",
     "Sort by": "Sortieren nach",
-    "ASSETS": "AKTIVA"
+    "ASSETS": "AKTIVA",
+    "network": "netzwerk"
   },
   "screens/GetDFIScreen": {
     "Get DFI": "DFI erhalten",
@@ -212,7 +213,8 @@
     "Address deleted!": "Adresse gelöscht!",
     "It may take a few seconds to delete": "Das Löschen kann einige Sekunden dauern",
     "It may take a few seconds to update": "Die Aktualisierung kann ein paar Sekunden dauern",
-    "It may take a few seconds to save": "Das Speichern kann ein paar Sekunden dauern"
+    "It may take a few seconds to save": "Das Speichern kann ein paar Sekunden dauern",
+    "ADDRESS TYPE": "ADRESSTYP"
   },
   "screens/ReceiveScreen": {
     "Receive": "Empfangen",
@@ -345,6 +347,7 @@
     "CONFIRM TRANSACTION": "TRANSAKTION BESTÄTIGEN",
     "You are converting to {{unit}}": "Du wandelst in {{unit}} um",
     "Transaction fee": "Transaktionsgebühren",
+    "Resulting Tokens (EVM)": "Resultierende Token (EVM)",
     "Resulting Tokens": "Resultierende Token",
     "Resulting UTXO": "Resultierende UTXO",
     "Convert {{amount}} DFI to {{target}}": "Wandle {{amount}} DFI in {{target}} um",
@@ -841,6 +844,10 @@
     "HALF": "1/2",
     "MAX": "MAX"
   },
+  "components/ConversionDetailsRow": {
+    "Resulting UTXO": "Resultierende UTXO",
+    "Resulting Tokens": "Resultierende Token"
+  },
   "screens/common": {
     "CANCEL": "ABBRECHEN",
     "Cancel": "Abbrechen",
@@ -2197,7 +2204,9 @@
     "Swap": "Tausch",
     "Transactions": "Transaktionen",
     "Future swap": "Future Swap",
-    "Get DFI": "DFI erhalten"
+    "Get DFI": "DFI erhalten",
+    "Convert": "Umwandeln",
+    "Governance": "Governance"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "{{poolPair}}-Pool",
diff --git a/shared/translations/languages/es.json b/shared/translations/languages/es.json
index 4c4cb0242a..32bf237b16 100644
--- a/shared/translations/languages/es.json
+++ b/shared/translations/languages/es.json
@@ -112,7 +112,8 @@
     "AVAILABLE ASSETS": "ACTIVOS DISPONIBLES",
     "Asset value": "Valor del activo",
     "Sort by": "Ordenar por",
-    "ASSETS": "ACTIVOS"
+    "ASSETS": "ACTIVOS",
+    "network": "red"
   },
   "screens/GetDFIScreen": {
     "Get DFI": "Obtener DFI",
@@ -221,7 +222,8 @@
     "Address deleted!": "Dirección borrada!",
     "It may take a few seconds to delete": "Puede tardar unos segundos en borrarse",
     "It may take a few seconds to update": "Puede tardar unos segundos en actualizarse",
-    "It may take a few seconds to save": "Puede tardar unos segundos en guardarse"
+    "It may take a few seconds to save": "Puede tardar unos segundos en guardarse",
+    "ADDRESS TYPE": "ADDRESS TYPE"
   },
   "screens/ReceiveScreen": {
     "Receive": "Recibir",
@@ -355,6 +357,7 @@
     "CONFIRM TRANSACTION": "CONFIRMAR TRANSACCIÓN",
     "You are converting to {{unit}}": "Esta convirtiendo a {{unit}}",
     "Transaction fee": "Comisión de transacción",
+    "Resulting Tokens (EVM)": "Resultando Tokens (EVM)",
     "Resulting Tokens": "Resultando Tokens",
     "Resulting UTXO": "Resultando UTXO",
     "Convert {{amount}} DFI to {{target}}": "Convirtiendo {{amount}} DFI a {{target}}",
@@ -2230,7 +2233,9 @@
     "Swap": "Cambiar",
     "Transactions": "Transacciones",
     "Future swap": "Cambio a futuros",
-    "Get DFI": "Obtener DFI"
+    "Get DFI": "Obtener DFI",
+    "Convert": "Convertir",
+    "Governance": "Governance"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "{{poolPair}} Pool",
@@ -2261,6 +2266,10 @@
     "Search with token name": "Buscar por nombre de token",
     "Search results for “{{searchTerm}}”": "Buscar resultados para “{{searchTerm}}”"
   },
+  "components/ConversionDetailsRow": {
+    "Resulting UTXO": "Resultando UTXO",
+    "Resulting Tokens": "Resultando Tokens"
+  },
   "screens/OCGProposalsScreen": {
     "Governance": "Governance",
     "Community Funding Proposal": "Community Funding Proposal",
diff --git a/shared/translations/languages/fr.json b/shared/translations/languages/fr.json
index 6a90518b68..27a2cd01e0 100644
--- a/shared/translations/languages/fr.json
+++ b/shared/translations/languages/fr.json
@@ -109,7 +109,8 @@
     "AVAILABLE ASSETS": "ACTIFS DISPONIBLES",
     "Asset value": "Valeur des actifs",
     "Sort by": "Trier par",
-    "ASSETS": "ACTIFS"
+    "ASSETS": "ACTIFS",
+    "network": "réseau"
   },
   "screens/GetDFIScreen": {
     "Get DFI": "Obtenir DFI",
@@ -215,7 +216,8 @@
     "Address deleted!": "Adresse supprimée !",
     "It may take a few seconds to delete": "La suppression peut prendre quelques secondes",
     "It may take a few seconds to update": "La mise à jour peut prendre quelques secondes",
-    "It may take a few seconds to save": "La sauvegarde peut prendre quelques secondes"
+    "It may take a few seconds to save": "La sauvegarde peut prendre quelques secondes",
+    "ADDRESS TYPE": "TYPE D’ADRESSE"
   },
   "screens/AddressControlScreen": {
     "CREATE WALLET ADDRESS": "CRÉER UNE ADRESSE DE PORTEFEUILLE",
@@ -355,6 +357,7 @@
     "CONFIRM TRANSACTION": "VALIDEZ LA TRANSACTION",
     "You are converting to {{unit}}": "Vous convertissez en {{unit}}",
     "Transaction fee": "Frais de transaction",
+    "Resulting Tokens (EVM)": "Tokens restants (EVM)",
     "Resulting Tokens": "Tokens restants",
     "Resulting UTXO": "UTXO restants",
     "Convert {{amount}} DFI to {{target}}": "Conversion de {{amount}} DFI en {{target}}",
@@ -2211,7 +2214,9 @@
     "Swap": "Échanger",
     "Transactions": "Transactions",
     "Future swap": "Échange à terme",
-    "Get DFI": "Obtenir DFI"
+    "Get DFI": "Obtenir DFI",
+    "Convert": "Convertir",
+    "Governance": "Governance"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "Pool {{poolPair}}",
@@ -2242,6 +2247,10 @@
     "Search with token name": "Recherche avec le nom du token",
     "Search results for “{{searchTerm}}”": "Résultats de la recherche pour “{{searchTerm}}”"
   },
+  "components/ConversionDetailsRow": {
+    "Resulting UTXO": "UTXO restants",
+    "Resulting Tokens": "Tokens restants"
+  },
   "screens/OCGProposalsScreen": {
     "Governance": "Governance",
     "Community Funding Proposal": "Community Funding Proposal",
diff --git a/shared/translations/languages/it.json b/shared/translations/languages/it.json
index 0a6b91d701..d422da23e6 100644
--- a/shared/translations/languages/it.json
+++ b/shared/translations/languages/it.json
@@ -114,7 +114,8 @@
     "AVAILABLE ASSETS": "ASSET DISPONIBILI",
     "Asset value": "Valore degli asset",
     "Sort by": "Sort by",
-    "ASSETS": "ASSETS"
+    "ASSETS": "ASSETS",
+    "network": "rete"
   },
   "screens/GetDFIScreen": {
     "Get DFI": "Get DFI",
@@ -223,7 +224,8 @@
     "Address deleted!": "Address deleted!",
     "It may take a few seconds to delete": "It may take a few seconds to delete",
     "It may take a few seconds to update": "It may take a few seconds to update",
-    "It may take a few seconds to save": "It may take a few seconds to save"
+    "It may take a few seconds to save": "It may take a few seconds to save",
+    "ADDRESS TYPE": "ADDRESS TYPE"
   },
   "screens/ReceiveScreen": {
     "Receive": "Ricevi",
@@ -283,7 +285,7 @@
     "You are sending": "Stai inviando",
     "TRANSACTION DETAILS": "DETTAGLI TRANSAZIONE",
     "Recipient address": "Indirizzo del destinatario",
-    "Network": "Network",
+    "Network": "Rete",
     "Amount": "Importo",
     "Estimated fee": "Commissione stimata",
     "Remaining balance": "Saldo rimanente",
@@ -356,6 +358,7 @@
     "CONFIRM TRANSACTION": "CONFERMA LA TRANSAZIONE",
     "You are converting to {{unit}}": "You are converting to {{unit}}",
     "Transaction fee": "Transaction fee",
+    "Resulting Tokens (EVM)": "Risultato Tokens (EVM)",
     "Resulting Tokens": "Risultato Tokens",
     "Resulting UTXO": "Risultato UTXO",
     "Convert {{amount}} DFI to {{target}}": "Conversione {{amount}} DFI in {{target}}",
@@ -2225,7 +2228,9 @@
     "Swap": "Scambia",
     "Transactions": "Transazioni",
     "Future swap": "Future swap",
-    "Get DFI": "Get DFI"
+    "Get DFI": "Get DFI",
+    "Convert": "Converti",
+    "Governance": "Governance"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "{{poolPair}} Pool",
@@ -2256,6 +2261,10 @@
     "Search with token name": "Search with token name",
     "Search results for “{{searchTerm}}”": "Search results for “{{searchTerm}}”"
   },
+  "components/ConversionDetailsRow": {
+    "Resulting UTXO": "Risultato UTXO",
+    "Resulting Tokens": "Risultato Tokens"
+  },
   "screens/OCGProposalsScreen": {
     "Governance": "Governance",
     "Community Funding Proposal": "Community Funding Proposal",
diff --git a/shared/translations/languages/zh-Hans.json b/shared/translations/languages/zh-Hans.json
index 0936ff5c64..e86067cf07 100644
--- a/shared/translations/languages/zh-Hans.json
+++ b/shared/translations/languages/zh-Hans.json
@@ -109,7 +109,8 @@
     "AVAILABLE ASSETS": "可用资产",
     "Asset value": "资产价值",
     "Sort by": "Sort by",
-    "ASSETS": "ASSETS"
+    "ASSETS": "ASSETS",
+    "network": "网络"
   },
   "screens/GetDFIScreen": {
     "Get DFI": "获取 DFI",
@@ -212,7 +213,8 @@
     "Address deleted!": "Address deleted!",
     "It may take a few seconds to delete": "It may take a few seconds to delete",
     "It may take a few seconds to update": "It may take a few seconds to update",
-    "It may take a few seconds to save": "It may take a few seconds to save"
+    "It may take a few seconds to save": "It may take a few seconds to save",
+    "ADDRESS TYPE": "地址类型"
   },
   "screens/ReceiveScreen": {
     "Receive": "接收",
@@ -345,6 +347,7 @@
     "CONFIRM TRANSACTION": "确认发出",
     "You are converting to {{unit}}": "You are converting to {{unit}}",
     "Transaction fee": "交易費用",
+    "Resulting Tokens (EVM)": "转换后 Tokens (EVM)",
     "Resulting Tokens": "转换后 Tokens",
     "Resulting UTXO": "转换后 UTXO",
     "Convert {{amount}} DFI to {{target}}": "转换 {{amount}} DFI 至 {{target}}",
@@ -2207,7 +2210,9 @@
     "Swap": "兑换",
     "Transactions": "交易纪录",
     "Future swap": "Future swap",
-    "Get DFI": "获取 DFI"
+    "Get DFI": "获取 DFI",
+    "Convert": "转换",
+    "Governance": "Governance"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "Pool {{poolPair}}",
@@ -2238,6 +2243,10 @@
     "Search with token name": "使用代币名称搜索",
     "Search results for “{{searchTerm}}”": "Search results for “{{searchTerm}}”"
   },
+  "components/ConversionDetailsRow": {
+    "Resulting UTXO": "转换后 UTXO",
+    "Resulting Tokens": "转换后 Tokens"
+  },
   "screens/OCGProposalsScreen": {
     "Governance": "Governance",
     "Community Funding Proposal": "社区资助提案 (CFP)",
diff --git a/shared/translations/languages/zh-Hant.json b/shared/translations/languages/zh-Hant.json
index 6107532457..e52392f4e1 100644
--- a/shared/translations/languages/zh-Hant.json
+++ b/shared/translations/languages/zh-Hant.json
@@ -109,7 +109,8 @@
     "AVAILABLE ASSETS": "可用資產",
     "Asset value": "資產價值",
     "Sort by": "Sort by",
-    "ASSETS": "ASSETS"
+    "ASSETS": "ASSETS",
+    "network": "網絡"
   },
   "screens/GetDFIScreen": {
     "Get DFI": "獲取 DFI",
@@ -212,7 +213,8 @@
     "Address deleted!": "Address deleted!",
     "It may take a few seconds to delete": "It may take a few seconds to delete",
     "It may take a few seconds to update": "It may take a few seconds to update",
-    "It may take a few seconds to save": "It may take a few seconds to save"
+    "It may take a few seconds to save": "It may take a few seconds to save",
+    "ADDRESS TYPE": "地址類型"
   },
   "screens/ReceiveScreen": {
     "Receive": "接收",
@@ -345,6 +347,7 @@
     "CONFIRM TRANSACTION": "確認交易",
     "You are converting to {{unit}}": "You are converting to {{unit}}",
     "Transaction fee": "交易費用",
+    "Resulting Tokens (EVM)": "轉換後 Tokens (EVM)",
     "Resulting Tokens": "轉換後 Tokens",
     "Resulting UTXO": "轉換後 UTXO",
     "Convert {{amount}} DFI to {{target}}": "轉換 {{amount}} DFI 至 {{target}}",
@@ -2208,7 +2211,9 @@
     "Swap": "兌換",
     "Transactions": "交易紀錄",
     "Future swap": "Future swap",
-    "Get DFI": "獲取 DFI"
+    "Get DFI": "獲取 DFI",
+    "Convert": "轉換",
+    "Governance": "Governance"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "Pool {{poolPair}}",
@@ -2239,6 +2244,10 @@
     "Search with token name": "使用代幣名稱搜索",
     "Search results for “{{searchTerm}}”": "Search results for “{{searchTerm}}”"
   },
+  "components/ConversionDetailsRow": {
+    "Resulting UTXO": "轉換後 UTXO",
+    "Resulting Tokens": "轉換後 Tokens"
+  },
   "screens/OCGProposalsScreen": {
     "Governance": "Governance",
     "Community Funding Proposal": "社區資助提案 (CFP)",

From 60f44868f405594c1d207dc52fc3cf3eed0eecd1 Mon Sep 17 00:00:00 2001
From: chloe <44501120+chloezxyy@users.noreply.github.com>
Date: Thu, 24 Aug 2023 15:26:08 +0800
Subject: [PATCH 3/6] add translations

---
 shared/translations/languages/de.json      |  8 ++++++--
 shared/translations/languages/es.json      | 10 +++++++---
 shared/translations/languages/fr.json      | 14 +++++++++-----
 shared/translations/languages/it.json      |  7 +++++--
 shared/translations/languages/zh-Hans.json | 12 ++++++++----
 shared/translations/languages/zh-Hant.json | 12 ++++++++----
 6 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/shared/translations/languages/de.json b/shared/translations/languages/de.json
index efd2071caf..fb4e167d6a 100644
--- a/shared/translations/languages/de.json
+++ b/shared/translations/languages/de.json
@@ -328,6 +328,7 @@
     "Available {{unit}}": "Verfügbare {{unit}}",
     "Resulting {{unit}}": "Resultierende {{unit}}",
     "TO RECEIVE": "ZU ERHALTEN",
+    "TO CONVERT": "UMWANDELN",
     "tokens": "Token"
   },
   "screens/ConvertConfirmScreen": {
@@ -352,7 +353,8 @@
     "Resulting UTXO": "Resultierende UTXO",
     "Convert {{amount}} DFI to {{target}}": "Wandle {{amount}} DFI in {{target}} um",
     "Converting": "Umwandeln",
-    "Converted": "Umgewandelt"
+    "Converted": "Umgewandelt",
+    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "{amount}} {{symbolA}}-Token in {{symbolB}}-Token umwandeln"
   },
   "screens/SettingsNavigator": {
     "Settings": "Einstellungen"
@@ -834,7 +836,9 @@
     "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}": "Darlehensaufnahme von {{amount}} {{symbol}} mit Vault {{vaultId}}",
     "Borrowed {{amount}} {{symbol}}": "{{amount}} {{symbol}} ausgeliehen",
     "Requested amount is higher than available amount.": "Der beantragte Betrag ist höher als der verfügbare Betrag.",
-    "tokens": "Token"
+    "tokens": "Token",
+    "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens": "Umwandlung von {{amount}} {{symbolA}}-Token in {{symbolB}}-Token",
+    "{{amount}} {{symbolA}} converted to {{symbolB}} tokens": "{{amount}} {{symbolA}}-Token in {{symbolB}}-Token umgewandelt"
   },
   "components/BarCodeScanner": {
     "Requesting for camera permission": "Kameranutzung erlauben",
diff --git a/shared/translations/languages/es.json b/shared/translations/languages/es.json
index 32bf237b16..f6884bf0ed 100644
--- a/shared/translations/languages/es.json
+++ b/shared/translations/languages/es.json
@@ -338,7 +338,8 @@
     "Available {{unit}}": "Disponible {{unit}}",
     "Resulting {{unit}}": "Resultando {{unit}}",
     "TO RECEIVE": "A RECIBIR",
-    "tokens": "tokens"
+    "tokens": "tokens",
+    "TO CONVERT": "TO CONVERT"
   },
   "screens/ConvertConfirmScreen": {
     "Confirm": "Confirmar",
@@ -362,7 +363,8 @@
     "Resulting UTXO": "Resultando UTXO",
     "Convert {{amount}} DFI to {{target}}": "Convirtiendo {{amount}} DFI a {{target}}",
     "Converting": "Convirtiendo",
-    "Converted": "Convertido"
+    "Converted": "Convertido",
+    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens"
   },
   "screens/SettingsNavigator": {
     "Settings": "Configuración"
@@ -853,7 +855,9 @@
     "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}": "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}",
     "Borrowed {{amount}} {{symbol}}": "Borrowed {{amount}} {{symbol}}",
     "Requested amount is higher than available amount.": "Requested amount is higher than available amount.",
-    "tokens": "tokens"
+    "tokens": "tokens",
+    "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens": "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens",
+    "{{amount}} {{symbolA}} converted to {{symbolB}} tokens": "{{amount}} {{symbolA}} converted to {{symbolB}} tokens"
   },
   "components/BarCodeScanner": {
     "Requesting for camera permission": "Pidiendo acceso a la cámara",
diff --git a/shared/translations/languages/fr.json b/shared/translations/languages/fr.json
index 27a2cd01e0..3ffc0088e7 100644
--- a/shared/translations/languages/fr.json
+++ b/shared/translations/languages/fr.json
@@ -338,6 +338,7 @@
     "Available {{unit}}": "{{unit}} Disponible",
     "Resulting {{unit}}": "{{unit}} Restants",
     "TO RECEIVE": "A RECEVOIR",
+    "TO CONVERT": "CONVERTIR",
     "tokens": "tokens"
   },
   "screens/ConvertConfirmScreen": {
@@ -362,7 +363,8 @@
     "Resulting UTXO": "UTXO restants",
     "Convert {{amount}} DFI to {{target}}": "Conversion de {{amount}} DFI en {{target}}",
     "Converting": "Conversion",
-    "Converted": "Converti"
+    "Converted": "Converti",
+    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "Convertir {{montant}} de tokens {{symbolA}} en {{symbolB}}"
   },
   "screens/SettingsNavigator": {
     "Settings": "Paramètres"
@@ -468,7 +470,7 @@
     "Liquidity Mining": "Liquidity mining",
     "Liquidity mining": "Liquidity mining",
     "UTXO and Tokens": "UTXO et tokens",
-    "Governance": "Governance"
+    "Governance": "Gouvernance"
   },
   "components/UtxoVsTokenFaq": {
     "About UTXO And Tokens": "UTXO et tokens",
@@ -846,7 +848,9 @@
     "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}": "Emprunt de {{amount}} {{symbol}} avec le vault {{vaultId}}",
     "Borrowed {{amount}} {{symbol}}": "{{amount}} {{symbol}} empruntés",
     "Requested amount is higher than available amount.": "Le montant demandé est supérieur au montant disponible.",
-    "tokens": "tokens"
+    "tokens": "tokens",
+    "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens": "Conversion de {{amount}} de tokens {{symbolA}} en {{symbolB}}",
+    "{{amount}} {{symbolA}} converted to {{symbolB}} tokens": "{{amount}} de tokens {{symbolA}} converti en {{symbolB}}"
   },
   "components/BarCodeScanner": {
     "Requesting for camera permission": "Demande d'accès à votre caméra",
@@ -2216,7 +2220,7 @@
     "Future swap": "Échange à terme",
     "Get DFI": "Obtenir DFI",
     "Convert": "Convertir",
-    "Governance": "Governance"
+    "Governance": "Gouvernance"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "Pool {{poolPair}}",
@@ -2252,7 +2256,7 @@
     "Resulting Tokens": "Tokens restants"
   },
   "screens/OCGProposalsScreen": {
-    "Governance": "Governance",
+    "Governance": "Gouvernance",
     "Community Funding Proposal": "Community Funding Proposal",
     "Proposal to build on top of the DeFiChain blockchain, and funded by the Community Development Fund.": "Proposition de construire sur la blockchain DeFiChain, et financée par le fonds de développement communautaire, le Community Development Fund.",
     "DeFiChain Improvement Proposal": "DeFiChain Improvement Proposal",
diff --git a/shared/translations/languages/it.json b/shared/translations/languages/it.json
index d422da23e6..b9deeafb5b 100644
--- a/shared/translations/languages/it.json
+++ b/shared/translations/languages/it.json
@@ -363,7 +363,8 @@
     "Resulting UTXO": "Risultato UTXO",
     "Convert {{amount}} DFI to {{target}}": "Conversione {{amount}} DFI in {{target}}",
     "Converting": "Conversione",
-    "Converted": "Converted"
+    "Converted": "Converted",
+    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens"
   },
   "screens/SettingsNavigator": {
     "Settings": "Impostazioni"
@@ -852,7 +853,9 @@
     "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}": "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}",
     "Borrowed {{amount}} {{symbol}}": "Borrowed {{amount}} {{symbol}}",
     "Requested amount is higher than available amount.": "Requested amount is higher than available amount.",
-    "tokens": "tokens"
+    "tokens": "tokens",
+    "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens": "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens",
+    "{{amount}} {{symbolA}} converted to {{symbolB}} tokens": "{{amount}} {{symbolA}} converted to {{symbolB}} tokens"
   },
   "components/BarCodeScanner": {
     "Requesting for camera permission": "Richiesta di accesso alla fotocamera",
diff --git a/shared/translations/languages/zh-Hans.json b/shared/translations/languages/zh-Hans.json
index e86067cf07..c0ac9caaef 100644
--- a/shared/translations/languages/zh-Hans.json
+++ b/shared/translations/languages/zh-Hans.json
@@ -328,6 +328,7 @@
     "Available {{unit}}": "可转换资金 {{unit}}",
     "Resulting {{unit}}": "转换后 {{unit}}",
     "TO RECEIVE": "TO RECEIVE",
+    "TO CONVERT": "转换",
     "tokens": "代币"
   },
   "screens/ConvertConfirmScreen": {
@@ -352,7 +353,8 @@
     "Resulting UTXO": "转换后 UTXO",
     "Convert {{amount}} DFI to {{target}}": "转换 {{amount}} DFI 至 {{target}}",
     "Converting": "转换中",
-    "Converted": "Converted"
+    "Converted": "Converted",
+    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "转换 {{amount}} {{symbolA}} 到 {{symbolB}} 代币"
   },
   "screens/SettingsNavigator": {
     "Settings": "设置"
@@ -837,7 +839,9 @@
     "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}": "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}",
     "Borrowed {{amount}} {{symbol}}": "Borrowed {{amount}} {{symbol}}",
     "Requested amount is higher than available amount.": "您请求的金额高于可用金额。",
-    "tokens": "代币"
+    "tokens": "代币",
+    "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens": "正在转换 {{amount}} {{symbolA}} 到 {{symbolB}} 代币 ",
+    "{{amount}} {{symbolA}} converted to {{symbolB}} tokens": "{{amount}} {{symbolA}} 已经成功转换成 {{symbolB}}代币"
   },
   "components/BarCodeScanner": {
     "Requesting for camera permission": "请许可程序使用相机",
@@ -2212,7 +2216,7 @@
     "Future swap": "Future swap",
     "Get DFI": "获取 DFI",
     "Convert": "转换",
-    "Governance": "Governance"
+    "Governance": "治理"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "Pool {{poolPair}}",
@@ -2248,7 +2252,7 @@
     "Resulting Tokens": "转换后 Tokens"
   },
   "screens/OCGProposalsScreen": {
-    "Governance": "Governance",
+    "Governance": "治理",
     "Community Funding Proposal": "社区资助提案 (CFP)",
     "Proposal to build on top of the DeFiChain blockchain, and funded by the Community Development Fund.": "该选项是用于搭建在DeFiChain区块链之上且由社区发展基金资助",
     "DeFiChain Improvement Proposal": "DeFiChain 改进提案 (DFIP)",
diff --git a/shared/translations/languages/zh-Hant.json b/shared/translations/languages/zh-Hant.json
index e52392f4e1..fb26f81157 100644
--- a/shared/translations/languages/zh-Hant.json
+++ b/shared/translations/languages/zh-Hant.json
@@ -328,6 +328,7 @@
     "Available {{unit}}": "可轉換資金 {{unit}}",
     "Resulting {{unit}}": "轉換後 {{unit}}",
     "TO RECEIVE": "TO RECEIVE",
+    "TO CONVERT": "轉換",
     "tokens": "代幣"
   },
   "screens/ConvertConfirmScreen": {
@@ -352,7 +353,8 @@
     "Resulting UTXO": "轉換後 UTXO",
     "Convert {{amount}} DFI to {{target}}": "轉換 {{amount}} DFI 至 {{target}}",
     "Converting": "轉換中",
-    "Converted": "Converted"
+    "Converted": "Converted",
+    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "轉換 {{amount}} {{symbolA}} 到 {{symbolB}} 代幣"
   },
   "screens/SettingsNavigator": {
     "Settings": "設定"
@@ -837,7 +839,9 @@
     "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}": "Borrowing {{amount}} {{symbol}} with vault {{vaultId}}",
     "Borrowed {{amount}} {{symbol}}": "Borrowed {{amount}} {{symbol}}",
     "Requested amount is higher than available amount.": "您請求的金額高於可用金額。",
-    "tokens": "代幣"
+    "tokens": "代幣",
+    "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens": "正在轉換 {{amount}} {{symbolA}} 到 {{symbolB}} 代幣",
+    "{{amount}} {{symbolA}} converted to {{symbolB}} tokens": "{{amount}} {{symbolA}} 已經成功轉換成 {{symbolB}}代幣"
   },
   "components/BarCodeScanner": {
     "Requesting for camera permission": "請許可程序使用相機",
@@ -2213,7 +2217,7 @@
     "Future swap": "Future swap",
     "Get DFI": "獲取 DFI",
     "Convert": "轉換",
-    "Governance": "Governance"
+    "Governance": "治理"
   },
   "screens/PoolPairDetailsScreen": {
     "{{poolPair}} Pool": "Pool {{poolPair}}",
@@ -2249,7 +2253,7 @@
     "Resulting Tokens": "轉換後 Tokens"
   },
   "screens/OCGProposalsScreen": {
-    "Governance": "Governance",
+    "Governance": "治理",
     "Community Funding Proposal": "社區資助提案 (CFP)",
     "Proposal to build on top of the DeFiChain blockchain, and funded by the Community Development Fund.": "該選項是用於搭建在DeFiChain區塊鏈之上且由社區發展基金資助",
     "DeFiChain Improvement Proposal": "DeFiChain 改進提案 (DFIP)",

From 4b6b1a279796e3467514d4b9da305761b6ac4899 Mon Sep 17 00:00:00 2001
From: chloe <44501120+chloezxyy@users.noreply.github.com>
Date: Thu, 24 Aug 2023 16:18:14 +0800
Subject: [PATCH 4/6] translations

---
 shared/translations/languages/de.json      |  2 +-
 shared/translations/languages/zh-Hans.json | 36 +++++++++++-----------
 shared/translations/languages/zh-Hant.json | 30 +++++++++---------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/shared/translations/languages/de.json b/shared/translations/languages/de.json
index fb4e167d6a..c682deafc8 100644
--- a/shared/translations/languages/de.json
+++ b/shared/translations/languages/de.json
@@ -354,7 +354,7 @@
     "Convert {{amount}} DFI to {{target}}": "Wandle {{amount}} DFI in {{target}} um",
     "Converting": "Umwandeln",
     "Converted": "Umgewandelt",
-    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "{amount}} {{symbolA}}-Token in {{symbolB}}-Token umwandeln"
+    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "{{amount}} {{symbolA}}-Token in {{symbolB}}-Token umwandeln"
   },
   "screens/SettingsNavigator": {
     "Settings": "Einstellungen"
diff --git a/shared/translations/languages/zh-Hans.json b/shared/translations/languages/zh-Hans.json
index c0ac9caaef..99295b70c2 100644
--- a/shared/translations/languages/zh-Hans.json
+++ b/shared/translations/languages/zh-Hans.json
@@ -211,9 +211,9 @@
     "Address saved!": "Address saved!",
     "Address label updated!": "Address label updated!",
     "Address deleted!": "Address deleted!",
-    "It may take a few seconds to delete": "It may take a few seconds to delete",
-    "It may take a few seconds to update": "It may take a few seconds to update",
-    "It may take a few seconds to save": "It may take a few seconds to save",
+    "It may take a few seconds to delete": "可能需要几秒钟进行删除",
+    "It may take a few seconds to update": "可能需要几秒钟进行更新",
+    "It may take a few seconds to save": "可能需要几秒钟进行保存",
     "ADDRESS TYPE": "地址类型"
   },
   "screens/ReceiveScreen": {
@@ -260,7 +260,7 @@
     "SEND TO": "SEND TO",
     "Paste address": "Paste address",
     "I WANT TO SEND": "I WANT TO SEND",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "Verified": "Verified",
     "{{percent}} of available {{unit}} entered": "{{percent}} of available {{unit}} entered",
     "Max available {{unit}} entered": "Max available {{unit}} entered",
@@ -321,7 +321,7 @@
     "I WANT TO CONVERT": "I WANT TO CONVERT",
     "Insufficient balance": "Insufficient balance",
     "Available: ": "可转换资金: ",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "Max available {{unit}} entered": "Max available {{unit}} entered",
     "{{percent}} of available {{unit}} entered": "{{percent}} of available {{unit}} entered",
     "A small amount of UTXO is reserved for fees": "保留少量 UTXO 用于交易费用",
@@ -346,7 +346,7 @@
     "Convert": "转换",
     "{{token}} to receive": "{{token}} 将会收到",
     "CONFIRM TRANSACTION": "确认发出",
-    "You are converting to {{unit}}": "You are converting to {{unit}}",
+    "You are converting to {{unit}}": "您正在转换为 {{unit}}",
     "Transaction fee": "交易費用",
     "Resulting Tokens (EVM)": "转换后 Tokens (EVM)",
     "Resulting Tokens": "转换后 Tokens",
@@ -418,7 +418,7 @@
     "This will unlink your wallet from the app.": "这将取消您的钱包与应用程式的绑定。",
     "DISPLAY & LANGUAGE": "显示和语言",
     "Provide your passcode to\nview recovery words.": "Provide your passcode to\nview recovery words.",
-    "Passcode verified!": "Passcode verified!",
+    "Passcode verified!": "密码已验证!",
     "Provider": "Provider",
     "Custom": "Custom",
     "Default": "Default",
@@ -890,7 +890,7 @@
     "Pooled {{symbol}}": "池中总 {{symbol}}",
     "View pool share": "View pool share",
     "View pool info": "View pool info",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "Insufficient balance": "Insufficient balance",
     "APR": "APR",
     "Shares to add": "Shares to add",
@@ -1074,9 +1074,9 @@
     "You are buying dTokens at 5% more than the oracle price at settlement block.": "You are buying dTokens at 5% more than the oracle price at settlement block.",
     "You are buying {{displaySymbol}} at 5% more than the oracle price at settlement block.": "You are buying {{displaySymbol}} at 5% more than the oracle price at settlement block.",
     "You are selling your {{displaySymbol}} at 5% less than the oracle price at settlement block.": "You are selling your {{displaySymbol}} at 5% less than the oracle price at settlement block.",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "By continuing, the required amount of DFI will be converted": "By continuing, the required amount of DFI will be converted",
-    "I HAVE {{totalAmount}} {{token}}": "I HAVE {{totalAmount}} {{token}}",
+    "I HAVE {{totalAmount}} {{token}}": "我有 {{totalAmount}} {{token}}",
     "I WANT {{token}}": "I WANT {{token}}",
     "incl. stabilization fee ({{dexStabilizationFee}}%)": "incl. stabilization fee ({{dexStabilizationFee}}%)",
     "Total fees": "Total fees",
@@ -1162,7 +1162,7 @@
     "Sign to verify access": "签下以确认使用",
     "Success!": "成功！",
     "It may take a few seconds to verify": "It may take a few seconds to verify",
-    "Passcode verified!": "Passcode verified!",
+    "Passcode verified!": "密码已验证!",
     "Provide your passcode to view recovery words.": "Provide your passcode to view recovery words.",
     "Provide existing passcode to change passcode.": "Provide existing passcode to change passcode."
   },
@@ -1758,7 +1758,7 @@
     "Insufficient DFI and/or DUSD in vault to maintain active loans": "Insufficient DFI and/or DUSD in vault to maintain active loans",
     "Active DUSD loans require 50% DFI collaterals": "Active DUSD loans require 50% DFI collaterals",
     "By continuing, the required amount of DFI will be converted": "By continuing, the required amount of DFI will be converted",
-    "Review full details in the next screen": "Review full details in the next screen"
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息"
   },
   "screens/ConfirmEditCollateralScreen": {
     "You are adding collateral to": "向金库增加抵押品",
@@ -1801,7 +1801,7 @@
     "I WANT TO PAY": "I WANT TO PAY",
     "I WANT TO PAY WITH DUSD COLLATERAL": "I WANT TO PAY WITH DUSD COLLATERAL",
     "Available: ": "现有可使用: ",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "Use your DUSD collaterals to fully pay off your DUSD loan.": "Use your DUSD collaterals to fully pay off your DUSD loan.",
     "Continue": "继续",
     "Max available {{unit}} entered": "Max available {{unit}} entered",
@@ -1890,7 +1890,7 @@
     "Amount entered may liquidate the vault. Proceed at your own risk.": "Amount entered may liquidate the vault. Proceed at your own risk.",
     "Insufficient DFI and/or DUSD in vault. Add more to start minting dTokens.": "Insufficient DFI and/or DUSD in vault. Add more to start minting dTokens.",
     "Insufficient DFI in vault. Add more to borrow DUSD.": "Insufficient DFI in vault. Add more to borrow DUSD.",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "Max loan amount entered": "已输入最高贷款金额",
     "{{percent}} of max loan amount entered": "已输入最高贷款金额的 {{percent}}%",
     "SELECT VAULT FOR COLLATERAL": "选择金库抵押",
@@ -1961,7 +1961,7 @@
     "Continue": "继续",
     "Confirm your vault details in next screen": "在下一页确认金库的细行",
     "AVAILABLE SCHEMES": "AVAILABLE SCHEMES",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "VAULT DETAILS": "VAULT DETAILS",
     "{{interestRate}}% Interest": "{{interestRate}}% Interest",
     "min. ": "min. ",
@@ -2058,7 +2058,7 @@
     "The value of the tokens you are placing is considerably higher than the total auction value.": "您正要出的价钱比拍卖价值还高，请检查和确认",
     "Collateral for auction": "待拍賣的抵押品",
     "I HAVE {{ownedAmount}} {{symbol}}": "I HAVE {{ownedAmount}} {{symbol}}",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "Transaction fee": "Transaction fee",
     "The minimum next bid is {{amount}} {{symbol}} (100%)": "The minimum next bid is {{amount}} {{symbol}} (100%)",
     "{{percent}} min bid entered": "{{percent}} 最低竞投出价输入",
@@ -2087,7 +2087,7 @@
     "Preparing placing {{amount}} {{token}} bid": "Preparing placing {{amount}} {{token}} bid",
     "Placed {{amount}} {{token}} bid": "Placed {{amount}} {{token}} bid",
     "It may take a few seconds to verify": "It may take a few seconds to verify",
-    "Passcode verified!": "Passcode verified!"
+    "Passcode verified!": "密码已验证!"
   },
   "screens/WithdrawFutureSwapScreen": {
     "Withdraw": "Withdraw",
@@ -2105,7 +2105,7 @@
     "Withdraw from": "Withdraw from",
     "Insufficient Balance": "Insufficient Balance",
     "Transaction fee": "交易費用",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一个屏幕中查看完整详细信息",
     "Max available {{unit}} entered": "Max available {{unit}} entered",
     "{{percent}} of available {{unit}} entered": "{{percent}} of available {{unit}} entered",
     "Amount to swap": "Amount to swap",
diff --git a/shared/translations/languages/zh-Hant.json b/shared/translations/languages/zh-Hant.json
index fb26f81157..d0a584f17d 100644
--- a/shared/translations/languages/zh-Hant.json
+++ b/shared/translations/languages/zh-Hant.json
@@ -211,9 +211,9 @@
     "Address saved!": "Address saved!",
     "Address label updated!": "Address label updated!",
     "Address deleted!": "Address deleted!",
-    "It may take a few seconds to delete": "It may take a few seconds to delete",
-    "It may take a few seconds to update": "It may take a few seconds to update",
-    "It may take a few seconds to save": "It may take a few seconds to save",
+    "It may take a few seconds to delete": "可能需要幾秒鐘進行刪除",
+    "It may take a few seconds to update": "可能需要幾秒鐘進行更新",
+    "It may take a few seconds to save": "可能需要幾秒鐘進行保存",
     "ADDRESS TYPE": "地址類型"
   },
   "screens/ReceiveScreen": {
@@ -260,7 +260,7 @@
     "SEND TO": "SEND TO",
     "Paste address": "Paste address",
     "I WANT TO SEND": "I WANT TO SEND",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "Verified": "Verified",
     "{{percent}} of available {{unit}} entered": "{{percent}} of available {{unit}} entered",
     "Max available {{unit}} entered": "Max available {{unit}} entered",
@@ -321,7 +321,7 @@
     "I WANT TO CONVERT": "I WANT TO CONVERT",
     "Insufficient balance": "Insufficient balance",
     "Available: ": "可轉換資金: ",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "Max available {{unit}} entered": "Max available {{unit}} entered",
     "{{percent}} of available {{unit}} entered": "{{percent}} of available {{unit}} entered",
     "A small amount of UTXO is reserved for fees": "保留少量 UTXO 用於交易費用",
@@ -346,7 +346,7 @@
     "Convert": "轉換",
     "{{token}} to receive": "{{token}} 將會收到",
     "CONFIRM TRANSACTION": "確認交易",
-    "You are converting to {{unit}}": "You are converting to {{unit}}",
+    "You are converting to {{unit}}": "您正在轉換為 {{unit}}",
     "Transaction fee": "交易費用",
     "Resulting Tokens (EVM)": "轉換後 Tokens (EVM)",
     "Resulting Tokens": "轉換後 Tokens",
@@ -890,7 +890,7 @@
     "Pooled {{symbol}}": "池中總 {{symbol}}",
     "View pool share": "View pool share",
     "View pool info": " 查看流動池資料",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "Insufficient balance": "Insufficient balance",
     "APR": "APR",
     "Shares to add": "要添加的股份",
@@ -1074,9 +1074,9 @@
     "You are buying dTokens at 5% more than the oracle price at settlement block.": "You are buying dTokens at 5% more than the oracle price at settlement block.",
     "You are buying {{displaySymbol}} at 5% more than the oracle price at settlement block.": "You are buying {{displaySymbol}} at 5% more than the oracle price at settlement block.",
     "You are selling your {{displaySymbol}} at 5% less than the oracle price at settlement block.": "You are selling your {{displaySymbol}} at 5% less than the oracle price at settlement block.",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "By continuing, the required amount of DFI will be converted": "By continuing, the required amount of DFI will be converted",
-    "I HAVE {{totalAmount}} {{token}}": "I HAVE {{totalAmount}} {{token}}",
+    "I HAVE {{totalAmount}} {{token}}": "我有 {{totalAmount}} {{token}}",
     "I WANT {{token}}": "I WANT {{token}}",
     "incl. stabilization fee ({{dexStabilizationFee}}%)": "incl. stabilization fee ({{dexStabilizationFee}}%)",
     "Total fees": "Total fees",
@@ -1760,7 +1760,7 @@
     "Insufficient DFI and/or DUSD in vault to maintain active loans": "Insufficient DFI and/or DUSD in vault to maintain active loans",
     "Active DUSD loans require 50% DFI collaterals": "Active DUSD loans require 50% DFI collaterals",
     "By continuing, the required amount of DFI will be converted": "By continuing, the required amount of DFI will be converted",
-    "Review full details in the next screen": "Review full details in the next screen"
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息"
   },
   "screens/ConfirmEditCollateralScreen": {
     "You are adding collateral to": "您正在加入抵押到",
@@ -1803,7 +1803,7 @@
     "I WANT TO PAY": "I WANT TO PAY",
     "I WANT TO PAY WITH DUSD COLLATERAL": "I WANT TO PAY WITH DUSD COLLATERAL",
     "Available: ": "現有可使用: ",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "Use your DUSD collaterals to fully pay off your DUSD loan.": "Use your DUSD collaterals to fully pay off your DUSD loan.",
     "Continue": "繼續",
     "Max available {{unit}} entered": "Max available {{unit}} entered",
@@ -1892,7 +1892,7 @@
     "Amount entered may liquidate the vault. Proceed at your own risk.": "Amount entered may liquidate the vault. Proceed at your own risk.",
     "Insufficient DFI and/or DUSD in vault. Add more to start minting dTokens.": "Insufficient DFI and/or DUSD in vault. Add more to start minting dTokens.",
     "Insufficient DFI in vault. Add more to borrow DUSD.": "Insufficient DFI in vault. Add more to borrow DUSD.",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "Max loan amount entered": "已輸入最高貸款金額的",
     "{{percent}} of max loan amount entered": "已輸入最高貸款金額的 {{percent}}%",
     "SELECT VAULT FOR COLLATERAL": "選擇金庫抵押",
@@ -1963,7 +1963,7 @@
     "Continue": "繼續",
     "Confirm your vault details in next screen": "請在下一頁確認金庫細項",
     "AVAILABLE SCHEMES": "AVAILABLE SCHEMES",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "VAULT DETAILS": "VAULT DETAILS",
     "{{interestRate}}% Interest": "{{interestRate}}% Interest",
     "min. ": "min. ",
@@ -2059,7 +2059,7 @@
     "The value of the tokens you are placing is considerably higher than the total auction value.": "您正要出的價錢比拍賣價值還高，請檢查和確認",
     "Collateral for auction": "待拍賣的抵押品",
     "I HAVE {{ownedAmount}} {{symbol}}": "I HAVE {{ownedAmount}} {{symbol}}",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "Transaction fee": "Transaction fee",
     "The minimum next bid is {{amount}} {{symbol}} (100%)": "The minimum next bid is {{amount}} {{symbol}} (100%)",
     "{{percent}} min bid entered": "{{percent}} 最低競投出價輸入",
@@ -2106,7 +2106,7 @@
     "Withdraw from": "Withdraw from",
     "Insufficient Balance": "Insufficient Balance",
     "Transaction fee": "交易費用",
-    "Review full details in the next screen": "Review full details in the next screen",
+    "Review full details in the next screen": "在下一個屏幕中查看完整詳細信息",
     "Max available {{unit}} entered": "Max available {{unit}} entered",
     "{{percent}} of available {{unit}} entered": "{{percent}} of available {{unit}} entered",
     "Amount to swap": "Amount to swap",

From a93cd459e53621b2fe697f1f81890931ba314a85 Mon Sep 17 00:00:00 2001
From: chloe <44501120+chloezxyy@users.noreply.github.com>
Date: Mon, 28 Aug 2023 17:37:56 +0800
Subject: [PATCH 5/6] update de translations

---
 shared/translations/languages/de.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared/translations/languages/de.json b/shared/translations/languages/de.json
index c682deafc8..b7323ce892 100644
--- a/shared/translations/languages/de.json
+++ b/shared/translations/languages/de.json
@@ -354,7 +354,7 @@
     "Convert {{amount}} DFI to {{target}}": "Wandle {{amount}} DFI in {{target}} um",
     "Converting": "Umwandeln",
     "Converted": "Umgewandelt",
-    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "{{amount}} {{symbolA}}-Token in {{symbolB}}-Token umwandeln"
+    "Convert {{amount}} {{symbolA}} to {{symbolB}} tokens": "{{amount}} {{symbolA}}- in {{symbolB}}-Token umwandeln"
   },
   "screens/SettingsNavigator": {
     "Settings": "Einstellungen"
@@ -837,8 +837,8 @@
     "Borrowed {{amount}} {{symbol}}": "{{amount}} {{symbol}} ausgeliehen",
     "Requested amount is higher than available amount.": "Der beantragte Betrag ist höher als der verfügbare Betrag.",
     "tokens": "Token",
-    "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens": "Umwandlung von {{amount}} {{symbolA}}-Token in {{symbolB}}-Token",
-    "{{amount}} {{symbolA}} converted to {{symbolB}} tokens": "{{amount}} {{symbolA}}-Token in {{symbolB}}-Token umgewandelt"
+    "Converting {{amount}} {{symbolA}} to {{symbolB}} tokens": "Umwandlung von {{amount}} {{symbolA}}- in {{symbolB}}-Token",
+    "{{amount}} {{symbolA}} converted to {{symbolB}} tokens": "{{amount}} {{symbolA}}- in {{symbolB}}-Token umgewandelt"
   },
   "components/BarCodeScanner": {
     "Requesting for camera permission": "Kameranutzung erlauben",

From 4c1e55c8b4d175b3f8d8f1988a9b5d08faddd015 Mon Sep 17 00:00:00 2001
From: chloe <44501120+chloezxyy@users.noreply.github.com>
Date: Mon, 28 Aug 2023 17:44:56 +0800
Subject: [PATCH 6/6] add missing it translation object

---
 shared/translations/languages/it.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shared/translations/languages/it.json b/shared/translations/languages/it.json
index b9deeafb5b..290402aa00 100644
--- a/shared/translations/languages/it.json
+++ b/shared/translations/languages/it.json
@@ -339,6 +339,7 @@
     "Available {{unit}}": "Disponibile {{unit}}",
     "Resulting {{unit}}": "Risultato {{unit}}",
     "TO RECEIVE": "TO RECEIVE",
+    "TO CONVERT": "TO CONVERT",
     "tokens": "tokens"
   },
   "screens/ConvertConfirmScreen": {