diff --git a/apps/wallet-mobile/src/components/ExpandableInfoCard/ExpandableInfoCard.tsx b/apps/wallet-mobile/src/components/ExpandableInfoCard/ExpandableInfoCard.tsx index aa84202c34..a75b0d0e48 100644 --- a/apps/wallet-mobile/src/components/ExpandableInfoCard/ExpandableInfoCard.tsx +++ b/apps/wallet-mobile/src/components/ExpandableInfoCard/ExpandableInfoCard.tsx @@ -83,11 +83,13 @@ export const HiddenInfoWrapper = ({ info, onPress, value, + icon, }: { label: string info?: React.ReactNode onPress?: () => void value: React.ReactNode + icon?: React.ReactNode }) => { return ( @@ -104,7 +106,17 @@ export const HiddenInfoWrapper = ({ )} - {isString(value) ? {value} : value} + {isString(value) ? ( + + {icon !== undefined && icon} + + + + {value} + + ) : ( + value + )} diff --git a/apps/wallet-mobile/src/features/Swap/common/strings.ts b/apps/wallet-mobile/src/features/Swap/common/strings.ts index be2693384f..a36d4a798d 100644 --- a/apps/wallet-mobile/src/features/Swap/common/strings.ts +++ b/apps/wallet-mobile/src/features/Swap/common/strings.ts @@ -9,6 +9,7 @@ export const useStrings = () => { swapTitle: intl.formatMessage(messages.swapTitle), tokenSwap: intl.formatMessage(messages.tokenSwap), orderSwap: intl.formatMessage(messages.orderSwap), + dex: intl.formatMessage(messages.dex), marketButton: intl.formatMessage(messages.marketButton), limitButton: intl.formatMessage(messages.limitButton), swapFrom: intl.formatMessage(messages.swapFrom), @@ -314,6 +315,10 @@ export const messages = defineMessages({ id: 'swap.swapScreen.transactionDisplay', defaultMessage: '!!!Your transactions will be displayed both in the list of transaction and Open swap orders', }, + dex: { + id: 'swap.swapScreen.dex', + defaultMessage: '!!! dex', + }, seeOnExplorer: { id: 'swap.swapScreen.seeOnExplorer', defaultMessage: '!!!see on explorer', diff --git a/apps/wallet-mobile/src/features/Swap/common/useSwapTx.ts b/apps/wallet-mobile/src/features/Swap/common/useSwapTx.ts index 7eee98b77a..5f0d4d1276 100644 --- a/apps/wallet-mobile/src/features/Swap/common/useSwapTx.ts +++ b/apps/wallet-mobile/src/features/Swap/common/useSwapTx.ts @@ -21,9 +21,7 @@ export const useSwapTx = (options?: UseMutationOptions { + const sendTransactions = transactions.filter((tx) => tx.direction === 'SENT') + const receivedTransactions = transactions.filter((tx) => tx.direction === 'RECEIVED') + + const filteredTx = sendTransactions.filter((sentTx) => { + return receivedTransactions.filter((receivedTx) => { + return sentTx.id === receivedTx.inputs[1]?.id?.slice(0, -1) + }) + }) + return filteredTx +} export const CompletedOrders = () => { const strings = useStrings() @@ -31,11 +44,10 @@ export const CompletedOrders = () => { const [hiddenInfoOpenId, setHiddenInfoOpenId] = React.useState(null) const transactionsInfos = useTransactionInfos(wallet) - const {search} = useSearch() - const {numberLocale} = useLanguage() - const intl = useIntl() - const orders = useSwapOrdersByStatusCompleted() + const completeOrders = findCompletedOrderTx(Object.values(transactionsInfos)) + + const intl = useIntl() const {track} = useMetrics() @@ -45,51 +57,34 @@ export const CompletedOrders = () => { }, [track]), ) - const tokenIds = React.useMemo(() => _.uniq(orders.flatMap((o) => [o.from.tokenId, o.to.tokenId])), [orders]) - const tokenInfos = useTokenInfos({wallet, tokenIds}) - const normalizedOrders = React.useMemo( - () => mapOrders(orders, tokenInfos, numberLocale, Object.values(transactionsInfos)), - [orders, tokenInfos, numberLocale, transactionsInfos], - ) - - const filteredOrders = React.useMemo( - () => - normalizedOrders.filter((order) => { - const searchLower = search.toLocaleLowerCase() - return ( - order.assetFromLabel.toLocaleLowerCase().includes(searchLower) || - order.assetToLabel.toLocaleLowerCase().includes(searchLower) - ) - }), - [normalizedOrders, search], - ) + const normalizedOrders = mapCompleteOrders(completeOrders, wallet) return ( <> - {filteredOrders.map((order) => { - const id = `${order.assetFromLabel}-${order.assetToLabel}-${order.date}` + {normalizedOrders?.map((order) => { + const id = order.id const expanded = id === hiddenInfoOpenId - const fromIcon = - const toIcon = + const sellIcon = + const buyIcon = return ( } header={
setHiddenInfoOpenId(hiddenInfoOpenId !== id ? id : null)} - assetFromLabel={order.assetFromLabel} - assetToLabel={order.assetToLabel} - assetFromIcon={fromIcon} - assetToIcon={toIcon} + assetFromLabel={order.sellLabel} + assetToLabel={order.buyLabel} + assetFromIcon={sellIcon} + assetToIcon={buyIcon} expanded={expanded} /> } @@ -97,15 +92,17 @@ export const CompletedOrders = () => { withBoxShadow > ) })} - + ) } @@ -148,7 +145,17 @@ const Header = ({ ) } -const HiddenInfo = ({total, date, txId, txLink}: {total: string; date: string; txId: string; txLink: string}) => { +const HiddenInfo = ({ + total, + txId, + txLink, + provider, +}: { + total: string + txId: string + txLink: string + provider: Swap.PoolProvider +}) => { const shortenedTxId = `${txId.substring(0, 9)}...${txId.substring(txId.length - 4, txId.length)}` const strings = useStrings() return ( @@ -160,29 +167,41 @@ const HiddenInfo = ({total, date, txId, txLink}: {total: string; date: string; t }, { - label: strings.listOrdersTimeCreated, - value: date, + label: strings.dex, + value: capitalize(provider), + icon: , }, { label: strings.listOrdersTxId, value: , }, ].map((item) => ( - + ))} ) } -const MainInfo = ({tokenPrice, tokenAmount}: {tokenPrice: string; tokenAmount: string}) => { +const MainInfo = ({ + tokenPrice, + tokenAmount, + sellLabel, + txTimeCreated, +}: { + tokenPrice: string + sellLabel: string + tokenAmount: string + txTimeCreated: string +}) => { const strings = useStrings() return ( {[ - {label: strings.listOrdersSheetAssetPrice, value: tokenPrice}, + {label: strings.listOrdersSheetAssetPrice, value: `${tokenPrice} ${sellLabel}`}, {label: strings.listOrdersSheetAssetAmount, value: tokenAmount}, + {label: strings.listOrdersTimeCreated, value: txTimeCreated}, ].map((item, index) => ( - + ))} ) @@ -215,6 +234,7 @@ const styles = StyleSheet.create({ flex: 1, backgroundColor: COLORS.WHITE, paddingTop: 10, + paddingHorizontal: 16, }, flex: { flex: 1, diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx index 2059700aaf..2de27c4ede 100644 --- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx +++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx @@ -35,7 +35,7 @@ import {useNavigateTo} from '../../../common/navigation' import {PoolIcon} from '../../../common/PoolIcon/PoolIcon' import {useStrings} from '../../../common/strings' import {convertBech32ToHex, getMuesliSwapTransactionAndSigners, useCancellationOrderFee} from './helpers' -import {mapOrders, MappedOrder} from './mapOrders' +import {mapOpenOrders, MappedOpenOrder} from './mapOrders' export const OpenOrders = () => { const [bottomSheetState, setBottomSheetState] = React.useState({ @@ -58,7 +58,7 @@ export const OpenOrders = () => { const transactionsInfos = useTransactionInfos(wallet) const tokenInfos = useTokenInfos({wallet, tokenIds}) const normalizedOrders = React.useMemo( - () => mapOrders(orders, tokenInfos, numberLocale, Object.values(transactionsInfos)), + () => mapOpenOrders(orders, tokenInfos, numberLocale, Object.values(transactionsInfos)), [orders, tokenInfos, numberLocale, transactionsInfos], ) @@ -85,7 +85,7 @@ export const OpenOrders = () => { }, [track]), ) - const trackCancellationSubmitted = (order: MappedOrder) => { + const trackCancellationSubmitted = (order: MappedOpenOrder) => { track.swapCancelationSubmitted({ from_amount: Number(order.from.quantity) ?? 0, to_amount: Number(order.to.quantity) ?? 0, @@ -166,7 +166,7 @@ export const OpenOrders = () => { return {txBase64: hexBase64} } - const openBottomSheet = async (order: MappedOrder) => { + const openBottomSheet = async (order: MappedOpenOrder) => { if (order.owner === undefined || order.utxo === undefined) return const { utxo, diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/mapOrders.ts b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/mapOrders.ts index f008a57f4e..8028ad922f 100644 --- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/mapOrders.ts +++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/mapOrders.ts @@ -4,12 +4,28 @@ import {Balance, Swap} from '@yoroi/types' import BigNumber from 'bignumber.js' import {NumberLocale} from '../../../../../i18n/languages' +import {NETWORK_CONFIG} from '../../../../../yoroi-wallets/cardano/constants/mainnet/constants' +import {YoroiWallet} from '../../../../../yoroi-wallets/cardano/types' +import {useTokenInfo} from '../../../../../yoroi-wallets/hooks' import {TransactionInfo} from '../../../../../yoroi-wallets/types' -import {Quantities} from '../../../../../yoroi-wallets/utils' +import {asQuantity, Quantities} from '../../../../../yoroi-wallets/utils' const MAX_DECIMALS = 10 -export type MappedOrder = { +export type MappedCompleteOrder = { + id: string + provider: Swap.PoolProvider + date: string + tokenPrice: string + sellLabel: string + sellQuantity: string + sellTokenId: string + buyLabel: string + buyQuantity: string + buyTokenId: string + txLink: string +} +export type MappedOpenOrder = { owner: string | undefined utxo: string | undefined tokenPrice: string @@ -30,12 +46,65 @@ export type MappedOrder = { to: Balance.Amount } -export const mapOrders = ( +export const mapCompleteOrders = (orders: TransactionInfo[], wallet: YoroiWallet): Array => { + if (orders.length === 0) return [] + const result = orders + .map((order) => { + let metadata: { + buyTokenId: string + sellTokenId: string + sellQuantity: Balance.Quantity + buyQuantity: Balance.Quantity + provider: string + } + + try { + metadata = JSON.parse(order.metadata) + + const buyTokenInfo = useTokenInfo({wallet, tokenId: metadata.buyTokenId}) + const sellTokenInfo = useTokenInfo({wallet, tokenId: metadata.sellTokenId}) + + const buyLabel = buyTokenInfo?.ticker ?? buyTokenInfo?.name ?? '-' + const sellLabel = sellTokenInfo?.ticker ?? sellTokenInfo?.name ?? '-' + + const txLink = NETWORK_CONFIG.EXPLORER_URL_FOR_TX(order.id) + const tokenPrice = asQuantity(new BigNumber(metadata.sellQuantity).dividedBy(metadata.buyQuantity).toString()) + + const formattedBuyQuantity = Quantities.format(metadata.buyQuantity, buyTokenInfo.decimals ?? 0) + const formattedSellQuantity = Quantities.format(metadata.sellQuantity, sellTokenInfo.decimals ?? 0) + + return { + id: order.id, + provider: metadata.provider, + date: order?.lastUpdatedAt, + sellLabel, + sellQuantity: formattedSellQuantity, + sellTokenId: sellTokenInfo.id, + buyLabel, + buyQuantity: formattedBuyQuantity, + buyTokenId: buyTokenInfo.id, + txLink, + tokenPrice: Quantities.format(tokenPrice, sellTokenInfo.decimals ?? 0, MAX_DECIMALS), + } + } catch (error) { + console.error('Error parsing JSON: ', error) + } + + return [] + }) + .filter((order): order is MappedCompleteOrder => { + return order !== undefined && Object.keys(order).length > 0 + }) + + return result +} + +export const mapOpenOrders = ( orders: Array, tokenInfos: Balance.TokenInfo[], numberLocale: NumberLocale, transactionInfos: TransactionInfo[], -): Array => { +): Array => { if (orders.length === 0) return [] return orders.map((order: Swap.OpenOrder | Swap.CompletedOrder) => { @@ -44,7 +113,7 @@ export const mapOrders = ( const txIdComplete = 'txHash' in order ? order.txHash : undefined const txId = txIdComplete ?? txIdOpen ?? '' const id = `${from.tokenId}-${to.tokenId}-${txId}` - const txLink = `https://cardanoscan.io/transaction/${txId}` // FIX: this should come from the wallet (preprod/mainnet) explorers + const txLink = NETWORK_CONFIG.EXPLORER_URL_FOR_TX(txId) const txInfo = transactionInfos.find((tx) => tx.id === txId) const submittedAt = txInfo?.submittedAt diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json index 6fc1bd0229..be8d6d73e8 100644 --- a/apps/wallet-mobile/src/i18n/locales/en-US.json +++ b/apps/wallet-mobile/src/i18n/locales/en-US.json @@ -122,6 +122,7 @@ "nft.navigation.search": "Search NFT", "swap.swapScreen.swapTitle": "Swap", "swap.swapScreen.batcherFee": "Batcher Fee", + "swap.swapScreen.dex": "dex", "swap.swapScreen.tokenSwapTab": "Token swap", "swap.swapScreen.ordersSwapTab": "Orders", "swap.swapScreen.openOrders": "Open orders", diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/processTransactions/processTransactions.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/processTransactions/processTransactions.ts index 657985cd37..298cb2792f 100644 --- a/apps/wallet-mobile/src/yoroi-wallets/cardano/processTransactions/processTransactions.ts +++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/processTransactions/processTransactions.ts @@ -90,8 +90,8 @@ export const processTxHistoryData = ( memo: string | null, defaultAsset: DefaultAsset, ): TransactionInfo => { + const metadata = tx.metadata ? tx.metadata[0]?.map_json.msg?.join('') : null const _strToDefaultMultiAsset = (amount: string) => strToDefaultMultiAsset(amount, networkId, defaultAsset) - // collateral const collateral = tx.collateralInputs || [] const isNonNativeScriptExecution = Number(tx.scriptSize) > 0 || collateral.length > 0 @@ -245,15 +245,17 @@ export const processTxHistoryData = ( return { id: tx.id, - inputs: tx.inputs.map(({address, assets, amount}) => ({ + inputs: tx.inputs.map(({address, assets, amount, id}) => ({ address, amount, assets: assets.map(_remoteAssetAsTokenEntry), + id, })), - outputs: tx.outputs.map(({address, assets, amount}) => ({ + outputs: tx.outputs.map(({address, assets, amount, id}) => ({ address, amount, assets: assets.map(_remoteAssetAsTokenEntry), + id, })), amount: amount.asArray(), fee: fee != null ? fee.asArray() : null, @@ -267,5 +269,6 @@ export const processTxHistoryData = ( tokens, blockNumber: tx.blockNum ?? 0, memo, + metadata: metadata ?? null, } } diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/transactionManager/transactionManager.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/transactionManager/transactionManager.ts index 11f7595d3c..f4cb1a4d93 100644 --- a/apps/wallet-mobile/src/yoroi-wallets/cardano/transactionManager/transactionManager.ts +++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/transactionManager/transactionManager.ts @@ -332,6 +332,7 @@ export function toCachedTx(tx: RawTransaction): Transaction { fee: tx.fee ?? undefined, status: tx.tx_state, inputs: tx.inputs.map((input) => ({ + id: input.id, address: input.address, amount: input.amount, assets: (input.assets ?? []).map((asset) => ({ @@ -374,6 +375,7 @@ export function toCachedTx(tx: RawTransaction): Transaction { })), })), memo: null, + metadata: tx.metadata, } } diff --git a/apps/wallet-mobile/src/yoroi-wallets/types/other.ts b/apps/wallet-mobile/src/yoroi-wallets/types/other.ts index 4150e42431..259754a3e7 100644 --- a/apps/wallet-mobile/src/yoroi-wallets/types/other.ts +++ b/apps/wallet-mobile/src/yoroi-wallets/types/other.ts @@ -248,6 +248,7 @@ export type RemoteTxInfo = { // hex amount: string }> + readonly metadata: TxMetadata readonly certificates: Array readonly valid_contract?: boolean readonly script_size?: number @@ -397,6 +398,9 @@ export const TRANSACTION_STATUS = { } export type TransactionStatus = (typeof TRANSACTION_STATUS)[keyof typeof TRANSACTION_STATUS] +export type TxMetadata = Array<{label: string; map_json: {msg: Array}}> +export type TxMetadataInfo = any + export type TransactionInfo = { id: string inputs: Array @@ -413,12 +417,14 @@ export type TransactionInfo = { tokens: Record blockNumber: number memo: null | string + metadata: TxMetadataInfo } export type IOData = { address: string assets: Array amount: string + id: string } export type TransactionAssurance = 'PENDING' | 'FAILED' | 'LOW' | 'MEDIUM' | 'HIGH' @@ -475,6 +481,7 @@ export type Transaction = { assets: Array }> memo: string | null + metadata: TxMetadata } export type CommonMetadata = { diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json index 01348d4d1c..4b8a454060 100644 --- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json +++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Incorrect password.", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 117, + "line": 118, "column": 24, - "index": 7321 + "index": 7364 }, "end": { - "line": 120, + "line": 121, "column": 3, - "index": 7430 + "index": 7473 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!Swap", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 121, + "line": 122, "column": 13, - "index": 7445 + "index": 7488 }, "end": { - "line": 124, + "line": 125, "column": 3, - "index": 7518 + "index": 7561 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!Token swap", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 125, + "line": 126, "column": 13, - "index": 7533 + "index": 7576 }, "end": { - "line": 128, + "line": 129, "column": 3, - "index": 7615 + "index": 7658 } }, { @@ -49,14 +49,14 @@ "defaultMessage": "!!!Orders", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 129, + "line": 130, "column": 13, - "index": 7630 + "index": 7673 }, "end": { - "line": 132, + "line": 133, "column": 3, - "index": 7709 + "index": 7752 } }, { @@ -64,14 +64,14 @@ "defaultMessage": "!!!Market Button", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 133, + "line": 134, "column": 16, - "index": 7727 + "index": 7770 }, "end": { - "line": 136, + "line": 137, "column": 3, - "index": 7812 + "index": 7855 } }, { @@ -79,14 +79,14 @@ "defaultMessage": "!!!Limit", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 137, + "line": 138, "column": 15, - "index": 7829 + "index": 7872 }, "end": { - "line": 140, + "line": 141, "column": 3, - "index": 7905 + "index": 7948 } }, { @@ -94,14 +94,14 @@ "defaultMessage": "!!!Swap from", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 141, + "line": 142, "column": 12, - "index": 7919 + "index": 7962 }, "end": { - "line": 144, + "line": 145, "column": 3, - "index": 7996 + "index": 8039 } }, { @@ -109,14 +109,14 @@ "defaultMessage": "!!!Swap to", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 145, + "line": 146, "column": 10, - "index": 8008 + "index": 8051 }, "end": { - "line": 148, + "line": 149, "column": 3, - "index": 8081 + "index": 8124 } }, { @@ -124,14 +124,14 @@ "defaultMessage": "!!!Current Balance", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 149, + "line": 150, "column": 18, - "index": 8101 + "index": 8144 }, "end": { - "line": 152, + "line": 153, "column": 3, - "index": 8190 + "index": 8233 } }, { @@ -139,14 +139,14 @@ "defaultMessage": "!!!Balance", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 153, + "line": 154, "column": 11, - "index": 8203 + "index": 8246 }, "end": { - "line": 156, + "line": 157, "column": 3, - "index": 8277 + "index": 8320 } }, { @@ -154,14 +154,14 @@ "defaultMessage": "!!!Select Token", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 157, + "line": 158, "column": 15, - "index": 8294 + "index": 8337 }, "end": { - "line": 160, + "line": 161, "column": 3, - "index": 8377 + "index": 8420 } }, { @@ -169,14 +169,14 @@ "defaultMessage": "!!!Market Price", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 161, + "line": 162, "column": 15, - "index": 8394 + "index": 8437 }, "end": { - "line": 164, + "line": 165, "column": 3, - "index": 8477 + "index": 8520 } }, { @@ -184,14 +184,14 @@ "defaultMessage": "!!!Limit Price", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 165, + "line": 166, "column": 14, - "index": 8493 + "index": 8536 }, "end": { - "line": 168, + "line": 169, "column": 3, - "index": 8574 + "index": 8617 } }, { @@ -199,14 +199,14 @@ "defaultMessage": "!!!Slippage Tolerance", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 169, + "line": 170, "column": 21, - "index": 8597 + "index": 8640 }, "end": { - "line": 172, + "line": 173, "column": 3, - "index": 8692 + "index": 8735 } }, { @@ -214,14 +214,14 @@ "defaultMessage": "!!!Slippage must be a number between 0 and 100 and have up to 1 decimal", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 173, + "line": 174, "column": 26, - "index": 8720 + "index": 8763 }, "end": { - "line": 176, + "line": 177, "column": 3, - "index": 8870 + "index": 8913 } }, { @@ -229,14 +229,14 @@ "defaultMessage": "!!!Slippage Tolerance Info", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 177, + "line": 178, "column": 25, - "index": 8897 + "index": 8940 }, "end": { - "line": 180, + "line": 181, "column": 3, - "index": 9001 + "index": 9044 } }, { @@ -244,14 +244,14 @@ "defaultMessage": "!!!Verified by {pool}", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 181, + "line": 182, "column": 14, - "index": 9017 + "index": 9060 }, "end": { - "line": 184, + "line": 185, "column": 3, - "index": 9105 + "index": 9148 } }, { @@ -259,14 +259,14 @@ "defaultMessage": "!!!This asset is in my portfolio", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 185, + "line": 186, "column": 12, - "index": 9119 + "index": 9162 }, "end": { - "line": 188, + "line": 189, "column": 3, - "index": 9216 + "index": 9259 } }, { @@ -274,14 +274,14 @@ "defaultMessage": "!!!Default Slippage Tolerance", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 189, + "line": 190, "column": 19, - "index": 9237 + "index": 9280 }, "end": { - "line": 192, + "line": 193, "column": 3, - "index": 9338 + "index": 9381 } }, { @@ -289,14 +289,14 @@ "defaultMessage": "!!!Slippage tolerance is set as a percentage of the total swap value.", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 193, + "line": 194, "column": 16, - "index": 9356 + "index": 9399 }, "end": { - "line": 196, + "line": 197, "column": 3, - "index": 9494 + "index": 9537 } }, { @@ -304,14 +304,14 @@ "defaultMessage": "!!!(auto)", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 197, + "line": 198, "column": 12, - "index": 9508 + "index": 9551 }, "end": { - "line": 200, + "line": 201, "column": 3, - "index": 9582 + "index": 9625 } }, { @@ -319,14 +319,14 @@ "defaultMessage": "!!!Min-ADA is the minimum ADA amount required to be contained when holding or sending Cardano native tokens.", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 201, + "line": 202, "column": 14, - "index": 9598 + "index": 9641 }, "end": { - "line": 205, + "line": 206, "column": 3, - "index": 9779 + "index": 9822 } }, { @@ -334,14 +334,14 @@ "defaultMessage": "!!!Min ADA", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 206, + "line": 207, "column": 19, - "index": 9800 + "index": 9843 }, "end": { - "line": 209, + "line": 210, "column": 3, - "index": 9882 + "index": 9925 } }, { @@ -349,14 +349,14 @@ "defaultMessage": "!!!Swap fees include the following:\n • Matchmaker Fee\n • Frontend Fee\n • Liquidity Provider Fee", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 210, + "line": 211, "column": 12, - "index": 9896 + "index": 9939 }, "end": { - "line": 213, + "line": 214, "column": 3, - "index": 10059 + "index": 10102 } }, { @@ -364,14 +364,14 @@ "defaultMessage": "!!!Fees", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 214, + "line": 215, "column": 17, - "index": 10078 + "index": 10121 }, "end": { - "line": 217, + "line": 218, "column": 3, - "index": 10155 + "index": 10198 } }, { @@ -379,14 +379,14 @@ "defaultMessage": "!!!Minimum amount of tokens you can get because of the slippage tolerance.", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 218, + "line": 219, "column": 19, - "index": 10176 + "index": 10219 }, "end": { - "line": 221, + "line": 222, "column": 3, - "index": 10322 + "index": 10365 } }, { @@ -394,14 +394,14 @@ "defaultMessage": "!!!Min Received", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 222, + "line": 223, "column": 24, - "index": 10348 + "index": 10391 }, "end": { - "line": 225, + "line": 226, "column": 3, - "index": 10440 + "index": 10483 } }, { @@ -409,14 +409,14 @@ "defaultMessage": "!!!Enter a value from 0% to 100%. You can also enter up to 1 decimal", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 226, + "line": 227, "column": 17, - "index": 10459 + "index": 10502 }, "end": { - "line": 229, + "line": 230, "column": 3, - "index": 10597 + "index": 10640 } }, { @@ -424,14 +424,14 @@ "defaultMessage": "!!!{pool} verification", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 230, + "line": 231, "column": 20, - "index": 10619 + "index": 10662 }, "end": { - "line": 233, + "line": 234, "column": 3, - "index": 10714 + "index": 10757 } }, { @@ -439,14 +439,14 @@ "defaultMessage": "!!!Volume, 24h", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 234, + "line": 235, "column": 10, - "index": 10726 + "index": 10769 }, "end": { - "line": 237, + "line": 238, "column": 3, - "index": 10803 + "index": 10846 } }, { @@ -454,14 +454,14 @@ "defaultMessage": "!!!Cardano projects that list their own tokens can apply for an additional {pool} verification. This verification is a manual validation that {pool} team performs with the help of Cardano Foundation.", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 238, + "line": 239, "column": 24, - "index": 10829 + "index": 10872 }, "end": { - "line": 242, + "line": 243, "column": 3, - "index": 11111 + "index": 11154 } }, { @@ -469,14 +469,14 @@ "defaultMessage": "!!! Price", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 243, + "line": 244, "column": 9, - "index": 11122 + "index": 11165 }, "end": { - "line": 246, + "line": 247, "column": 3, - "index": 11184 + "index": 11227 } }, { @@ -484,14 +484,14 @@ "defaultMessage": "!!!No assets found for this pair", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 247, + "line": 248, "column": 17, - "index": 11203 + "index": 11246 }, "end": { - "line": 250, + "line": 251, "column": 3, - "index": 11305 + "index": 11348 } }, { @@ -499,14 +499,14 @@ "defaultMessage": "!!!No assets found for \"{search}\"", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 251, + "line": 252, "column": 20, - "index": 11327 + "index": 11370 }, "end": { - "line": 254, + "line": 255, "column": 3, - "index": 11433 + "index": 11476 } }, { @@ -514,14 +514,14 @@ "defaultMessage": "!!!Each verified tokens gets", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 255, + "line": 256, "column": 21, - "index": 11456 + "index": 11499 }, "end": { - "line": 258, + "line": 259, "column": 3, - "index": 11558 + "index": 11601 } }, { @@ -529,14 +529,14 @@ "defaultMessage": "!!!verified badge", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 259, + "line": 260, "column": 17, - "index": 11577 + "index": 11620 }, "end": { - "line": 262, + "line": 263, "column": 3, - "index": 11664 + "index": 11707 } }, { @@ -544,14 +544,14 @@ "defaultMessage": "!!!Open orders", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 263, + "line": 264, "column": 14, - "index": 11680 + "index": 11723 }, "end": { - "line": 266, + "line": 267, "column": 3, - "index": 11761 + "index": 11804 } }, { @@ -559,14 +559,14 @@ "defaultMessage": "!!!Completed orders", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 267, + "line": 268, "column": 19, - "index": 11782 + "index": 11825 }, "end": { - "line": 270, + "line": 271, "column": 3, - "index": 11873 + "index": 11916 } }, { @@ -574,14 +574,14 @@ "defaultMessage": "!!!TVL", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 271, + "line": 272, "column": 7, - "index": 11882 + "index": 11925 }, "end": { - "line": 274, + "line": 275, "column": 3, - "index": 11948 + "index": 11991 } }, { @@ -589,14 +589,14 @@ "defaultMessage": "!!! Pool Fee", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 275, + "line": 276, "column": 11, - "index": 11961 + "index": 12004 }, "end": { - "line": 278, + "line": 279, "column": 3, - "index": 12037 + "index": 12080 } }, { @@ -604,14 +604,14 @@ "defaultMessage": "!!! Batcher Fee", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 279, + "line": 280, "column": 14, - "index": 12053 + "index": 12096 }, "end": { - "line": 282, + "line": 283, "column": 3, - "index": 12135 + "index": 12178 } }, { @@ -619,14 +619,14 @@ "defaultMessage": "!!!Limit price", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 283, + "line": 284, "column": 26, - "index": 12163 + "index": 12206 }, "end": { - "line": 286, + "line": 287, "column": 3, - "index": 12256 + "index": 12299 } }, { @@ -634,14 +634,14 @@ "defaultMessage": "!!!Are you sure you want to proceed this order with the limit price that is 10% or more higher than the\nmarket price?", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 287, + "line": 288, "column": 32, - "index": 12290 + "index": 12333 }, "end": { - "line": 292, + "line": 293, "column": 3, - "index": 12510 + "index": 12553 } }, { @@ -649,14 +649,14 @@ "defaultMessage": "!!!Your limit price", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 293, + "line": 294, "column": 30, - "index": 12542 + "index": 12585 }, "end": { - "line": 296, + "line": 297, "column": 3, - "index": 12644 + "index": 12687 } }, { @@ -664,14 +664,14 @@ "defaultMessage": "!!!Market price", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 297, + "line": 298, "column": 32, - "index": 12678 + "index": 12721 }, "end": { - "line": 300, + "line": 301, "column": 3, - "index": 12778 + "index": 12821 } }, { @@ -679,14 +679,14 @@ "defaultMessage": "!!!Back", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 301, + "line": 302, "column": 25, - "index": 12805 + "index": 12848 }, "end": { - "line": 304, + "line": 305, "column": 3, - "index": 12890 + "index": 12933 } }, { @@ -694,14 +694,14 @@ "defaultMessage": "!!!Swap", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 305, + "line": 306, "column": 28, - "index": 12920 + "index": 12963 }, "end": { - "line": 308, + "line": 309, "column": 3, - "index": 13008 + "index": 13051 } }, { @@ -709,14 +709,14 @@ "defaultMessage": "!!!Transaction signed", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 309, + "line": 310, "column": 21, - "index": 13031 + "index": 13074 }, "end": { - "line": 312, + "line": 313, "column": 3, - "index": 13126 + "index": 13169 } }, { @@ -724,14 +724,29 @@ "defaultMessage": "!!!Your transactions will be displayed both in the list of transaction and Open swap orders", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 313, + "line": 314, "column": 22, - "index": 13150 + "index": 13193 }, "end": { - "line": 316, + "line": 317, "column": 3, - "index": 13316 + "index": 13359 + } + }, + { + "id": "swap.swapScreen.dex", + "defaultMessage": "!!! dex", + "file": "src/features/Swap/common/strings.ts", + "start": { + "line": 318, + "column": 7, + "index": 13368 + }, + "end": { + "line": 321, + "column": 3, + "index": 13435 } }, { @@ -739,14 +754,14 @@ "defaultMessage": "!!!see on explorer", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 317, + "line": 322, "column": 17, - "index": 13335 + "index": 13454 }, "end": { - "line": 320, + "line": 325, "column": 3, - "index": 13423 + "index": 13542 } }, { @@ -754,14 +769,14 @@ "defaultMessage": "!!!GO to Orders", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 321, + "line": 326, "column": 14, - "index": 13439 + "index": 13558 }, "end": { - "line": 324, + "line": 329, "column": 3, - "index": 13521 + "index": 13640 } }, { @@ -769,14 +784,14 @@ "defaultMessage": "!!!Asset", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 325, + "line": 330, "column": 9, - "index": 13532 + "index": 13651 }, "end": { - "line": 328, + "line": 333, "column": 3, - "index": 13605 + "index": 13724 } }, { @@ -784,14 +799,14 @@ "defaultMessage": "!!!Clear", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 329, + "line": 334, "column": 9, - "index": 13616 + "index": 13735 }, "end": { - "line": 332, + "line": 337, "column": 3, - "index": 13677 + "index": 13796 } }, { @@ -799,14 +814,14 @@ "defaultMessage": "!!!Sign transaction", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 333, + "line": 338, "column": 19, - "index": 13698 + "index": 13817 }, "end": { - "line": 336, + "line": 341, "column": 3, - "index": 13780 + "index": 13899 } }, { @@ -814,14 +829,14 @@ "defaultMessage": "!!!Spending Password", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 337, + "line": 342, "column": 20, - "index": 13802 + "index": 13921 }, "end": { - "line": 340, + "line": 345, "column": 3, - "index": 13886 + "index": 14005 } }, { @@ -829,14 +844,14 @@ "defaultMessage": "!!!Enter spending password to sign this transaction", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 341, + "line": 346, "column": 25, - "index": 13913 + "index": 14032 }, "end": { - "line": 344, + "line": 349, "column": 3, - "index": 14033 + "index": 14152 } }, { @@ -844,14 +859,14 @@ "defaultMessage": "!!!Sign", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 345, + "line": 350, "column": 8, - "index": 14043 + "index": 14162 }, "end": { - "line": 348, + "line": 353, "column": 3, - "index": 14102 + "index": 14221 } }, { @@ -859,14 +874,14 @@ "defaultMessage": "!!!Swap", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 349, + "line": 354, "column": 14, - "index": 14118 + "index": 14237 }, "end": { - "line": 352, + "line": 357, "column": 3, - "index": 14177 + "index": 14296 } }, { @@ -874,14 +889,14 @@ "defaultMessage": "!!!completed orders", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 353, + "line": 358, "column": 23, - "index": 14202 + "index": 14321 }, "end": { - "line": 356, + "line": 361, "column": 3, - "index": 14287 + "index": 14406 } }, { @@ -889,14 +904,14 @@ "defaultMessage": "!!!open orders", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 357, + "line": 362, "column": 18, - "index": 14307 + "index": 14426 }, "end": { - "line": 360, + "line": 365, "column": 3, - "index": 14382 + "index": 14501 } }, { @@ -904,14 +919,14 @@ "defaultMessage": "!!!Confirm order cancelation", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 361, + "line": 366, "column": 24, - "index": 14408 + "index": 14527 }, "end": { - "line": 364, + "line": 369, "column": 3, - "index": 14504 + "index": 14623 } }, { @@ -919,14 +934,14 @@ "defaultMessage": "!!!Cancel order", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 365, + "line": 370, "column": 29, - "index": 14535 + "index": 14654 }, "end": { - "line": 368, + "line": 373, "column": 3, - "index": 14622 + "index": 14741 } }, { @@ -934,14 +949,14 @@ "defaultMessage": "!!!Are you sure you want to cancel this order?", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 369, + "line": 374, "column": 31, - "index": 14655 + "index": 14774 }, "end": { - "line": 372, + "line": 377, "column": 3, - "index": 14776 + "index": 14895 } }, { @@ -949,14 +964,14 @@ "defaultMessage": "!!!Learn more about swap orders in Yoroi", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 373, + "line": 378, "column": 23, - "index": 14801 + "index": 14920 }, "end": { - "line": 376, + "line": 381, "column": 3, - "index": 14908 + "index": 15027 } }, { @@ -964,14 +979,14 @@ "defaultMessage": "!!!Asset price", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 377, + "line": 382, "column": 29, - "index": 14939 + "index": 15058 }, "end": { - "line": 380, + "line": 385, "column": 3, - "index": 15026 + "index": 15145 } }, { @@ -979,14 +994,14 @@ "defaultMessage": "!!!Asset amount", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 381, + "line": 386, "column": 30, - "index": 15058 + "index": 15177 }, "end": { - "line": 384, + "line": 389, "column": 3, - "index": 15147 + "index": 15266 } }, { @@ -994,14 +1009,14 @@ "defaultMessage": "!!!Total returned", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 385, + "line": 390, "column": 32, - "index": 15181 + "index": 15300 }, "end": { - "line": 388, + "line": 393, "column": 3, - "index": 15274 + "index": 15393 } }, { @@ -1009,14 +1024,14 @@ "defaultMessage": "!!!Cancellation Fee", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 389, + "line": 394, "column": 34, - "index": 15310 + "index": 15429 }, "end": { - "line": 392, + "line": 397, "column": 3, - "index": 15407 + "index": 15526 } }, { @@ -1024,14 +1039,14 @@ "defaultMessage": "!!!Confirm", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 393, + "line": 398, "column": 26, - "index": 15435 + "index": 15554 }, "end": { - "line": 396, + "line": 401, "column": 3, - "index": 15515 + "index": 15634 } }, { @@ -1039,14 +1054,14 @@ "defaultMessage": "!!!Back", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 397, + "line": 402, "column": 23, - "index": 15540 + "index": 15659 }, "end": { - "line": 400, + "line": 405, "column": 3, - "index": 15614 + "index": 15733 } }, { @@ -1054,14 +1069,14 @@ "defaultMessage": "!!!Total", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 401, + "line": 406, "column": 19, - "index": 15635 + "index": 15754 }, "end": { - "line": 404, + "line": 409, "column": 3, - "index": 15705 + "index": 15824 } }, { @@ -1069,14 +1084,14 @@ "defaultMessage": "!!!Liquidity Pool", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 405, + "line": 410, "column": 27, - "index": 15734 + "index": 15853 }, "end": { - "line": 408, + "line": 413, "column": 3, - "index": 15821 + "index": 15940 } }, { @@ -1084,14 +1099,14 @@ "defaultMessage": "!!!Time Created", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 409, + "line": 414, "column": 25, - "index": 15848 + "index": 15967 }, "end": { - "line": 412, + "line": 417, "column": 3, - "index": 15931 + "index": 16050 } }, { @@ -1099,14 +1114,14 @@ "defaultMessage": "!!!Transaction ID", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 413, + "line": 418, "column": 18, - "index": 15951 + "index": 16070 }, "end": { - "line": 416, + "line": 421, "column": 3, - "index": 16029 + "index": 16148 } }, { @@ -1114,14 +1129,14 @@ "defaultMessage": "!!!Choose Connection Method", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 417, + "line": 422, "column": 26, - "index": 16057 + "index": 16176 }, "end": { - "line": 420, + "line": 425, "column": 3, - "index": 16175 + "index": 16294 } }, { @@ -1129,14 +1144,14 @@ "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X or S using an on-the-go USB cable adaptor:", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 421, + "line": 426, "column": 18, - "index": 16195 + "index": 16314 }, "end": { - "line": 426, + "line": 431, "column": 3, - "index": 16424 + "index": 16543 } }, { @@ -1144,14 +1159,14 @@ "defaultMessage": "!!!Connect with USB", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 427, + "line": 432, "column": 13, - "index": 16439 + "index": 16558 }, "end": { - "line": 430, + "line": 435, "column": 3, - "index": 16553 + "index": 16672 } }, { @@ -1159,14 +1174,14 @@ "defaultMessage": "!!! USB connection is blocked by iOS devices", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 431, + "line": 436, "column": 26, - "index": 16581 + "index": 16700 }, "end": { - "line": 434, + "line": 439, "column": 3, - "index": 16733 + "index": 16852 } }, { @@ -1174,14 +1189,14 @@ "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X through Bluetooth:", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 435, + "line": 440, "column": 24, - "index": 16759 + "index": 16878 }, "end": { - "line": 438, + "line": 443, "column": 3, - "index": 16953 + "index": 17072 } }, { @@ -1189,14 +1204,14 @@ "defaultMessage": "!!!Connect with Bluetooth", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 439, + "line": 444, "column": 19, - "index": 16974 + "index": 17093 }, "end": { - "line": 442, + "line": 447, "column": 3, - "index": 17100 + "index": 17219 } }, { @@ -1204,14 +1219,14 @@ "defaultMessage": "!!!Connect with Bluetooth", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 443, + "line": 448, "column": 18, - "index": 17120 + "index": 17239 }, "end": { - "line": 446, + "line": 451, "column": 3, - "index": 17230 + "index": 17349 } }, { @@ -1219,14 +1234,14 @@ "defaultMessage": "!!!You have", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 449, + "line": 454, "column": 11, - "index": 17289 + "index": 17408 }, "end": { - "line": 452, + "line": 457, "column": 3, - "index": 17384 + "index": 17503 } }, { @@ -1234,14 +1249,14 @@ "defaultMessage": "!!!No assets found", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 453, + "line": 458, "column": 12, - "index": 17398 + "index": 17517 }, "end": { - "line": 456, + "line": 461, "column": 3, - "index": 17501 + "index": 17620 } }, { @@ -1249,14 +1264,14 @@ "defaultMessage": "!!!found", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 457, + "line": 462, "column": 9, - "index": 17512 + "index": 17631 }, "end": { - "line": 460, + "line": 465, "column": 3, - "index": 17602 + "index": 17721 } }, { @@ -1264,14 +1279,14 @@ "defaultMessage": "!!!Search tokens", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 461, + "line": 466, "column": 16, - "index": 17620 + "index": 17739 }, "end": { - "line": 464, + "line": 469, "column": 3, - "index": 17716 + "index": 17835 } }, { @@ -1279,14 +1294,14 @@ "defaultMessage": "!!!Select asset", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 465, + "line": 470, "column": 20, - "index": 17738 + "index": 17857 }, "end": { - "line": 468, + "line": 473, "column": 3, - "index": 17827 + "index": 17946 } }, { @@ -1294,14 +1309,14 @@ "defaultMessage": "!!!Confirm", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 469, + "line": 474, "column": 11, - "index": 17840 + "index": 17959 }, "end": { - "line": 472, + "line": 477, "column": 3, - "index": 17934 + "index": 18053 } }, { @@ -1309,14 +1324,14 @@ "defaultMessage": "!!!Assign collateral", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 473, + "line": 478, "column": 20, - "index": 17956 + "index": 18075 }, "end": { - "line": 476, + "line": 481, "column": 3, - "index": 18063 + "index": 18182 } }, { @@ -1324,14 +1339,14 @@ "defaultMessage": "!!!Collateral not found", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 477, + "line": 482, "column": 22, - "index": 18087 + "index": 18206 }, "end": { - "line": 480, + "line": 485, "column": 3, - "index": 18199 + "index": 18318 } }, { @@ -1339,14 +1354,14 @@ "defaultMessage": "!!!You don't have an active collateral utxo", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 481, + "line": 486, "column": 22, - "index": 18223 + "index": 18342 }, "end": { - "line": 484, + "line": 489, "column": 3, - "index": 18355 + "index": 18474 } }, { @@ -1354,14 +1369,14 @@ "defaultMessage": "!!!Transaction failed", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 485, + "line": 490, "column": 17, - "index": 18374 + "index": 18493 }, "end": { - "line": 488, + "line": 493, "column": 3, - "index": 18476 + "index": 18595 } }, { @@ -1369,14 +1384,14 @@ "defaultMessage": "!!!Your transaction has not been processed properly due to technical issues", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 489, + "line": 494, "column": 16, - "index": 18494 + "index": 18613 }, "end": { - "line": 492, + "line": 497, "column": 3, - "index": 18649 + "index": 18768 } }, { @@ -1384,14 +1399,14 @@ "defaultMessage": "!!!Try again", "file": "src/features/Swap/common/strings.ts", "start": { - "line": 493, + "line": 498, "column": 18, - "index": 18669 + "index": 18788 }, "end": { - "line": 496, + "line": 501, "column": 3, - "index": 18763 + "index": 18882 } } ] \ No newline at end of file diff --git a/apps/wallet-mobile/translations/messages/src/yoroi-wallets/auth/auth.json b/apps/wallet-mobile/translations/messages/src/yoroi-wallets/auth/auth.json index de9c073a1f..e048120d6d 100644 --- a/apps/wallet-mobile/translations/messages/src/yoroi-wallets/auth/auth.json +++ b/apps/wallet-mobile/translations/messages/src/yoroi-wallets/auth/auth.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Authorize", "file": "src/yoroi-wallets/auth/auth.ts", "start": { - "line": 255, + "line": 254, "column": 13, - "index": 8429 + "index": 8406 }, "end": { - "line": 258, + "line": 257, "column": 3, - "index": 8536 + "index": 8513 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!Too many attempts", "file": "src/yoroi-wallets/auth/auth.ts", "start": { - "line": 259, + "line": 258, "column": 19, - "index": 8557 + "index": 8534 }, "end": { - "line": 262, + "line": 261, "column": 3, - "index": 8668 + "index": 8645 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!Unknown error!", "file": "src/yoroi-wallets/auth/auth.ts", "start": { - "line": 263, + "line": 262, "column": 16, - "index": 8686 + "index": 8663 }, "end": { - "line": 266, + "line": 265, "column": 3, - "index": 8793 + "index": 8770 } } ] \ No newline at end of file