Merge remote-tracking branch 'origin/develop' into feat_savers_rm_dan…

…gerous_withdraw

.env.base

@@ -56,6 +56,7 @@ REACT_APP_FEATURE_READ_ONLY_ASSETS=true
 # swapper feature flags - other .env files will override these
 REACT_APP_FEATURE_COWSWAP=true
 REACT_APP_FEATURE_COWSWAP_GNOSIS=true
+REACT_APP_FEATURE_COWSWAP_ARBITRUM=false
 REACT_APP_FEATURE_LIFI_SWAP=true
 REACT_APP_FEATURE_ONE_INCH=false
 REACT_APP_FEATURE_THOR_SWAP=true

.env.dev

@@ -2,6 +2,7 @@
 REACT_APP_FEATURE_RFOX=true
 REACT_APP_FEATURE_RFOX_REWARDS_TAB=true
 REACT_APP_FEATURE_ARBITRUM_BRIDGE=true
+REACT_APP_FEATURE_COWSWAP_ARBITRUM=true
 
 # logging
 REACT_APP_REDUX_WINDOW=false

.env.develop

@@ -3,6 +3,7 @@ REACT_APP_FEATURE_CHATWOOT=true
 REACT_APP_FEATURE_RFOX=true
 REACT_APP_FEATURE_RFOX_REWARDS_TAB=true
 REACT_APP_FEATURE_ARBITRUM_BRIDGE=true
+REACT_APP_FEATURE_COWSWAP_ARBITRUM=true
 
 # mixpanel
 REACT_APP_MIXPANEL_TOKEN=1c1369f6ea23a6404bac41b42817cc4b

scripts/generateAssetData/generateRelatedAssetIndex/generateRelatedAssetIndex.ts

@@ -5,6 +5,8 @@ import {
   baseAssetId,
   ethAssetId,
   FEE_ASSET_IDS,
+  foxAssetId,
+  foxOnArbitrumOneAssetId,
   fromAssetId,
   optimismAssetId,
 } from '@shapeshiftoss/caip'
@@ -53,6 +55,7 @@ const manualRelatedAssetIndex: Record<AssetId, AssetId[]> = {
     // WETH on Optimism
     'eip155:10/erc20:0x4200000000000000000000000000000000000006',
   ],
+  [foxAssetId]: [foxOnArbitrumOneAssetId],
 }
 
 export const getManualRelatedAssetIds = (
@@ -231,24 +234,30 @@ const processRelatedAssetIds = async (
   const manualRelatedAssetsResult = getManualRelatedAssetIds(assetId)
 
   // ensure empty results get added so we can use this index to generate distinct asset list
-  const { relatedAssetIds, relatedAssetKey } = manualRelatedAssetsResult ??
-    relatedAssetsResult ?? {
-      relatedAssetIds: [],
-      relatedAssetKey: assetId,
-    }
+  const { relatedAssetIds: manualRelatedAssetIds } = manualRelatedAssetsResult ?? {
+    relatedAssetIds: [],
+  }
+
+  const relatedAssetKey =
+    manualRelatedAssetsResult?.relatedAssetKey || relatedAssetsResult?.relatedAssetKey || assetId
+
+  const zerionRelatedAssetIds = relatedAssetsResult?.relatedAssetIds ?? []
+  const mergedRelatedAssetIds = Array.from(
+    new Set([...manualRelatedAssetIds, ...zerionRelatedAssetIds]),
+  )
 
   // Has zerion-provided related assets, or manually added ones
-  const hasRelatedAssets = relatedAssetIds.length > 0
+  const hasRelatedAssets = mergedRelatedAssetIds.length > 0
 
   // attach the relatedAssetKey for all related assets including the primary implementation (where supported by us)
   if (hasRelatedAssets && assetData[relatedAssetKey] !== undefined) {
     assetData[relatedAssetKey].relatedAssetKey = relatedAssetKey
   }
 
-  for (const assetId of relatedAssetIds) {
+  for (const assetId of mergedRelatedAssetIds) {
     assetData[assetId].relatedAssetKey = relatedAssetKey
   }
-  relatedAssetIndex[relatedAssetKey] = relatedAssetIds
+  relatedAssetIndex[relatedAssetKey] = mergedRelatedAssetIds
   return
 }
 

src/assets/translations/de/main.json

@@ -865,7 +865,8 @@
       "tradeFailed": "Handel fehlgeschlagen. Zurückgegebene Vermögenswerte abzüglich Gasgebühr",
       "noQuotesAvailable": "Für diesen Handel sind keine Angebote verfügbar",
       "smartContractWalletNotSupported": "Smart Contract Wallet wird nicht unterstützt",
-      "unsafeQuote": "Dieser Betrag liegt unter dem empfohlenen Mindestwert für dieses Paar (%{recommendedMin} %{symbol}). Dies könnte zum Scheitern Ihres Handels oder zum Verlust von Werten führen."
+      "unsafeQuote": "Dieser Betrag liegt unter dem empfohlenen Mindestwert für dieses Paar (%{recommendedMin} %{symbol}). Dies könnte zum Scheitern Ihres Handels oder zum Verlust von Werten führen.",
+      "rateLimitExceeded": "Ratenlimit überschritten. Versuchen Sie es später erneut."
     },
     "swappingComingSoonForWallet": "Der Tausch gegen %{walletName} ist in Kürze verfügbar",
     "recentTrades": "Letzte Handelsaktionen",
@@ -1813,7 +1814,8 @@
     "importAccounts": {
       "title": "%{chainNamespaceDisplayName} Konten importieren",
       "description": "Wählen Sie aus der Liste unten die Konten aus, die Sie importieren möchten.",
-      "import": "Importieren"
+      "import": "Importieren",
+      "loadMoreDisabled": "Diese Wallet unterstützt keine Mehrfachkonten für diese Kette."
     },
     "ledgerOpenApp": {
       "title": "Öffnen Sie die %{appName} App",
@@ -2344,8 +2346,8 @@
     "symAfterRuneAlert": "Aufgrund der Funktionsweise des THOR-Netzwerks sind symmetrische Einzahlungen nach einer asymmetrischen RUNE-Einzahlung nicht möglich.",
     "incompletePositionDepositAlert": "Diese Position ist unvollständig. Bitte zahlen Sie den entsprechenden Betrag von %{asset} ein, um diese Position abzuschließen.",
     "incompletePositionWithdrawAlert": "Diese Position ist unvollständig. Bitte stornieren Sie die Position, indem Sie 100 % der Liquidität entfernen. Sie können die Position auch über „Liquidität hinzufügen“ abschließen.",
-    "unsupportedNetworkExplainer": "Ihre Wallet unterstützt %{network} nicht. Bitte wechseln Sie zu einer Wallet, die dieses Netzwerk unterstützt.",
-    "unsupportedNetworksExplainer": "Ihre Wallet unterstützt %{network1} und %{network2} nicht. Bitte wechseln Sie zu einer Wallet, die diese Netzwerke unterstützt.",
+    "unsupportedNetworkExplainer": "Ihre Wallet ist nicht mit %{network} verbunden. Bitte verbinden Sie sie oder wechseln Sie zu einer Wallet, die dieses Netzwerk unterstützt.",
+    "unsupportedNetworksExplainer": "Ihre Wallet ist nicht mit %{network1} und %{network2} verbunden. Bitte verbinden Sie sie  oder wechseln Sie zu einer Wallet, die diese Netzwerke unterstützt.",
     "shareOfPool": "Anteil am Pool",
     "assetDepositAmount": "%{asset} Einzahlungsbetrag",
     "totalLiquidity": "Gesamtliquidität",
@@ -2435,6 +2437,7 @@
     "unstakeAmount": "Unstake Betrag",
     "confirmAndStake": "Bestätigen und Stake",
     "confirmAndUnstake": "Bestätigen & Unstake",
+    "confirmAndClaim": "Bestätigen und beanspruchen",
     "shapeShiftFee": "ShapeShift Gebühr",
     "approvalFee": "Genehmigungsgebühr",
     "lockupPeriod": "Sperrfrist",
@@ -2450,7 +2453,9 @@
       "stakeAmount": "Dies ist der Betrag an FOX, den Sie Staken werden",
       "unstakeAmount": "Dies ist der Betrag an FOX, den Sie Unstaken werden",
       "lockupPeriod": "So lange müssen Sie nach dem Unstaking warten, um Ihren FOX zu beanspruchen",
-      "shareOfPool": "Dies ist Ihr Prozentsatz der Gebühren, die Sie verdienen."
+      "shareOfPool": "Dies ist Ihr Prozentsatz der Gebühren, die Sie verdienen.",
+      "unstakePendingCooldown": "Anspruch verfügbar %{cooldownPeriodHuman}",
+      "cooldownComplete": "Abkühlungsphase beendet %{cooldownPeriodHuman}"
     },
     "stakeSuccess": "Sie haben erfolgreich %{amount} %{symbol} gestaked",
     "stakePending": "Staking %{amount} %{symbol}...",
@@ -2467,6 +2472,13 @@
     "stakeNow": "Stake jetzt",
     "noAddressFound": "Keine Adresse gefunden",
     "newAddressInfo": "Dies wird für den nächsten Belohnungszyklus aktualisiert",
-    "confirmAndUpdateAddress": "Adresse bestätigen und aktualisieren"
+    "confirmAndUpdateAddress": "Adresse bestätigen und aktualisieren",
+    "unstakeFrom": "Unstake von r%{assetSymbol}",
+    "claimPending": "Auszahlung anfordern",
+    "claimSuccess": "Sie haben %{amount} %{symbol} erfolgreich beansprucht.",
+    "claimReceiveAddress": "Adresse für den Erhalt des Anspruchs",
+    "noClaimsAvailable": "Keine Ansprüche vorhanden",
+    "noClaimsAvailableDescription": "Sie haben keine verfügbaren Ansprüche",
+    "unstakeNow": "Jetzt Unstaken"
   }
 }

src/assets/translations/en/main.json

@@ -2464,14 +2464,14 @@
       "unstakeAmount": "This is amount of FOX you will unstake",
       "lockupPeriod": "This is how long you will have to wait after unstaking to claim your FOX",
       "shareOfPool": "This is your percentage of the fees you'll earn.",
-      "unstakePendingCooldown": "Claim available in %{cooldownPeriodHuman}",
+      "unstakePendingCooldown": "Claim available %{cooldownPeriodHuman}",
       "cooldownComplete": "Cooldown finished %{cooldownPeriodHuman}"
     },
     "stakeSuccess": "You have successfully staked %{amount} %{symbol}",
     "stakePending": "Staking %{amount} %{symbol}...",
     "addressUpdated": "Address updated",
     "changeRewardAddressPending": "Changing Reward Address...",
-    "changeRewardAddressSuccess": "You have successfully changed your THORCHain Reward Address.",
+    "changeRewardAddressSuccess": "You have successfully changed your THORChain Reward Address.",
     "unstakePending": "Requesting withdraw of %{amount} %{symbol}",
     "unstakeSuccess": "Once the %{cooldownPeriod} has elapsed, you will be able to claim your %{amount} %{symbol}",
     "currentRewardAddress": "Current Reward Address",
@@ -2507,15 +2507,31 @@
       "title": "FAQ",
       "what": {
         "title": "What is rFOX?",
-        "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        "body": "rFOX is a term used to describe the benefits and rewards you receive when you stake your FOX tokens on Arbitrum. Currently, you lock and unlock vanilla FOX (on Arbitrum) tokens for staking emissions."
       },
       "why": {
         "title": "Why stake your FOX?",
-        "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        "body": "Staking your FOX allows you to earn regular RUNE payouts from the DAO's treasury, providing a steady stream of passive income in RUNE per epoch. Additionally, a portion of the RUNE received by the DAO is used to buy FOX from the open market and burn it, reducing the overall supply. Staking also supports the ShapeShift DAO's alignment with the THORChain ecosystem, contributing to their growth and success. The staking process requires a minimum 28-day unstaking period, encouraging commitment and stability within the community."
+      },
+      "stake": {
+        "title": "How do I stake my FOX?",
+        "body": "To stake your FOX, you use the staking interface to lock your FOX tokens into the staking contract. You will need to sign a message or transaction to assign the address where your RUNE rewards will be paid. Once staked, you start earning RUNE rewards per block as part of your staking benefits."
+      },
+      "unstake": {
+        "title": "What happens when I unstake?",
+        "body": "When you decide to unstake, there is a minimum 28-day unstaking period. During this time, your FOX remains locked, and you cease to receive RUNE emissions. After the unstaking period, you can unlock and retrieve your regular FOX tokens."
       },
       "cooldown": {
-        "title": "What is the cooldown period?",
-        "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        "title": "How long is the cooldown period?",
+        "body": "The cooldown period for unstaking FOX tokens is 28 days. During this time, your tokens remain locked and cannot be transferred."
+      },
+      "multipleUnstaking": {
+        "title": "Can I have multiple unstaking amounts?",
+        "body": "Yes, you can have multiple unstaking amounts. Each unstaking action will have its own 28-day cooldown period."
+      },
+      "connect": {
+        "title": "How do total fees collected, total FOX staked, emissions pool, and FOX burn amount connect?",
+        "body": "The fees collected by the DAO are in native RUNE. A portion of this RUNE is distributed to FOX stakers as rewards, while another portion is used to buy FOX from the open market and burn it, reducing the overall FOX supply. The total FOX staked influences the distribution of RUNE rewards, as rewards are distributed pro-rata based on the amount of FOX staked. The emissions pool represents the amount of FOX available for staking rewards, and the FOX burn amount is the portion of FOX purchased and burned using the RUNE collected from fees."
       }
     },
     "totals": "rFOX Totals",

src/assets/translations/es/main.json

@@ -865,7 +865,8 @@
       "tradeFailed": "El intercambio fracasó. Activos devueltos menos tarifa de gas",
       "noQuotesAvailable": "No hay cotizaciones disponibles para operar",
       "smartContractWalletNotSupported": "Billetera no soporta contrato inteligente",
-      "unsafeQuote": "Cantidad debajo del mínimo recomendado para este par (%{recommendedMin} %{symbol}). Esto podría provocar fracaso o pérdida de fondos."
+      "unsafeQuote": "Cantidad debajo del mínimo recomendado para este par (%{recommendedMin} %{symbol}). Esto podría provocar fracaso o pérdida de fondos.",
+      "rateLimitExceeded": "Se superó el límite de tarifa, intente más tarde"
     },
     "swappingComingSoonForWallet": "El intercambio por %{walletName} llegará pronto",
     "recentTrades": "Operaciones Recientes",
@@ -1813,7 +1814,8 @@
     "importAccounts": {
       "title": "Importar cuentas %{chainNamespaceDisplayName}",
       "description": "Seleccione las cuentas que desea importar de la lista a continuación.",
-      "import": "Importar"
+      "import": "Importar",
+      "loadMoreDisabled": "Esta billetera no admite múltiples cuentas para esta cadena."
     },
     "ledgerOpenApp": {
       "title": "Abra la app %{appName}",
@@ -2344,8 +2346,8 @@
     "symAfterRuneAlert": "Depósitos simétricos no son posibles después de depósito RUNE asimétrico debido a como funciona la red THOR.",
     "incompletePositionDepositAlert": "Posición incompleta, deposite la cantidad correspondiente de %{asset} para finalizar esta posición.",
     "incompletePositionWithdrawAlert": "Posición incompleta, cancele la posición eliminando el 100% de la liquidez. También puede finalizar la posición a través de \"Agregar liquidez\".",
-    "unsupportedNetworkExplainer": "Su billetera no es compatible con %{network}. Por favor cambie a una billetera que admita esta red.",
-    "unsupportedNetworksExplainer": "Su billetera no admite %{network1} y %{network2}. Por favor cambie a una billetera que admita estas redes.",
+    "unsupportedNetworkExplainer": "Tu billetera no está conectada a %{network}. Conecte esta cadena o cambie a una billetera que admita esta red.",
+    "unsupportedNetworksExplainer": "Tu billetera no está conectada a %{network1} y %{network2}. Conecte esta cadena o cambie a una billetera que admita estas redes.",
     "shareOfPool": "Participación de Pool",
     "assetDepositAmount": "%{asset} Monto de Depósito",
     "totalLiquidity": "Liquidez Total",
@@ -2435,6 +2437,7 @@
     "unstakeAmount": "Monto Unstake",
     "confirmAndStake": "Confirmar y Stake",
     "confirmAndUnstake": "Confirmar y Unstake",
+    "confirmAndClaim": "Confirmar y Reclamar",
     "shapeShiftFee": "Tarifa ShapeShift",
     "approvalFee": "Tarifa de Aprobación",
     "lockupPeriod": "Período de Bloqueo",
@@ -2450,7 +2453,9 @@
       "stakeAmount": "Esta es la cantidad de FOX que Stake",
       "unstakeAmount": "Cantidad de FOX a Unstake",
       "lockupPeriod": "Tiempo que esperará después de Unstake para reclamar tu FOX",
-      "shareOfPool": "Porcentaje de tarifas que ganará."
+      "shareOfPool": "Este es su porcentaje de las tarifas que ganará.",
+      "unstakePendingCooldown": "Reclamo disponible %{cooldownPeriodHuman}",
+      "cooldownComplete": "El tiempo de enfriamiento finalizó %{cooldownPeriodHuman}"
     },
     "stakeSuccess": "Has Stake con éxito %{amount} %{symbol}",
     "stakePending": "Stake %{amount} %{symbol}...",
@@ -2467,6 +2472,13 @@
     "stakeNow": "Stake Ahora",
     "noAddressFound": "Dirección no encontrada",
     "newAddressInfo": "Esto se actualizará para próximo ciclo de recompensas.",
-    "confirmAndUpdateAddress": "Confirme y Actualice Dirección"
+    "confirmAndUpdateAddress": "Confirme y Actualice Dirección",
+    "unstakeFrom": "Unstake para r%{assetSymbol}",
+    "claimPending": "Solicitando retiro",
+    "claimSuccess": "Has reclamado %{amount} %{symbol} con éxito.",
+    "claimReceiveAddress": "Dirección para Reclamar Recompensas",
+    "noClaimsAvailable": "No hay reclamaciones disponibles",
+    "noClaimsAvailableDescription": "No tienes ningún reclamo disponible",
+    "unstakeNow": "Retirar de Staking Ahora"
   }
 }