Skip to content

Commit

Permalink
Merge branch 'develop' into feat_bitcoinjs_patch_max_value
Browse files Browse the repository at this point in the history
  • Loading branch information
kaladinlight committed Nov 15, 2024
2 parents 8749d72 + de246ca commit de654c0
Show file tree
Hide file tree
Showing 22 changed files with 7,015 additions and 4,241 deletions.
2 changes: 2 additions & 0 deletions .env.develop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# feature flags
REACT_APP_FEATURE_LIMIT_ORDERS=true
REACT_APP_FEATURE_PUBLIC_TRADE_ROUTE=false
REACT_APP_FEATURE_CHAINFLIP=true
REACT_APP_FEATURE_CHAINFLIP_DCA=false

# mixpanel
REACT_APP_MIXPANEL_TOKEN=1c1369f6ea23a6404bac41b42817cc4b
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

91 changes: 65 additions & 26 deletions scripts/generateAssetData/color-map.json

Large diffs are not rendered by default.

57 changes: 56 additions & 1 deletion src/assets/translations/de/main.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"common": {
"ascending": "Aufsteigend",
"descending": "Absteigend",
"free": "kostenlos",
"trade": "Handelsumsatz",
"trades": "Handelsumsätze",
Expand Down Expand Up @@ -159,6 +161,10 @@
"import": "Importieren",
"accountsLoading": "Lade Konten",
"noAccounts": "Keine Konten für die ausgewählten Filter.",
"sortBy": "Kategorisiert nach",
"orderBy": "Geordnet nach",
"filterBy": "Gefiltert nach",
"filterAndSort": "Filtern und Sortieren",
"carousel": {
"next": "Weiter",
"prev": "Zuvor",
Expand Down Expand Up @@ -235,6 +241,7 @@
"balance": "Kontostand",
"price": "Preis",
"value": "Wert",
"apy": "APY",
"priceChange": "Preisänderung",
"allocation": "Vermögenskontingent",
"marketCap": "Marktkapitalisierung",
Expand Down Expand Up @@ -865,7 +872,10 @@
"receiveInclFee": "Erhalten (inkl. Gebühren)",
"approvingAsset": "%{symbol} wird genehmigt",
"viewTransaction": "Transaktion anzeigen",
"noQuotesAvailable": "Keine Angebote verfügbar",
"noQuotesAvailableDescription": "Zurzeit wurden keine verfügbaren Angebote gefunden. Versuchen Sie ein anderes Paar auszuwählen.",
"availableSwappers": "Verfügbare Angebote",
"unavailableSwappers": "Nicht verfügbare Swapper",
"unlimited": "Unbegrenzt",
"streamStatus": "Stream Status",
"swapsFailed": "%{failedSwaps} Tausche sind fehlgeschlagen",
Expand Down Expand Up @@ -1003,7 +1013,33 @@
}
},
"limitOrder": {
"heading": "Limit-Auftrag"
"heading": "Limit",
"confirm": "Bestätigen",
"placeOrderPending": "Warten auf Bestätigung",
"placeOrderSuccess": "Erfolg!",
"placeOrderFailed": "Leider ist etwas schiefgegangen.",
"placeOrder": "Bestellung aufgeben",
"viewOrder": "Bestellung anzeigen",
"viewOnChain": "Transaktion in der Kette anzeigen",
"yourOrderHasBeenPlaced": "Ihre Bestellung wurde aufgegeben.",
"limitPrice": "Limitpreis",
"provider": "Anbieter",
"expiration": "Ablauf",
"networkFee": "Netzwerkgebühr",
"confirmInfo": "Die Limit-Order wird möglicherweise nicht genau dann ausgeführt, wenn die On-Chain-Preise den Limit-Preis erreichen.",
"learnMore": "Mehr erfahren",
"previewOrder": "Bestellvorschau",
"youGet": "Sie erhalten",
"whenPriceReaches": "Wenn der Preis erreicht",
"expiry": "Ablauf",
"expiryOption": {
"oneHour": "1 Stunde",
"oneDay": "1 Tag",
"threeDays": "3 Tage",
"sevenDays": "7 Tage",
"twentyEightDays": "28 Tage",
"custom": "Benutzerdefiniert"
}
},
"modals": {
"assetSearch": {
Expand Down Expand Up @@ -2672,5 +2708,24 @@
"noActiveProposals": "Keine aktiven Vorschläge verfügbar",
"noClosedProposals": "Keine abgeschlossenen Vorschläge verfügbar"
}
},
"limitOrders": {
"listTitle": "Limit-Aufträge",
"limitPrice": "Limitpreis",
"expiresIn": "Läuft ab in",
"filled": "Erfüllt",
"openOrders": "Offene Bestellungen",
"orderHistory": "Bestellverlauf",
"status": {
"open": "Offen",
"filled": "Erfüllt",
"cancelled": "Abgesagt",
"expired": "Abgelaufen"
},
"orders": "Bestellungen"
},
"thorFees": {
"title": "Hier von THORSwap?",
"description": "THOR-Inhaber können bis 2024 kostenlos handeln."
}
}
57 changes: 56 additions & 1 deletion src/assets/translations/es/main.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"common": {
"ascending": "Ascendente",
"descending": "Descendente",
"free": "Gratis",
"trade": "Intercambiar",
"trades": "Intercambios",
Expand Down Expand Up @@ -159,6 +161,10 @@
"import": "Importar",
"accountsLoading": "Cargando Cuentas",
"noAccounts": "No hay cuentas para los filtros seleccionados.",
"sortBy": "Ordenar por",
"orderBy": "Agrupar por",
"filterBy": "Filtrar por",
"filterAndSort": "Filtrar y Ordenar",
"carousel": {
"next": "Siguiente",
"prev": "Anterior",
Expand Down Expand Up @@ -235,6 +241,7 @@
"balance": "Balance",
"price": "Precio",
"value": "Valor",
"apy": "APY",
"priceChange": "Cambio de precio",
"allocation": "Asignación",
"marketCap": "Capitalizacion de Mercado",
Expand Down Expand Up @@ -865,7 +872,10 @@
"receiveInclFee": "Recibir (incl. tarifas)",
"approvingAsset": "Aprobando %{symbol}",
"viewTransaction": "Ver Transacción",
"noQuotesAvailable": "No hay Cotizaciones Disponibles",
"noQuotesAvailableDescription": "No se encontraron cotizaciones disponibles en este momento. Intente seleccionar otro par.",
"availableSwappers": "Cotizaciones Disponibles",
"unavailableSwappers": "Intercambiadores No Disponibles",
"unlimited": "Ilimitado",
"streamStatus": "Estado Stream",
"swapsFailed": "%{failedSwaps} intercambios fallidos",
Expand Down Expand Up @@ -1003,7 +1013,33 @@
}
},
"limitOrder": {
"heading": "Límite de Orden"
"heading": "Límite",
"confirm": "Confirmar",
"placeOrderPending": "Esperando Confirmación",
"placeOrderSuccess": "¡Éxito!",
"placeOrderFailed": "Algo Salió Mal",
"placeOrder": "Realizar Pedido",
"viewOrder": "Ver Pedido",
"viewOnChain": "Ver transacción en blockchain",
"yourOrderHasBeenPlaced": "Su orden ha sido realizado.",
"limitPrice": "Precio Límite",
"provider": "Proveedor",
"expiration": "Vencimiento",
"networkFee": "Tarifa de Red",
"confirmInfo": "Es posible que la orden límite no se complete exactamente cuando los precios alcancen el precio límite.",
"learnMore": "Más información",
"previewOrder": "Vista previa del pedido",
"youGet": "Tú Obtienes",
"whenPriceReaches": "Cuando el precio alcance",
"expiry": "Expiración",
"expiryOption": {
"oneHour": "1 hora",
"oneDay": "1 día",
"threeDays": "3 días",
"sevenDays": "7 días",
"twentyEightDays": "28 días",
"custom": "Personalizado"
}
},
"modals": {
"assetSearch": {
Expand Down Expand Up @@ -2672,5 +2708,24 @@
"noActiveProposals": "No hay propuestas activas disponibles",
"noClosedProposals": "No hay propuestas cerradas disponibles"
}
},
"limitOrders": {
"listTitle": "Límite de Orden",
"limitPrice": "Límite de Precio",
"expiresIn": "Caduca en",
"filled": "Completado",
"openOrders": "Órdenes Abiertas",
"orderHistory": "Historial de Órdenes",
"status": {
"open": "Abierta",
"filled": "Completado",
"cancelled": "Cancelado",
"expired": "Caducado"
},
"orders": "Órdenes"
},
"thorFees": {
"title": "¿Eres de THORSwap?",
"description": "Los titulares de THOR intercambian gratis en 2024."
}
}
57 changes: 56 additions & 1 deletion src/assets/translations/fr/main.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"common": {
"ascending": "Croissant",
"descending": "Décroissant",
"free": "Gratuit",
"trade": "Échange",
"trades": "Échanges",
Expand Down Expand Up @@ -159,6 +161,10 @@
"import": "Importer",
"accountsLoading": "Chargement des comptes",
"noAccounts": "Aucun compte pour les filtres sélectionnés.",
"sortBy": "Classer par",
"orderBy": "Trier par",
"filterBy": "Filtrer par",
"filterAndSort": "Filtrer et classer",
"carousel": {
"next": "Suivant",
"prev": "Précédent",
Expand Down Expand Up @@ -235,6 +241,7 @@
"balance": "Solde",
"price": "Prix",
"value": "Valeur",
"apy": "APY",
"priceChange": "Changement de prix",
"allocation": "Répartition",
"marketCap": "Capitalisation du marché",
Expand Down Expand Up @@ -865,7 +872,10 @@
"receiveInclFee": "Recevoir (frais inclus)",
"approvingAsset": "Autoriser les %{symbol}",
"viewTransaction": "Voir la transaction",
"noQuotesAvailable": "Aucun devis disponible",
"noQuotesAvailableDescription": "Aucun devis n'a été trouvé pour le moment. Essayez de sélectionner une autre paire.",
"availableSwappers": "Devis disponibles",
"unavailableSwappers": "Échanges indisponibles",
"unlimited": "Illimitée",
"streamStatus": "Statut du stream",
"swapsFailed": "%{failedSwaps} échange(s) échoué(s)",
Expand Down Expand Up @@ -1003,7 +1013,33 @@
}
},
"limitOrder": {
"heading": "Ordre limité"
"heading": "Limite",
"confirm": "Confirmer",
"placeOrderPending": "En attente de confirmation",
"placeOrderSuccess": "Succès !",
"placeOrderFailed": "Quelque chose s'est mal déroulé",
"placeOrder": "Placer l'ordre",
"viewOrder": "Voir l'ordre",
"viewOnChain": "Voir la transaction sur la chaîne",
"yourOrderHasBeenPlaced": "Votre ordre a été placé.",
"limitPrice": "Prix limite",
"provider": "Fournisseur",
"expiration": "Expiration",
"networkFee": "Frais de réseau",
"confirmInfo": "L'ordre à cours limité peut ne pas rempli exactement lorsque les prix sur la chaîne atteignent le prix limite.",
"learnMore": "En savoir plus",
"previewOrder": "Prévisualiser l'ordre",
"youGet": "Vous recevez",
"whenPriceReaches": "Lorsque le prix atteint",
"expiry": "Expiration",
"expiryOption": {
"oneHour": "1 heure",
"oneDay": "1 jour",
"threeDays": "3 jours",
"sevenDays": "7 jours",
"twentyEightDays": "28 jours",
"custom": "Personnalisée"
}
},
"modals": {
"assetSearch": {
Expand Down Expand Up @@ -2672,5 +2708,24 @@
"noActiveProposals": "Aucune proposition active disponible",
"noClosedProposals": "Aucune proposition fermée disponible"
}
},
"limitOrders": {
"listTitle": "Ordres à cours limité",
"limitPrice": "Prix limite",
"expiresIn": "Expire dans",
"filled": "Rempli",
"openOrders": "Commandes ouvertes",
"orderHistory": "Historique des ordres",
"status": {
"open": "Ouvert",
"filled": "Rempli",
"cancelled": "Annulé",
"expired": "Expiré"
},
"orders": "Ordres"
},
"thorFees": {
"title": "Vous venez de THORSwap ?",
"description": "Les détenteurs de THOR échangent gratuitement durant 2024."
}
}
Loading

0 comments on commit de654c0

Please sign in to comment.