Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/assets/translations/de/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,8 @@
"slowSwapBody": "Dieser Wechsel kann einige Minuten dauern.",
"thorSmartContractWalletUnsupported": "Das THORChain-Netzwerk unterstützt derzeit keine Smart Contract Wallets.",
"intoAssetSymbolBody": "Sie können mit diesem Handel fortfahren, aber der Transaktionsverlauf für den Erhalt von %{assetSymbol} ist vorübergehend nicht verfügbar",
"recipientAddress": "Empfängeradresse",
Comment thread
premiumjibles marked this conversation as resolved.
"changeAddress": "Retourgeld Adresse",
"changeAddressExplainer": "Beim Senden von Kryptowährungen über UTXO-basierte Netzwerke werden alle Restbeträge Ihrer Transaktion an diese Adresse zurückgesendet.",
"customRecipientAddress": "Benutzerdefinierte Empfängeradresse",
"customRecipientAddressDescription": "Geben Sie eine benutzerdefinierte Empfängeradresse für diesen Handel ein",
"thisIsYourCustomRecipientAddress": "Dies ist Ihre benutzerdefinierte Empfängeradresse",
"enterCustomRecipientAddress": "Geben Sie eine benutzerdefinierte Empfängeradresse ein",
"receiveAtLeast": "Erhalten Sie zumindest",
"tooltip": {
"continueSwapping": "Weiter tauschen, um die letzten Details zu erfahren",
Expand Down
11 changes: 5 additions & 6 deletions src/assets/translations/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -752,13 +752,13 @@
"slowSwapBody": "This swap may take a few minutes to complete.",
"thorSmartContractWalletUnsupported": "The THORChain network currently does not support smart contract wallets.",
"intoAssetSymbolBody": "You can proceed with this trade, but transaction history for receiving %{assetSymbol} is temporarily unavailable",
"recipientAddress": "Recipient address",
"receiveAddress": "Receive address",
"changeAddress": "Change address",
"changeAddressExplainer": "When sending cryptocurrencies on UTXO-based networks, any leftover funds from your transaction are sent back to you at this address.",
"customRecipientAddress": "Custom recipient address",
"customRecipientAddressDescription": "Enter a custom recipient address for this trade",
"thisIsYourCustomRecipientAddress": "This is your custom recipient address",
"enterCustomRecipientAddress": "Enter custom recipient address",
"customReceiveAddress": "Custom receive address",
"customReceiveAddressDescription": "Enter a custom receive address for this trade",
"thisIsYourCustomReceiveAddress": "This is your custom receive address",
"enterCustomReceiveAddress": "Enter custom receive address",
"receiveAtLeast": "Receive at least",
"tooltip": {
"continueSwapping": "Continue swapping for final details",
Expand Down Expand Up @@ -830,7 +830,6 @@
"or": "or",
"onChainName": "on %{chainName}",
"unknownGas": "(unknown)",
"receiveAddress": "Receive Address",
"receiveAddressDescription": "No %{chainName} address found from connected wallet. Manually enter an address",
"disableThorTaprootReceive": "We've detected that you're sending to a taproot Bitcoin address. Due to THORChain limitations, receiving BTC to a taproot address is not currently supported. Please enter another address.",
"toContinue": "to continue.",
Expand Down
5 changes: 0 additions & 5 deletions src/assets/translations/es/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,8 @@
"slowSwapBody": "Este intercambio puede tardar unos minutos en completarse.",
"thorSmartContractWalletUnsupported": "Actualmente, la red THORChain no admite carteras de contratos inteligentes.",
"intoAssetSymbolBody": "Puede continuar con este comercio, pero el historial de transacciones para recibir %{assetSymbol} no está disponible temporalmente",
"recipientAddress": "Dirección del receptor",
"changeAddress": "Cambiar dirección",
"changeAddressExplainer": "Al enviar criptomonedas de redes basadas en UTXO, los fondos sobrantes se envían de vuelta a esta dirección.",
"customRecipientAddress": "Dirección de destinatario personalizada",
"customRecipientAddressDescription": "Ingrese una dirección de destinatario personalizada para la transacción",
"thisIsYourCustomRecipientAddress": "Esta es su dirección de destino personalizada",
"enterCustomRecipientAddress": "Ingrese la dirección del destinatario personalizado",
"receiveAtLeast": "Recibe al menos",
"tooltip": {
"continueSwapping": "Continúe intercambiando para obtener detalles finales.",
Expand Down
143 changes: 19 additions & 124 deletions src/assets/translations/fr/main.json

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/assets/translations/ja/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,8 @@
"slowSwapBody": "このスワップが完了するまでに数分かかる場合があります。",
"thorSmartContractWalletUnsupported": "THORChainネットワークは現在、スマートコントラクト ウォレットをサポートしていません。",
"intoAssetSymbolBody": "この取引は続行できますが、%{assetSymbol} を受け取るための取引履歴は一時的に利用できなくなります",
"recipientAddress": "受信者のアドレス",
"changeAddress": "アドレスを変更",
"changeAddressExplainer": "UTXO ベースのネットワークで暗号通貨を送信すると、トランザクションで残った資金はこのアドレスに送り返されます。",
"customRecipientAddress": "カスタム受信者アドレス",
"customRecipientAddressDescription": "この取引のカスタム受信者アドレスを入力してください",
"thisIsYourCustomRecipientAddress": "これはカスタム受信者アドレスです",
"enterCustomRecipientAddress": "カスタム受信者アドレスを入力してください",
"receiveAtLeast": "少なくとも受け取る",
"tooltip": {
"continueSwapping": "最終的な詳細について交換を続ける",
Expand Down
5 changes: 0 additions & 5 deletions src/assets/translations/pt/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,8 @@
"slowSwapBody": "Este swap pode levar alguns minutos para ser concluído.",
"thorSmartContractWalletUnsupported": "A rede THORChain atualmente não oferece suporte a carteiras com contratos inteligentes.",
"intoAssetSymbolBody": "Você pode continuar com esta negociação, mas o histórico de transações para receber %{assetSymbol} está temporariamente indisponível",
"recipientAddress": "Endereço de recebimento",
"changeAddress": "Endereço de troco",
"changeAddressExplainer": "Ao enviar criptomoedas em redes baseadas em UTXO, quaisquer fundos restantes da sua transação são enviados de volta para este endereço.",
"customRecipientAddress": "Endereço de recebimento personalizado",
"customRecipientAddressDescription": "Insira um endereço de recebimento personalizado para este trade",
"thisIsYourCustomRecipientAddress": "Este é o seu endereço personalizado para recebimento",
"enterCustomRecipientAddress": "Insira o endereço do destinatário personalizado",
"receiveAtLeast": "Receba pelo menos",
"tooltip": {
"continueSwapping": "Continue negociando para mais detalhes",
Expand Down
5 changes: 0 additions & 5 deletions src/assets/translations/ru/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,8 @@
"slowSwapBody": "Этот обмен может занять несколько минут.",
"thorSmartContractWalletUnsupported": "В настоящее время сеть THORChain не поддерживает кошельки смарт-контрактов.",
"intoAssetSymbolBody": "Вы можете продолжить эту сделку, но история операций по получению %{assetSymbol} временно недоступна",
"recipientAddress": "Адрес получателя",
"changeAddress": "Изменить адрес",
"changeAddressExplainer": "При отправке криптовалют в сетях на основе UTXO любые оставшиеся средства от вашей транзакции возвращаются вам на этот адрес.",
"customRecipientAddress": "Пользовательский адрес получателя",
"customRecipientAddressDescription": "Введите пользовательский адрес получателя для этой сделки",
"thisIsYourCustomRecipientAddress": "Это ваш пользовательский адрес получателя",
"enterCustomRecipientAddress": "Введите пользовательский адрес получателя",
"receiveAtLeast": "Получите как минимум",
"tooltip": {
"continueSwapping": "Продолжайте обменивать для получения окончательных данных",
Expand Down
5 changes: 0 additions & 5 deletions src/assets/translations/tr/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,8 @@
"slowSwapBody": "Bu takasın tamamlanması birkaç dakika sürebilir.",
"thorSmartContractWalletUnsupported": "THORChain ağı şu anda akıllı sözleşme cüzdanlarını desteklemiyor.",
"intoAssetSymbolBody": "Bu ticarete devam edebilirsiniz, ancak %{assetSymbol} almak için işlem geçmişi geçici olarak kullanılamıyor",
"recipientAddress": "Alıcı adresi",
"changeAddress": "Adresi değiştir",
"changeAddressExplainer": "UTXO tabanlı ağlar üzerinden kripto para gönderirken, işlemden kalan fonlar bu adrese geri gönderilir.",
"customRecipientAddress": "Özel alıcı adresi",
"customRecipientAddressDescription": "Bu takas için özel bir alıcı adresi girin",
"thisIsYourCustomRecipientAddress": "Bu sizin özel alıcı adresinizdir",
"enterCustomRecipientAddress": "Özel alıcı adresini girin",
"receiveAtLeast": "En azdan al",
"tooltip": {
"continueSwapping": "Son detaylar için takasa devam edin",
Expand Down
5 changes: 0 additions & 5 deletions src/assets/translations/uk/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,8 @@
"slowSwapBody": "Цей обмін може зайняти кілька хвилин.",
"thorSmartContractWalletUnsupported": "Наразі мережа THORchain не підтримує гаманці смарт-контрактів.",
"intoAssetSymbolBody": "Ви можете продовжити цю угоду, але історія транзакцій по отриманню %{assetSymbol} тимчасово недоступна",
"recipientAddress": "Адреса одержувача",
"changeAddress": "Змінити адресу",
"changeAddressExplainer": "При відправленні криптовалют у мережах на основі UTXO будь-які залишки коштів від вашої транзакції повертаються вам на цю адресу.",
"customRecipientAddress": "Користувацька адреса одержувача",
"customRecipientAddressDescription": "Введіть спеціальну адресу одержувача для цієї операції",
"thisIsYourCustomRecipientAddress": "Це ваша користувацька адреса одержувача",
"enterCustomRecipientAddress": "Введіть користувацьку адресу одержувача",
"receiveAtLeast": "Отримаєте щонайменше",
"tooltip": {
"continueSwapping": "Продовжуйте обмін для отримання фінальних деталей",
Expand Down
5 changes: 0 additions & 5 deletions src/assets/translations/zh/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,8 @@
"slowSwapBody": "该兑换可能需要几分钟才能完成。",
"thorSmartContractWalletUnsupported": "THORChain 网络目前不支持智能合约钱包。",
"intoAssetSymbolBody": "你可以继续进行此交易,但接收 %{assetSymbol} 的交易历史记录暂时不可用",
"recipientAddress": "接收者地址",
"changeAddress": "退款地址",
"changeAddressExplainer": "在基于 UTXO 的网络上发送加密货币时,交易中未使用的余额将会通过此地址返回给您。",
"customRecipientAddress": "自定义接收者地址",
"customRecipientAddressDescription": "输入此交易的自定义接收者地址",
"thisIsYourCustomRecipientAddress": "这是您的自定义接收者地址",
"enterCustomRecipientAddress": "输入自定义接收者地址",
"receiveAtLeast": "至少收到",
"tooltip": {
"continueSwapping": "继续交换以查看最终详情",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useCallback, useMemo } from 'react'
import { ButtonWalletPredicate } from '@/components/ButtonWalletPredicate/ButtonWalletPredicate'
import { FiatRampAction } from '@/components/Modals/FiatRamps/FiatRampsCommon'
import { RateGasRow } from '@/components/MultiHopTrade/components/RateGasRow'
import { SharedRecipientAddress } from '@/components/MultiHopTrade/components/SharedTradeInput/SharedRecipientAddress'
import { SharedTradeReceiveAddress } from '@/components/MultiHopTrade/components/SharedTradeInput/SharedTradeReceiveAddress'
import { Protocol } from '@/components/MultiHopTrade/components/TradeInput/components/Protocol'
import { useReceiveAddress } from '@/components/MultiHopTrade/hooks/useReceiveAddress'
import { Text } from '@/components/Text'
Expand Down Expand Up @@ -227,7 +227,7 @@ export const FiatRampTradeFooter = ({
width='full'
>
{direction === FiatRampAction.Buy && buyAsset && (
<SharedRecipientAddress
<SharedTradeReceiveAddress
buyAsset={buyAsset}
isWalletReceiveAddressLoading={isWalletReceiveAddressLoading}
walletReceiveAddress={walletReceiveAddress}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { SharedTradeInput } from '../../SharedTradeInput/SharedTradeInput'
import { SharedTradeInputBody } from '../../SharedTradeInput/SharedTradeInputBody'
import { SharedTradeInputFooter } from '../../SharedTradeInput/SharedTradeInputFooter/SharedTradeInputFooter'
import { getCowSwapErrorTranslation, isCowSwapError } from '../helpers'
import { useLimitOrderRecipientAddress } from '../hooks/useLimitOrderRecipientAddress'
import { useLimitOrderReceiveAddress } from '../hooks/useLimitOrderReceiveAddress'
import { LimitOrderRoutePaths } from '../types'
import { CollapsibleLimitOrderList } from './CollapsibleLimitOrderList'
import { LimitOrderBuyAsset } from './LimitOrderBuyAsset'
Expand Down Expand Up @@ -144,8 +144,8 @@ export const LimitOrderInput = ({

const feeUsd = calculateFeeUsd({ inputAmountUsd: bnOrZero(inputSellAmountUsd) })

const { isRecipientAddressEntryActive, renderedRecipientAddress, recipientAddress } =
useLimitOrderRecipientAddress({
const { isReceiveAddressEntryActive, renderedReceiveAddress, receiveAddress } =
useLimitOrderReceiveAddress({
buyAsset,
buyAccountId,
sellAccountId,
Expand Down Expand Up @@ -202,15 +202,15 @@ export const LimitOrderInput = ({
affiliateBps: DEFAULT_FEE_BPS,
sellAccountAddress,
sellAmountCryptoBaseUnit,
recipientAddress,
receiveAddress,
}
}, [
sellAmountCryptoBaseUnit,
sellAsset.assetId,
sellAsset.chainId,
buyAsset.assetId,
sellAccountAddress,
recipientAddress,
receiveAddress,
])

// This fetches the quote only, not the limit order. The quote is used to determine the market
Expand Down Expand Up @@ -391,7 +391,7 @@ export const LimitOrderInput = ({
quoteStatusTranslation: 'limitOrder.errors.nativeSellAssetNotSupported',
isError: true,
}
case !recipientAddress:
case !receiveAddress:
return { quoteStatusTranslation: 'trade.errors.noReceiveAddress', isError: true }
case isCowSwapError(quoteResponseError):
return {
Expand All @@ -414,7 +414,7 @@ export const LimitOrderInput = ({
isDiscoveringAccounts,
isConnected,
quoteResponseError,
recipientAddress,
receiveAddress,
sellAccountId,
sellAsset.assetId,
sellAsset.chainId,
Expand Down Expand Up @@ -559,7 +559,7 @@ export const LimitOrderInput = ({
shouldDisablePreviewButton={
!hasUserEnteredAmount ||
isError ||
isRecipientAddressEntryActive ||
isReceiveAddressEntryActive ||
bnOrZero(marketPriceBuyAsset).isZero() ||
bnOrZero(limitPrice.buyAssetDenomination).isZero()
}
Expand All @@ -572,7 +572,7 @@ export const LimitOrderInput = ({
>
<>
<LimitOrderFooter />
{renderedRecipientAddress}
{renderedReceiveAddress}
</>
</SharedTradeInputFooter>
)
Expand All @@ -588,9 +588,9 @@ export const LimitOrderInput = ({
limitPrice.buyAssetDenomination,
marketPriceBuyAsset,
sellAccountId,
isRecipientAddressEntryActive,
isReceiveAddressEntryActive,
networkFeeUserCurrency,
renderedRecipientAddress,
renderedReceiveAddress,
noExpand,
isLimitOrderQuoteFetching,
])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Asset } from '@shapeshiftoss/types'
import { useCallback, useMemo } from 'react'
import type { Address } from 'viem'

import { SharedRecipientAddress } from '../../SharedTradeInput/SharedRecipientAddress'
import { SharedTradeReceiveAddress } from '../../SharedTradeInput/SharedTradeReceiveAddress'

import { useIsManualReceiveAddressRequired } from '@/components/MultiHopTrade/hooks/useIsManualReceiveAddressRequired'
import { useReceiveAddress } from '@/components/MultiHopTrade/hooks/useReceiveAddress'
Expand All @@ -16,17 +16,17 @@ import {
} from '@/state/slices/limitOrderInputSlice/selectors'
import { useAppSelector } from '@/state/store'

type UseLimitOrderRecipientAddressProps = {
type UseLimitOrderReceiveAddressProps = {
buyAsset: Asset
buyAccountId: string | undefined
sellAccountId: string | undefined
}

export const useLimitOrderRecipientAddress = ({
export const useLimitOrderReceiveAddress = ({
buyAsset,
buyAccountId,
sellAccountId,
}: UseLimitOrderRecipientAddressProps) => {
}: UseLimitOrderReceiveAddressProps) => {
const manualReceiveAddress = useAppSelector(selectManualReceiveAddress)
const isManualReceiveAddressValid = useAppSelector(selectIsManualReceiveAddressValid)
const isManualReceiveAddressEditing = useAppSelector(selectIsManualReceiveAddressEditing)
Expand Down Expand Up @@ -83,7 +83,7 @@ export const useLimitOrderRecipientAddress = ({
isWalletReceiveAddressLoading,
})

const isRecipientAddressEntryActive = useMemo(() => {
const isReceiveAddressEntryActive = useMemo(() => {
return (
isManualReceiveAddressRequired ||
isManualReceiveAddressValidating ||
Expand All @@ -97,9 +97,9 @@ export const useLimitOrderRecipientAddress = ({
isManualReceiveAddressValidating,
])

const renderedRecipientAddress = useMemo(() => {
const renderedReceiveAddress = useMemo(() => {
return (
<SharedRecipientAddress
<SharedTradeReceiveAddress
buyAsset={buyAsset}
isWalletReceiveAddressLoading={isWalletReceiveAddressLoading}
manualReceiveAddress={manualReceiveAddress}
Expand Down Expand Up @@ -128,8 +128,8 @@ export const useLimitOrderRecipientAddress = ({
])

return {
isRecipientAddressEntryActive,
renderedRecipientAddress,
recipientAddress: (manualReceiveAddress ?? walletReceiveAddress) as Address | undefined,
isReceiveAddressEntryActive,
renderedReceiveAddress,
receiveAddress: (manualReceiveAddress ?? walletReceiveAddress) as Address | undefined,
}
}
Loading