From 1ca8ebfb9d237d499ead4c6f5670395758fe3263 Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:07:01 -0400 Subject: [PATCH 01/18] chore: ote-276 withdraw UI revamp (#410) * chore: add strings for new withdraw ui * 1.1.67 * better naming * generate after updating * better names. use params instead of splitting string * commit generated code * better names * remove unnecessary escape quotes * add titles. make naming more consistent * address comments * gen code --- config/localization/en/app.json | 1 + config/localization/en/tooltips.json | 12 ++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 3 ++- scripts/generated/tooltips.ts | 6 ++++++ 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index e79eeb8fa..f0e479f2f 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -950,6 +950,7 @@ "EXPECTED_AMOUNT_RECEIVED": "Expected Amount Received", "FAST": "Fast", "FAST_WITHDRAW_CONFIRMATION": "A fee of {FEE} will be collected for this fast withdraw. Your funds will be sent immediately and will appear in your wallet once the withdraw transaction has confirmed.", + "LOWEST_FEE_WITHDRAWALS": "USDC withdrawals to {LOWEST_FEE_TOKENS_TOOLTIP} have the lowest fees. Other withdrawals may have additional third-party fees.", "MAGIC_LINK_WITHDRAW_DESCRIPTION": "To access the withdrawn funds and reuse your Magic wallet outside of dYdX, you must export your wallet to another wallet provider.", "SLOW": "Slow", "SLOW_WITHDRAW_DESCRIPTION": "Slow withdraws are a two step process. This step initiates your withdraw request and will be processed on Layer 2. Once your funds are ready (can take up to {HOURS} hours), you will receive a notification to withdraw your funds to your wallet. You are responsible for the withdraw transaction gas fees.", diff --git a/config/localization/en/tooltips.json b/config/localization/en/tooltips.json index 6cf3b0221..de658ccd2 100644 --- a/config/localization/en/tooltips.json +++ b/config/localization/en/tooltips.json @@ -290,6 +290,18 @@ "TITLE": "Fast Withdraw Fee", "BODY": "Fast withdraws are sent immediately and dYdX will cover the gas costs in exchange for a fee. For fee-free withdraws, please use a slow withdraw (you pay your own gas costs and will have to wait for Layer 2 confirmation)." }, + "GAS_FEES":{ + "TITLE": "Gas Fees", + "BODY": "Gas fees are transaction fees on the source chain, in this case dYdX." + }, + "LOWEST_FEE_WITHDRAWALS": { + "TITLE": "Lowest Fee Withdrawals", + "BODY": "USDC withdrawals on {LOWEST_FEE_TOKEN_NAMES} have the lowest fees." + }, + "BRIDGE_FEES":{ + "TITLE": "Bridge Fees", + "BODY": "Bridge fees are paid to other protocols in order to complete the bridging, transferring, and swapping required for this withdrawal." + }, "MINIMUM_AMOUNT_RECEIVED": { "TITLE": "Minimum Amount Received", "BODY": "Inclusive of any slippage that may occur due to liquidity changes while the bridge is in progress" diff --git a/package-lock.json b/package-lock.json index e9adea64d..08f00a036 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.66", + "version": "1.1.67", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.66", + "version": "1.1.67", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index e152472da..f23cc8637 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.66", + "version": "1.1.67", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index c23759751..2950c1f0b 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1,6 +1,6 @@ // !! GENERATED FILE - DO NOT EDIT -// Generated from ../config/localization/en/app.json using codegen_localization_app.swift +// Generated from ../config/localization/en/app.json using ./codegen_localization_app.swift export const APP_STRING_KEYS = { @@ -1566,6 +1566,7 @@ export const APP_STRING_KEYS = { EXPECTED_AMOUNT_RECEIVED: 'APP.WITHDRAW_MODAL.EXPECTED_AMOUNT_RECEIVED', FAST: 'APP.WITHDRAW_MODAL.FAST', FAST_WITHDRAW_CONFIRMATION: 'APP.WITHDRAW_MODAL.FAST_WITHDRAW_CONFIRMATION', + LOWEST_FEE_WITHDRAWALS: 'APP.WITHDRAW_MODAL.LOWEST_FEE_WITHDRAWALS', MAGIC_LINK_WITHDRAW_DESCRIPTION: 'APP.WITHDRAW_MODAL.MAGIC_LINK_WITHDRAW_DESCRIPTION', SLOW: 'APP.WITHDRAW_MODAL.SLOW', SLOW_WITHDRAW_CONFIRMATION: 'APP.WITHDRAW_MODAL.SLOW_WITHDRAW_CONFIRMATION', diff --git a/scripts/generated/tooltips.ts b/scripts/generated/tooltips.ts index 84d747bb7..6674129da 100644 --- a/scripts/generated/tooltips.ts +++ b/scripts/generated/tooltips.ts @@ -175,8 +175,14 @@ export const TOOLTIP_STRING_KEYS = { // WITHDRAW + BRIDGE_FEES_BODY: 'TOOLTIPS.WITHDRAW.BRIDGE_FEES.BODY', + BRIDGE_FEES_TITLE: 'TOOLTIPS.WITHDRAW.BRIDGE_FEES.TITLE', FAST_WITHDRAW_FEE_BODY: 'TOOLTIPS.WITHDRAW.FAST_WITHDRAW_FEE.BODY', FAST_WITHDRAW_FEE_TITLE: 'TOOLTIPS.WITHDRAW.FAST_WITHDRAW_FEE.TITLE', + GAS_FEES_BODY: 'TOOLTIPS.WITHDRAW.GAS_FEES.BODY', + GAS_FEES_TITLE: 'TOOLTIPS.WITHDRAW.GAS_FEES.TITLE', + LOWEST_FEE_WITHDRAWALS_BODY: 'TOOLTIPS.WITHDRAW.LOWEST_FEE_WITHDRAWALS.BODY', + LOWEST_FEE_WITHDRAWALS_TITLE: 'TOOLTIPS.WITHDRAW.LOWEST_FEE_WITHDRAWALS.TITLE', MINIMUM_AMOUNT_RECEIVED_BODY: 'TOOLTIPS.WITHDRAW.MINIMUM_AMOUNT_RECEIVED.BODY', MINIMUM_AMOUNT_RECEIVED_TITLE: 'TOOLTIPS.WITHDRAW.MINIMUM_AMOUNT_RECEIVED.TITLE', WITHDRAW_TYPES_BODY: 'TOOLTIPS.WITHDRAW.WITHDRAW_TYPES.BODY', From 6a8a36e4fd6912ff03eb0cb128d0d590f7e6a067 Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:01:57 -0400 Subject: [PATCH 02/18] chore: add lowest fees with usdc text (#412) * chore: add lowest fees with usdc text * add period * check in gen code * 1.1.68 * add another missing string --- config/localization/en/app.json | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index f0e479f2f..4b7fa5f2c 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -951,7 +951,9 @@ "FAST": "Fast", "FAST_WITHDRAW_CONFIRMATION": "A fee of {FEE} will be collected for this fast withdraw. Your funds will be sent immediately and will appear in your wallet once the withdraw transaction has confirmed.", "LOWEST_FEE_WITHDRAWALS": "USDC withdrawals to {LOWEST_FEE_TOKENS_TOOLTIP} have the lowest fees. Other withdrawals may have additional third-party fees.", + "LOWEST_FEES_WITH_USDC": "{LOWEST_FEES_HIGHLIGHT_TEXT} with USDC.", "MAGIC_LINK_WITHDRAW_DESCRIPTION": "To access the withdrawn funds and reuse your Magic wallet outside of dYdX, you must export your wallet to another wallet provider.", + "SELECT_CHAINS": "select chains", "SLOW": "Slow", "SLOW_WITHDRAW_DESCRIPTION": "Slow withdraws are a two step process. This step initiates your withdraw request and will be processed on Layer 2. Once your funds are ready (can take up to {HOURS} hours), you will receive a notification to withdraw your funds to your wallet. You are responsible for the withdraw transaction gas fees.", "SLOW_WITHDRAW_CONFIRMATION": "This {STYLED_SLOW} withdraw may take up to {HOURS} hours before it is available to withdraw. You will be responsible for the withdraw transaction gas fees. If you need your funds sooner, try a {STYLED_FAST} withdraw.", diff --git a/package-lock.json b/package-lock.json index 08f00a036..696c388fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.67", + "version": "1.1.68", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.67", + "version": "1.1.68", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index f23cc8637..a8b6bbbac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.67", + "version": "1.1.68", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index 2950c1f0b..b65b17097 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1566,8 +1566,10 @@ export const APP_STRING_KEYS = { EXPECTED_AMOUNT_RECEIVED: 'APP.WITHDRAW_MODAL.EXPECTED_AMOUNT_RECEIVED', FAST: 'APP.WITHDRAW_MODAL.FAST', FAST_WITHDRAW_CONFIRMATION: 'APP.WITHDRAW_MODAL.FAST_WITHDRAW_CONFIRMATION', + LOWEST_FEES_WITH_USDC: 'APP.WITHDRAW_MODAL.LOWEST_FEES_WITH_USDC', LOWEST_FEE_WITHDRAWALS: 'APP.WITHDRAW_MODAL.LOWEST_FEE_WITHDRAWALS', MAGIC_LINK_WITHDRAW_DESCRIPTION: 'APP.WITHDRAW_MODAL.MAGIC_LINK_WITHDRAW_DESCRIPTION', + SELECT_CHAINS: 'APP.WITHDRAW_MODAL.SELECT_CHAINS', SLOW: 'APP.WITHDRAW_MODAL.SLOW', SLOW_WITHDRAW_CONFIRMATION: 'APP.WITHDRAW_MODAL.SLOW_WITHDRAW_CONFIRMATION', SLOW_WITHDRAW_DESCRIPTION: 'APP.WITHDRAW_MODAL.SLOW_WITHDRAW_DESCRIPTION', From 5f3044af18c19b690f6feeddc97b353acd8114e8 Mon Sep 17 00:00:00 2001 From: moo-onthelawn <70078372+moo-onthelawn@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:04:36 -0400 Subject: [PATCH 03/18] Update stop market liquidation localization strings (#411) * wip * bump v * remove changes --- config/localization/en/app.json | 6 +++++- scripts/generated/app.ts | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 4b7fa5f2c..13a0311bd 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -2016,7 +2016,7 @@ "TAKER_FEE_INVALID": "Your fee rates may have changed. Please refresh the app and try again.", "TRIGGER_MUST_ABOVE_INDEX_PRICE": "Your trigger price must be above the current oracle price: {INDEX_PRICE}.", "TRIGGER_MUST_BELOW_INDEX_PRICE": "Your trigger price must be below the current oracle price: {INDEX_PRICE}.", - "TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please update your trigger price or use a stop limit order.", + "TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please update your trigger price or use a Stop Limit order.", "USER_MAX_ORDERS": "This order would put you above the max limit of 20 open orders per market, per side.", "USER_MAX_ORDERS_FOR_EQUITY_TIER": "This order would put you above the equity tier limit of {LIMIT} open orders", "USER_MAX_ORDERS_FOR_CURRENT_EQUITY_TIER": "This order would put you over the limit of {LIMIT} open orders for your equity tier. The next equity tier is at {EQUITY}.", @@ -2077,9 +2077,11 @@ "INVALID_GOOD_TIL": "Invalid Good Til" }, "TRIGGERS_FORM": { + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price below ${TRIGGER_PRICE_LIMIT}.", "LOSS_COLON": "Loss:", "PRICE_MUST_POSITIVE": "All input prices must be positive. Please adjust your input prices.", "PROFIT_COLON": "Profit:", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price above ${TRIGGER_PRICE_LIMIT}.", "STOP_LOSS_LIMIT_MUST_ABOVE_TRIGGER_PRICE": "Your stop loss limit price must be above your trigger price for this order to fill when it triggers. Please adjust your limit price.", "STOP_LOSS_LIMIT_MUST_BELOW_TRIGGER_PRICE": "Your stop loss limit price must be below your trigger price for this order to fill when it triggers. Please adjust your limit price.", "STOP_LOSS_TRIGGER_MUST_ABOVE_INDEX_PRICE": "Your stop loss trigger price must be above the current oracle price: {INDEX_PRICE}.", @@ -2090,7 +2092,9 @@ "TAKE_PROFIT_TRIGGER_MUST_BELOW_INDEX_PRICE": "Your take profit trigger price must be below the current oracle price: {INDEX_PRICE}." }, "TRIGGERS_FORM_TITLE": { + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Liquidation Risk", "PRICE_MUST_POSITIVE": "Invalid price input", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Liquidation Risk", "STOP_LOSS_LIMIT_MUST_ABOVE_TRIGGER_PRICE": "Invalid stop loss limit price", "STOP_LOSS_LIMIT_MUST_BELOW_TRIGGER_PRICE": "Invalid stop loss limit price", "STOP_LOSS_TRIGGER_MUST_ABOVE_INDEX_PRICE": "Invalid stop loss trigger price", diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index b65b17097..fcdd1dab0 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1715,9 +1715,11 @@ export const ERRORS_STRING_KEYS = { // TRIGGERS_FORM + BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT: 'ERRORS.TRIGGERS_FORM.BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT', LOSS_COLON: 'ERRORS.TRIGGERS_FORM.LOSS_COLON', PRICE_MUST_POSITIVE: 'ERRORS.TRIGGERS_FORM.PRICE_MUST_POSITIVE', PROFIT_COLON: 'ERRORS.TRIGGERS_FORM.PROFIT_COLON', + SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT: 'ERRORS.TRIGGERS_FORM.SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT', STOP_LOSS_LIMIT_MUST_ABOVE_TRIGGER_PRICE: 'ERRORS.TRIGGERS_FORM.STOP_LOSS_LIMIT_MUST_ABOVE_TRIGGER_PRICE', STOP_LOSS_LIMIT_MUST_BELOW_TRIGGER_PRICE: 'ERRORS.TRIGGERS_FORM.STOP_LOSS_LIMIT_MUST_BELOW_TRIGGER_PRICE', STOP_LOSS_TRIGGER_MUST_ABOVE_INDEX_PRICE: 'ERRORS.TRIGGERS_FORM.STOP_LOSS_TRIGGER_MUST_ABOVE_INDEX_PRICE', From 9ca20644fd5d0ffaa0a398e7c5ee43d4f121d261 Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Thu, 25 Apr 2024 23:11:03 -0400 Subject: [PATCH 04/18] chore: add "lowest fees" text (#414) * add one more * 1.1.69 --- config/localization/en/app.json | 3 ++- package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 13a0311bd..b87342a85 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -950,8 +950,9 @@ "EXPECTED_AMOUNT_RECEIVED": "Expected Amount Received", "FAST": "Fast", "FAST_WITHDRAW_CONFIRMATION": "A fee of {FEE} will be collected for this fast withdraw. Your funds will be sent immediately and will appear in your wallet once the withdraw transaction has confirmed.", + "LOWEST_FEES_HIGHLIGHT_TEXT": "lowest fees", "LOWEST_FEE_WITHDRAWALS": "USDC withdrawals to {LOWEST_FEE_TOKENS_TOOLTIP} have the lowest fees. Other withdrawals may have additional third-party fees.", - "LOWEST_FEES_WITH_USDC": "{LOWEST_FEES_HIGHLIGHT_TEXT} with USDC.", + "LOWEST_FEES_WITH_USDC": "{LOWEST_FEES_HIGHLIGHT_TEXT} with USDC", "MAGIC_LINK_WITHDRAW_DESCRIPTION": "To access the withdrawn funds and reuse your Magic wallet outside of dYdX, you must export your wallet to another wallet provider.", "SELECT_CHAINS": "select chains", "SLOW": "Slow", diff --git a/package-lock.json b/package-lock.json index 696c388fb..e87a81f54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.68", + "version": "1.1.69", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.68", + "version": "1.1.69", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index a8b6bbbac..6e03a4b47 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.68", + "version": "1.1.69", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index fcdd1dab0..ebc526df0 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1566,6 +1566,7 @@ export const APP_STRING_KEYS = { EXPECTED_AMOUNT_RECEIVED: 'APP.WITHDRAW_MODAL.EXPECTED_AMOUNT_RECEIVED', FAST: 'APP.WITHDRAW_MODAL.FAST', FAST_WITHDRAW_CONFIRMATION: 'APP.WITHDRAW_MODAL.FAST_WITHDRAW_CONFIRMATION', + LOWEST_FEES_HIGHLIGHT_TEXT: 'APP.WITHDRAW_MODAL.LOWEST_FEES_HIGHLIGHT_TEXT', LOWEST_FEES_WITH_USDC: 'APP.WITHDRAW_MODAL.LOWEST_FEES_WITH_USDC', LOWEST_FEE_WITHDRAWALS: 'APP.WITHDRAW_MODAL.LOWEST_FEE_WITHDRAWALS', MAGIC_LINK_WITHDRAW_DESCRIPTION: 'APP.WITHDRAW_MODAL.MAGIC_LINK_WITHDRAW_DESCRIPTION', From 123bc6e2463dceed7034bb18d41877e41744645d Mon Sep 17 00:00:00 2001 From: aleka Date: Thu, 25 Apr 2024 23:18:45 -0400 Subject: [PATCH 05/18] Add order status notifs strings (#415) * add order status notifs related strings * 1.1.70 --- config/localization/en/app.json | 3 +++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index b87342a85..ef243540a 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1311,6 +1311,7 @@ "STOP_MARKET_DESCRIPTION": "A stop market order can be used to limit losses by closing your position once the oracle price or last trade price crosses your trigger price.", "STOP_PRICE_ABBREVIATED": "Stop", "STOP_PRICE": "Stop Price", + "SUBMITTED": "Submitted", "TAKE_PROFIT_LIMIT_DESCRIPTION": "A take profit limit order converts to a traditional limit order whenever the oracle price or last trade price crosses your trigger price.", "TAKE_PROFIT_LIMIT_SHORT": "Take Profit Limit", "TAKE_PROFIT_LIMIT": "Take Profit Limit", @@ -1457,6 +1458,7 @@ "MAINTENANCE_MARGIN_ADJUSTMENTS": "Maintenance margin requirements {ACTION} at {PERCENT}%.", "NOTIFICATIONS_EMPTY_STATE": "You have no notifications.", "ORDERBOOK_LAGGING": "Orderbook lagging", + "ORDER_STATUS": "Order Status", "ORDERBOOK_LAGGING_BODY": "Orderbook and pricing data may be outdated due to system delays. Market and short-term orders face a higher risk of encountering price discrepancies at the time of execution. Transactions and account information could also be delayed.", "OUT_OF_TEN_CONFIRMATIONS": "{CURRENT_CONFIRMATIONS} of 10 confirmations", "OUT_OF_FOURTEEN_CONFIRMATIONS": "{CURRENT_CONFIRMATIONS} of 14 confirmations", @@ -1464,6 +1466,7 @@ "PERMANENTLY_BLOCKED_DESCRIPTION": "Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use and previously have been given an opportunity to redress circumstances that led to restrictions on your account, you have been permanently blocked from performing transfers within the protocol, making fast withdrawals to remove funds from the protocol, and placing orders other than market orders that reduce your positions. You may withdraw your funds from the protocol at any time.", "PERMANENTLY_BLOCKED_ELLIPTIC": "For compliance reasons you are blocked from using the dYdX protocol.", "PERMANENTLY_BLOCKED_COMPLIANCE": "For compliance reasons you have been blocked from using the dYdX protocol. This account is in close-only mode. If you believe there has been an error, please email support@dydx.exchange.", + "RELEASE_UPDATES": "Release Updates", "REMOVED": "Removed", "REMOVING": "Removing", "SLOW_WITHDRAW_AVAILABLE_DESCRIPTION": "Your slow withdraw request(s) have been confirmed. {AMOUNT_ELEMENT} is available for withdrawal.", diff --git a/package-lock.json b/package-lock.json index e87a81f54..c89c6b919 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.69", + "version": "1.1.70", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.69", + "version": "1.1.70", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index 6e03a4b47..bc1cbccae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.69", + "version": "1.1.70", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index ebc526df0..826eddeec 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1,6 +1,6 @@ // !! GENERATED FILE - DO NOT EDIT -// Generated from ../config/localization/en/app.json using ./codegen_localization_app.swift +// Generated from ../config/localization/en/app.json using codegen_localization_app.swift export const APP_STRING_KEYS = { @@ -832,12 +832,14 @@ export const APP_STRING_KEYS = { NOTIFICATIONS_EMPTY_STATE: 'APP.NOTIFICATIONS.NOTIFICATIONS_EMPTY_STATE', ORDERBOOK_LAGGING: 'APP.NOTIFICATIONS.ORDERBOOK_LAGGING', ORDERBOOK_LAGGING_BODY: 'APP.NOTIFICATIONS.ORDERBOOK_LAGGING_BODY', + ORDER_STATUS: 'APP.NOTIFICATIONS.ORDER_STATUS', OUT_OF_FOURTEEN_CONFIRMATIONS: 'APP.NOTIFICATIONS.OUT_OF_FOURTEEN_CONFIRMATIONS', OUT_OF_TEN_CONFIRMATIONS: 'APP.NOTIFICATIONS.OUT_OF_TEN_CONFIRMATIONS', PERMANENTLY_BLOCKED: 'APP.NOTIFICATIONS.PERMANENTLY_BLOCKED', PERMANENTLY_BLOCKED_COMPLIANCE: 'APP.NOTIFICATIONS.PERMANENTLY_BLOCKED_COMPLIANCE', PERMANENTLY_BLOCKED_DESCRIPTION: 'APP.NOTIFICATIONS.PERMANENTLY_BLOCKED_DESCRIPTION', PERMANENTLY_BLOCKED_ELLIPTIC: 'APP.NOTIFICATIONS.PERMANENTLY_BLOCKED_ELLIPTIC', + RELEASE_UPDATES: 'APP.NOTIFICATIONS.RELEASE_UPDATES', REMOVED: 'APP.NOTIFICATIONS.REMOVED', SLOW_WITHDRAW_AVAILABLE: 'APP.NOTIFICATIONS.SLOW_WITHDRAW_AVAILABLE', SLOW_WITHDRAW_AVAILABLE_DESCRIPTION: 'APP.NOTIFICATIONS.SLOW_WITHDRAW_AVAILABLE_DESCRIPTION', @@ -1455,6 +1457,7 @@ export const APP_STRING_KEYS = { STOP_MARKET_DESCRIPTION: 'APP.TRADE.STOP_MARKET_DESCRIPTION', STOP_PRICE: 'APP.TRADE.STOP_PRICE', STOP_PRICE_ABBREVIATED: 'APP.TRADE.STOP_PRICE_ABBREVIATED', + SUBMITTED: 'APP.TRADE.SUBMITTED', TAKER: 'APP.TRADE.TAKER', TAKER_FEE: 'APP.TRADE.TAKER_FEE', TAKE_PROFIT: 'APP.TRADE.TAKE_PROFIT', From 10b203e05cde261a6dda04a5d17c18b166d6d7f1 Mon Sep 17 00:00:00 2001 From: moo-onthelawn <70078372+moo-onthelawn@users.noreply.github.com> Date: Fri, 26 Apr 2024 11:30:44 -0400 Subject: [PATCH 06/18] remove extra $ sign from liquidation errors (#416) * remove $ * version bump --- config/localization/en/app.json | 8 ++++---- config/localization/fr/app.json | 4 ++-- config/localization/ja/app.json | 4 ++-- config/localization/ko/app.json | 4 ++-- config/localization/pt/app.json | 4 ++-- config/localization/tr/app.json | 4 ++-- config/localization/zh-CN/app.json | 4 ++-- config/localizations_native/ja/app.json | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index ef243540a..3d16981ee 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1997,7 +1997,7 @@ "BRACKET_ORDER_TAKE_PROFIT_ABOVE_LIQUIDATION_PRICE": "Your take profit trigger price is too close to your liquidation price - the take profit order may not execute fully before you get liquidated. Please enter a trigger price above ${TRIGGER_PRICE_LIMIT}.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_EXPECTED_PRICE": "Your take profit trigger price must be below the market order expected price: ${EXPECTED_PRICE}.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_LIQUIDATION_PRICE": "Your take profit trigger price is too close to your liquidation price - the take profit order may not execute fully before you get liquidated. Please enter a trigger price below ${TRIGGER_PRICE_LIMIT}.", - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price below ${TRIGGER_PRICE_LIMIT} or use a Stop Limit order.", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price below {TRIGGER_PRICE_LIMIT} or use a Stop Limit order.", "INVALID_LARGE_POSITION_LEVERAGE": "This trade would result in an invalid leverage on your position. To limit risk, larger positions have lower maximum leverages.", "INVALID_NEW_ACCOUNT_MARGIN_USAGE": "This trade would result in over 100% margin usage on your account.", "INVALID_NEW_POSITION_LEVERAGE": "This trade would result in an invalid leverage on your position.", @@ -2016,7 +2016,7 @@ "ORDER_SIZE_BELOW_MIN_SIZE": "Your order size is below the minimum order size of {MIN_SIZE} {SYMBOL}", "ORDER_WITH_CURRENT_ORDERS_INVALID": "Given your current open orders, this order may result in an invalid leverage on your position. Please close some or all orders that would fill before this order, or reduce your order size.", "ORDER_WOULD_FLIP_POSITION": "This order would flip or increase your position. Please uncheck Reduce-Only or reduce your order size.", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price above ${TRIGGER_PRICE_LIMIT} or use a Stop Limit order.", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price above {TRIGGER_PRICE_LIMIT} or use a Stop Limit order.", "TAKER_FEE_INVALID": "Your fee rates may have changed. Please refresh the app and try again.", "TRIGGER_MUST_ABOVE_INDEX_PRICE": "Your trigger price must be above the current oracle price: {INDEX_PRICE}.", "TRIGGER_MUST_BELOW_INDEX_PRICE": "Your trigger price must be below the current oracle price: {INDEX_PRICE}.", @@ -2081,11 +2081,11 @@ "INVALID_GOOD_TIL": "Invalid Good Til" }, "TRIGGERS_FORM": { - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price below ${TRIGGER_PRICE_LIMIT}.", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price below {TRIGGER_PRICE_LIMIT}.", "LOSS_COLON": "Loss:", "PRICE_MUST_POSITIVE": "All input prices must be positive. Please adjust your input prices.", "PROFIT_COLON": "Profit:", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price above ${TRIGGER_PRICE_LIMIT}.", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE_NO_LIMIT": "Your trigger price is too close to your liquidation price - this order may not execute fully before you get liquidated. Please enter a trigger price above {TRIGGER_PRICE_LIMIT}.", "STOP_LOSS_LIMIT_MUST_ABOVE_TRIGGER_PRICE": "Your stop loss limit price must be above your trigger price for this order to fill when it triggers. Please adjust your limit price.", "STOP_LOSS_LIMIT_MUST_BELOW_TRIGGER_PRICE": "Your stop loss limit price must be below your trigger price for this order to fill when it triggers. Please adjust your limit price.", "STOP_LOSS_TRIGGER_MUST_ABOVE_INDEX_PRICE": "Your stop loss trigger price must be above the current oracle price: {INDEX_PRICE}.", diff --git a/config/localization/fr/app.json b/config/localization/fr/app.json index 4bd4236f6..d9938d7fe 100644 --- a/config/localization/fr/app.json +++ b/config/localization/fr/app.json @@ -1974,7 +1974,7 @@ "BRACKET_ORDER_TAKE_PROFIT_ABOVE_LIQUIDATION_PRICE": "Votre prix de déclenchement Take Profit est trop proche de votre prix de liquidation, l'ordre Take Profit peut ne pas s'exécuter complètement avant que vous ne soyez liquidé. Veuillez saisir un prix de déclenchement supérieur à ${TRIGGER_PRICE_LIMIT}.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_EXPECTED_PRICE": "Votre prix de déclenchement Take Profit doit être inférieur au prix attendu de l'ordre au marché : ${EXPECTED_PRICE}.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_LIQUIDATION_PRICE": "Votre prix de déclenchement Take Profit est trop proche de votre prix de liquidation, l'ordre Take Profit peut ne pas s'exécuter complètement avant que vous ne soyez liquidé. Veuillez saisir un prix de déclenchement inférieur à ${TRIGGER_PRICE_LIMIT}.", - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Votre prix de déclenchement est trop proche de votre prix de liquidation - cet ordre peut ne pas s'exécuter complètement avant que vous ne soyez liquidé. Veuillez saisir un prix de déclenchement inférieur à ${TRIGGER_PRICE_LIMIT} ou utilisez un ordre Stop Limit.", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Votre prix de déclenchement est trop proche de votre prix de liquidation - cet ordre peut ne pas s'exécuter complètement avant que vous ne soyez liquidé. Veuillez saisir un prix de déclenchement inférieur à {TRIGGER_PRICE_LIMIT} ou utilisez un ordre Stop Limit.", "INVALID_LARGE_POSITION_LEVERAGE": "Ce trade entraînerait un effet de levier non valide sur votre position. Pour limiter le risque, les positions plus importantes ont des effets de levier maximaux inférieurs.", "INVALID_NEW_ACCOUNT_MARGIN_USAGE": "Cette transaction entraînerait une utilisation de la marge de plus de 100 % sur votre compte.", "INVALID_NEW_POSITION_LEVERAGE": "Cette transaction entraînerait un effet de levier invalide sur votre position. ", @@ -1993,7 +1993,7 @@ "ORDER_SIZE_BELOW_MIN_SIZE": "La taille de votre ordre est inférieure à la taille de l'ordre minimum de {MIN_SIZE} {SYMBOL}", "ORDER_WITH_CURRENT_ORDERS_INVALID": "Compte tenu de vos ordres ouverts actuels, cet ordre peut entraîner un effet de levier invalide sur votre position. Veuillez fermer certains ou tous les ordres qui seraient remplis avant cet ordre, ou réduire la taille de votre ordre.", "ORDER_WOULD_FLIP_POSITION": "Cet ordre inverserait ou augmenterait votre position. Veuillez décocher Reduce-Only ou réduire la taille de votre ordre.", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Votre prix de déclenchement est trop proche de votre prix de liquidation - cet ordre peut ne pas s'exécuter complètement avant que vous ne soyez liquidé. Veuillez entrer un prix de déclenchement supérieur à ${TRIGGER_PRICE_LIMIT} ou utilisez un ordre Stop Limit.", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Votre prix de déclenchement est trop proche de votre prix de liquidation - cet ordre peut ne pas s'exécuter complètement avant que vous ne soyez liquidé. Veuillez entrer un prix de déclenchement supérieur à {TRIGGER_PRICE_LIMIT} ou utilisez un ordre Stop Limit.", "TAKER_FEE_INVALID": "Vos taux de frais peuvent avoir changé. Veuillez actualiser l'application et réessayer.", "TRIGGER_MUST_ABOVE_INDEX_PRICE": "Votre prix de déclenchement doit être supérieur au prix actuel d'oracle {INDEX_PRICE}: ", "TRIGGER_MUST_BELOW_INDEX_PRICE": "Votre prix de déclenchement doit être inférieur au prix actuel d'oracle : {INDEX_PRICE}.", diff --git a/config/localization/ja/app.json b/config/localization/ja/app.json index b2bcdb264..098371010 100644 --- a/config/localization/ja/app.json +++ b/config/localization/ja/app.json @@ -1974,7 +1974,7 @@ "BRACKET_ORDER_TAKE_PROFIT_ABOVE_LIQUIDATION_PRICE": "利益確定注文のトリガー価格が清算価格に近すぎます。この利益確定注文は清算前に完全に執行されない可能性があります。${TRIGGER_PRICE_LIMIT}を上回るトリガー価格を入力してください。 ", "BRACKET_ORDER_TAKE_PROFIT_BELOW_EXPECTED_PRICE": "利益確定注文のトリガー価格は、成行注文の予想価格${EXPECTED_PRICE}を下回っている必要があります。", "BRACKET_ORDER_TAKE_PROFIT_BELOW_LIQUIDATION_PRICE": "利益確定注文のトリガー価格が清算価格に近すぎます。この利益確定注文は清算前に完全に執行されない可能性があります。${TRIGGER_PRICE_LIMIT}を下回るトリガー価格を入力してください。", - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "トリガー価格が清算価格に近すぎます。この注文は清算前に完全に執行されない可能性があります。${TRIGGER_PRICE_LIMIT}を下回るトリガー価格を入力するか、ストップリミット注文を使用してください。", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "トリガー価格が清算価格に近すぎます。この注文は清算前に完全に執行されない可能性があります。{TRIGGER_PRICE_LIMIT}を下回るトリガー価格を入力するか、ストップリミット注文を使用してください。", "INVALID_LARGE_POSITION_LEVERAGE": "この取引の結果、ポジションにおけるレバレッジが無効になる可能性があります。リスクを限定するため、 なポジションの最大レバレッジは引き下げられています。", "INVALID_NEW_ACCOUNT_MARGIN_USAGE": "この取引の結果、お客様の口座の証拠金使用率が100%を超えてしまう可能性があります。", "INVALID_NEW_POSITION_LEVERAGE": "この取引の結果、ポジションにおけるレバレッジが無効になる可能性があります。", @@ -1993,7 +1993,7 @@ "ORDER_SIZE_BELOW_MIN_SIZE": "注文サイズが最小注文サイズ（{MIN_SIZE} {SYMBOL}）を下回っています。", "ORDER_WITH_CURRENT_ORDERS_INVALID": "お客様の現在のオープンオーダーを考慮すると、この注文により、お客様のポジションのレバレッジが無効になる可能性があります。この注文より先に執行される注文の一部または全部をクローズするか、注文のサイズを減らしてください。", "ORDER_WOULD_FLIP_POSITION": "この注文により、ポジションがフリップまたは増加するでしょう。リデュースオンリーのチェックを解除するか、または注文サイズを縮小してください。", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "トリガー価格が清算価格に近すぎます。この注文は清算前に完全に執行されない可能性があります。${TRIGGER_PRICE_LIMIT}を上回るトリガー価格を入力するか、ストップリミット注文を使用してください。", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "トリガー価格が清算価格に近すぎます。この注文は清算前に完全に執行されない可能性があります。{TRIGGER_PRICE_LIMIT}を上回るトリガー価格を入力するか、ストップリミット注文を使用してください。", "TAKER_FEE_INVALID": "手数料レートが変更された可能性があります。アプリを更新し、もう一度お試しください。", "TRIGGER_MUST_ABOVE_INDEX_PRICE": "トリガー価格が現在のオラクル価格である{INDEX_PRICE}{INDEX_PRICE}を上回っている必要があります。", "TRIGGER_MUST_BELOW_INDEX_PRICE": "トリガー価格が現在のオラクル価格である{INDEX_PRICE}を下回っている必要があります。", diff --git a/config/localization/ko/app.json b/config/localization/ko/app.json index c29630f21..5f8af3178 100644 --- a/config/localization/ko/app.json +++ b/config/localization/ko/app.json @@ -1990,7 +1990,7 @@ "BRACKET_ORDER_TAKE_PROFIT_ABOVE_LIQUIDATION_PRICE": "수익 실현 발동 가격이 청산 가격에 너무 가깝습니다. 해당 주문은 완전히 실현되기 전에 청산될 수 있습니다. ${TRIGGER_PRICE_LIMIT}를 초과하는 발동 가격을 입력하십시오.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_EXPECTED_PRICE": "익절매 발동 가격은 예상 가격(${EXPECTED_PRICE})보다 낮아야 합니다.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_LIQUIDATION_PRICE": "수익 실현 발동 가격이 청산 가격에 너무 가깝습니다. 해당 주문은 완전히 실현되기 전에 청산될 수 있습니다. ${TRIGGER_PRICE_LIMIT} 미만의 발동 가격을 입력하십시오.", - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "발동 가격이 청산 가격에 너무 가깝습니다. 해당 주문은 완전히 실현되기 전에 청산될 수 있습니다. ${TRIGGER_PRICE_LIMIT} 미만의 발동 가격을 입력하거나 스탑 리밋 주문을 사용하십시오.", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "발동 가격이 청산 가격에 너무 가깝습니다. 해당 주문은 완전히 실현되기 전에 청산될 수 있습니다. {TRIGGER_PRICE_LIMIT} 미만의 발동 가격을 입력하거나 스탑 리밋 주문을 사용하십시오.", "INVALID_LARGE_POSITION_LEVERAGE": "이 거래는 내 포지션에 유효하지 않은 레버리지를 초래합니다. 위험을 제한하기 위해 더 큰 포지션은 최대 레버리지가 더 낮습니다.", "INVALID_NEW_ACCOUNT_MARGIN_USAGE": "이 거래는 내 게정에서 100%를 초과하는 마진을 사용하게 됩니다.", "INVALID_NEW_POSITION_LEVERAGE": "이 거래는 내 포지션에 유효하지 않은 레버리지를 초래합니다.", @@ -2009,7 +2009,7 @@ "ORDER_SIZE_BELOW_MIN_SIZE": "주문 규모가 최소 주문 규모인 {MIN_SIZE} {SYMBOL}보다 작습니다.", "ORDER_WITH_CURRENT_ORDERS_INVALID": "현재 개설된 주문을 고려할 때, 이 주문은 포지션에 유효하지 않은 레버리지를 초래할 수 있습니다. 이 주문 전에 체결될 일부 혹은 모든 주문을 종료하거나 주문 규모를 줄이십시오.", "ORDER_WOULD_FLIP_POSITION": "이 주문으로 고객님의 포지션이 뒤집히거나 증가할 수 있습니다. 리듀스 온리 선택을 취소하시거나 주문 규모를 줄여주시기 바랍니다.", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "발동 가격이 청산 가격에 너무 가깝습니다. 해당 주문은 완전히 실현되기 전에 청산될 수 있습니다. ${TRIGGER_PRICE_LIMIT}를 초과하는 발동 가격을 입력하거나 스탑 리밋 주문을 사용하십시오.", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "발동 가격이 청산 가격에 너무 가깝습니다. 해당 주문은 완전히 실현되기 전에 청산될 수 있습니다. {TRIGGER_PRICE_LIMIT}를 초과하는 발동 가격을 입력하거나 스탑 리밋 주문을 사용하십시오.", "TAKER_FEE_INVALID": "수수료가 변경되었을 수 있습니다. 앱 새로고침 후 다시 시도하십시오.", "TRIGGER_MUST_ABOVE_INDEX_PRICE": "트리거 가격은 현재 오라클 가격보다 높아야 합니다. {INDEX_PRICE}", "TRIGGER_MUST_BELOW_INDEX_PRICE": "발동 가격은 현재 오라클 가격인 보다 낮아야 합니다. {INDEX_PRICE}", diff --git a/config/localization/pt/app.json b/config/localization/pt/app.json index 630ea3285..3444877cb 100644 --- a/config/localization/pt/app.json +++ b/config/localization/pt/app.json @@ -1974,7 +1974,7 @@ "BRACKET_ORDER_TAKE_PROFIT_ABOVE_LIQUIDATION_PRICE": "Caso o preço de disparo da ordem de take profit estiver muito próximo ao seu preço de liquidação, pode ser que a ordem de take profit não seja totalmente executada antes de você obter sua liquidação. Digite o preço de disparo acima de ${TRIGGER_PRICE_LIMIT}.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_EXPECTED_PRICE": "O preço de disparo da ordem de take profit deve ficar abaixo do preço esperado para a ordem de mercado: ${EXPECTED_PRICE}.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_LIQUIDATION_PRICE": "Caso o preço de disparo da ordem de take profit estiver muito próximo ao seu preço de liquidação, pode ser que a ordem de take profit não seja totalmente executada antes de você obter sua liquidação. Digite um preço de disparo abaixo de ${TRIGGER_PRICE_LIMIT}.", - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "O preço de disparo está muito próximo do preço de liquidação — esta ordem pode não ser executada totalmente antes de ser liquidada. Digite um preço de disparo abaixo de ${TRIGGER_PRICE_LIMIT} ou use uma ordem limite de stop.", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "O preço de disparo está muito próximo do preço de liquidação — esta ordem pode não ser executada totalmente antes de ser liquidada. Digite um preço de disparo abaixo de {TRIGGER_PRICE_LIMIT} ou use uma ordem limite de stop.", "INVALID_LARGE_POSITION_LEVERAGE": "Esse trade resultaria em uma alavancagem inválida na sua posição. Para evitar riscos, posições maiores têm alavancagens máximas menores.", "INVALID_NEW_ACCOUNT_MARGIN_USAGE": "Esse trade resultaria em mais de 100% do uso de margem na sua conta.", "INVALID_NEW_POSITION_LEVERAGE": "Esse trade resultaria em uma alavancagem inválida sobre sua posição. ", @@ -1993,7 +1993,7 @@ "ORDER_SIZE_BELOW_MIN_SIZE": "O tamanho da ordem está abaixo do tamanho mínimo de {MIN_SIZE} {SYMBOL}", "ORDER_WITH_CURRENT_ORDERS_INVALID": "Devido às ordens abertas atuais, esta ordem poderá resultar em uma alavancagem inválida na sua posição. Feche algumas ou todas as ordens que seriam executadas antes desta ou reduza o tamanho de suas ordens.", "ORDER_WOULD_FLIP_POSITION": "Esta ordem mudaria ou aumentaria sua posição. Desmarque a opção Apenas redução ou reduza o tamanho da ordem.", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "O preço de disparo está muito próximo do preço de liquidação — esta ordem pode não ser executada totalmente antes de ser liquidada. Digite um preço de disparo acima de ${TRIGGER_PRICE_LIMIT} ou use uma ordem limite de stop.", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "O preço de disparo está muito próximo do preço de liquidação — esta ordem pode não ser executada totalmente antes de ser liquidada. Digite um preço de disparo acima de {TRIGGER_PRICE_LIMIT} ou use uma ordem limite de stop.", "TAKER_FEE_INVALID": "Suas taxas podem ter sido alteradas. Atualize o aplicativo e tente novamente.", "TRIGGER_MUST_ABOVE_INDEX_PRICE": "Seu preço de disparo precisa estar acima do preço do oráculo atual: {INDEX_PRICE}{INDEX_PRICE}.", "TRIGGER_MUST_BELOW_INDEX_PRICE": "Seu preço de disparo precisa estar abaixo do preço de oráculo {INDEX_PRICE}atual: ", diff --git a/config/localization/tr/app.json b/config/localization/tr/app.json index c77bc57a5..c7be0b6f4 100644 --- a/config/localization/tr/app.json +++ b/config/localization/tr/app.json @@ -1974,7 +1974,7 @@ "BRACKET_ORDER_TAKE_PROFIT_ABOVE_LIQUIDATION_PRICE": "Kâr alma fiyatınız tasfiye fiyatınıza çok yakın; kâr alma emriniz tasfiyeniz gerçekleşmeden önce tamamen yürütülemeyebilir. Lütfen {TRIGGER_PRICE_LIMIT}$ üzerinde bir tetikleme fiyatı girin.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_EXPECTED_PRICE": "Kâr alma tetikleme fiyatınız piyasa emrinin beklenen fiyatı olan {EXPECTED_PRICE}$ altında olmalıdır.", "BRACKET_ORDER_TAKE_PROFIT_BELOW_LIQUIDATION_PRICE": "Kâr alma fiyatınız tasfiye fiyatınıza çok yakın; kâr alma emriniz tasfiyeniz gerçekleşmeden önce tamamen yürütülemeyebilir. Lütfen {TRIGGER_PRICE_LIMIT}$ altında bir tetikleme fiyatı girin.", - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Tetikleme fiyatınız tasfiye fiyatınıza çok yakın; bu talimat tasfiyeniz gerçekleşmeden önce tamamen yürütülemeyebilir. Lütfen {TRIGGER_PRICE_LIMIT}$ altında bir tetikleme fiyatı girin veya bir Durdurma Limiti Emri kullanın.", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Tetikleme fiyatınız tasfiye fiyatınıza çok yakın; bu talimat tasfiyeniz gerçekleşmeden önce tamamen yürütülemeyebilir. Lütfen {TRIGGER_PRICE_LIMIT} altında bir tetikleme fiyatı girin veya bir Durdurma Limiti Emri kullanın.", "INVALID_LARGE_POSITION_LEVERAGE": "Bu yatırım işlemi, pozisyonunuz üzerinde geçersiz bir kaldıraç oluşturacaktır. Riski sınırlamak için, daha büyük pozisyonlar daha düşük maksimum kaldıraç oranlarına sahiptir.", "INVALID_NEW_ACCOUNT_MARGIN_USAGE": "Bu yatırım işlemi, hesabınızda %100 marj kullanımı ile sonuçlanır.", "INVALID_NEW_POSITION_LEVERAGE": "Bu yatırım işlemi, pozisyonunuz üzerinde geçersiz bir kaldıraç oluşturacaktır.", @@ -1993,7 +1993,7 @@ "ORDER_SIZE_BELOW_MIN_SIZE": "Sipariş büyüklüğünüz {MIN_SIZE} {SYMBOL} için minimum emir boyutunun altındadır", "ORDER_WITH_CURRENT_ORDERS_INVALID": "Mevcut açık emirleriniz göz önüne alındığında, bu emir pozisyonunuz üzerinde geçersiz bir kaldıraç oluşturabilir. Lütfen bu emir öncesinde karşılanacak bazı veya tüm emirleri kapatın veya emir boyutunuzu azaltın.", "ORDER_WOULD_FLIP_POSITION": "Bu talimat pozisyonunuzu yönünü değiştirecek veya miktarını artıracaktır. Lütfen Yalnızca Azalt özelliğini kaldırın veya talimat büyüklüğünüzü azaltın.", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Tetikleme fiyatınız tasfiye fiyatınıza çok yakın; bu talimat tasfiyeniz gerçekleşmeden önce tamamen yürütülemeyebilir. Lütfen {TRIGGER_PRICE_LIMIT}$ üzerinde bir tetikleme fiyatı girin veya bir Durdurma Limiti Emri kullanın.", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "Tetikleme fiyatınız tasfiye fiyatınıza çok yakın; bu talimat tasfiyeniz gerçekleşmeden önce tamamen yürütülemeyebilir. Lütfen {TRIGGER_PRICE_LIMIT} üzerinde bir tetikleme fiyatı girin veya bir Durdurma Limiti Emri kullanın.", "TAKER_FEE_INVALID": "Ücret oranlarınız değişmiş olabilir. Lütfen uygulamayı yenileyin ve tekrar deneyin.", "TRIGGER_MUST_ABOVE_INDEX_PRICE": "Tetikleme fiyatınız mevcut oracle fiyatının üstünde olmalıdır: {INDEX_PRICE}.", "TRIGGER_MUST_BELOW_INDEX_PRICE": "Tetikleme fiyatınız mevcut oracle fiyatının altında olmalıdır: {INDEX_PRICE}.", diff --git a/config/localization/zh-CN/app.json b/config/localization/zh-CN/app.json index c04997e37..d503c4648 100644 --- a/config/localization/zh-CN/app.json +++ b/config/localization/zh-CN/app.json @@ -1990,7 +1990,7 @@ "BRACKET_ORDER_TAKE_PROFIT_ABOVE_LIQUIDATION_PRICE": "您的止盈触发价太接近清算价 - 在被清算之前，止盈单可能无法完全执行。请输入高于${TRIGGER_PRICE_LIMIT}的触发价。", "BRACKET_ORDER_TAKE_PROFIT_BELOW_EXPECTED_PRICE": "您的止盈触发价必须低于市价单的预期价格：${EXPECTED_PRICE}。", "BRACKET_ORDER_TAKE_PROFIT_BELOW_LIQUIDATION_PRICE": "您的止盈触发价太接近清算价 - 在被清算之前，止盈单可能无法完全执行。请输入低于${TRIGGER_PRICE_LIMIT}的触发价。", - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "您的触发价太接近清算价 - 在被清算之前，此订单可能无法完全执行。请输入低于${TRIGGER_PRICE_LIMIT}的触发价或使用止损限价单。", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "您的触发价太接近清算价 - 在被清算之前，此订单可能无法完全执行。请输入低于{TRIGGER_PRICE_LIMIT}的触发价或使用止损限价单。", "INVALID_LARGE_POSITION_LEVERAGE": "此交易将导致您的头寸杠杆无效。为限制风险，较大头寸的最大杠杆率较低。", "INVALID_NEW_ACCOUNT_MARGIN_USAGE": "此交易将导致您的账户使用超过100%的保证金。", "INVALID_NEW_POSITION_LEVERAGE": "此交易将导致您的头寸杠杆无效。", @@ -2009,7 +2009,7 @@ "ORDER_SIZE_BELOW_MIN_SIZE": "您的订单数量低于最小订单数量{MIN_SIZE} {SYMBOL}", "ORDER_WITH_CURRENT_ORDERS_INVALID": "根据您当前的未结订单，此订单可能会导致您头寸的杠杆无效。请关闭在此订单之前可以全部成交的部分或全部订单，或减小订单数量。", "ORDER_WOULD_FLIP_POSITION": "此订单将翻转或增加您的头寸。请取消勾选“只减仓”或“减少您的订单数量”。", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "您的触发价太接近清算价 - 在被清算之前，此订单可能无法完全执行。请输入高于${TRIGGER_PRICE_LIMIT}的触发价或使用止损限价单。", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "您的触发价太接近清算价 - 在被清算之前，此订单可能无法完全执行。请输入高于{TRIGGER_PRICE_LIMIT}的触发价或使用止损限价单。", "TAKER_FEE_INVALID": "您的费率可能已变更。请刷新应用，然后重试。", "TRIGGER_MUST_ABOVE_INDEX_PRICE": "您的触发价格必须超过当前预言机价格：{INDEX_PRICE}。", "TRIGGER_MUST_BELOW_INDEX_PRICE": "您的触发价格必须低于当前预言机价格：{INDEX_PRICE}。", diff --git a/config/localizations_native/ja/app.json b/config/localizations_native/ja/app.json index 12aca348d..8658dbac4 100644 --- a/config/localizations_native/ja/app.json +++ b/config/localizations_native/ja/app.json @@ -422,10 +422,10 @@ }, "ERRORS": { "TRADE_BOX": { - "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "トリガー価格が清算価格に近すぎます。この注文は清算前に完全に執行されない可能性があります。${TRIGGER_PRICE_LIMIT}を下回るトリガー価格を入力するか、ストップリミットオーダーを使用してください。", + "BUY_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "トリガー価格が清算価格に近すぎます。この注文は清算前に完全に執行されない可能性があります。{TRIGGER_PRICE_LIMIT}を下回るトリガー価格を入力するか、ストップリミットオーダーを使用してください。", "MARKET_ORDER_CLOSE_POSITION_ONLY": "{SYMBOL}のポジションをクローズ、または減らすことのみ可能です。", "GEO_LOCATION_RESTRICTED": "パーペチュアルは、米国または制限を受けている地域に居住している自然人、またはそうした地域に拠点を置いて法人化しているか、登録代理人を置いている企業は利用できません。 詳細は利用規約をご参照ください。", - "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "トリガー価格が清算価格に近すぎます。この注文は清算前に完全に執行されない可能性があります。${TRIGGER_PRICE_LIMIT}を上回るトリガー価格を入力するか、ストップリミットオーダーを使用してください。", + "SELL_TRIGGER_TOO_CLOSE_TO_LIQUIDATION_PRICE": "トリガー価格が清算価格に近すぎます。この注文は清算前に完全に執行されない可能性があります。{TRIGGER_PRICE_LIMIT}を上回るトリガー価格を入力するか、ストップリミットオーダーを使用してください。", "CONNECT_WALLET_TO_TRADE": "ウォレットを取引に接続します。", "DEPOSIT_TO_TRADE": "取引のために入金します。" } diff --git a/package-lock.json b/package-lock.json index c89c6b919..4a54737e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.70", + "version": "1.1.71", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.70", + "version": "1.1.71", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index bc1cbccae..dc91c7a9d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.70", + "version": "1.1.71", "description": "v4 localization", "main": "index.ts", "scripts": { From ee87b497b7f1afa264862a2fa687f87e655e29a3 Mon Sep 17 00:00:00 2001 From: Jared Vu Date: Fri, 26 Apr 2024 11:14:18 -0700 Subject: [PATCH 07/18] v1.1.72: Add new broadcast error and order removal reason (#417) * Add new broadcast error and order removal reason * remove . --- config/localization/en/app.json | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 3d16981ee..04d725084 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1249,6 +1249,7 @@ "ORDER_REMOVAL_REASON_UNDERCOLLATERALIZED": "The order was removed due to being undercollateralized.", "ORDER_REMOVAL_REASON_UNSPECIFIED": "Unspecified error.", "ORDER_REMOVAL_REASON_USER_CANCELED": "The order was canceled by a user.", + "ORDER_REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS": "The order has been removed since filling it would lead to the subaccount violating isolated subaccount constraints.", "ORDER_TYPE": "Order type", "ORDERBOOK": "Order book", "ORDERBOOK_ASK_PRICE": "Ask Price", @@ -1968,6 +1969,7 @@ "BROADCAST_ERROR_2001": "Reduce-only orders cannot increase the position size", "BROADCAST_ERROR_2002": "Reduce-only orders cannot change the position side", "BROADCAST_ERROR_2003": "Post-only order would cross one or more maker orders", + "BROADCAST_ERROR_2005": "Order would violate isolated subaccount constraints", "BROADCAST_ERROR_3000": "Invalid order flags", "BROADCAST_ERROR_3001": "Invalid order goodTilBlockTime", "BROADCAST_ERROR_3002": "Stateful orders cannot require immediate execution", diff --git a/package-lock.json b/package-lock.json index 4a54737e5..37328f5d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.71", + "version": "1.1.72", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.71", + "version": "1.1.72", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index dc91c7a9d..b1ae2cb11 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.71", + "version": "1.1.72", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index 826eddeec..8092f6b7f 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1406,6 +1406,7 @@ export const APP_STRING_KEYS = { ORDER_REMOVAL_REASON_UNDERCOLLATERALIZED: 'APP.TRADE.ORDER_REMOVAL_REASON_UNDERCOLLATERALIZED', ORDER_REMOVAL_REASON_UNSPECIFIED: 'APP.TRADE.ORDER_REMOVAL_REASON_UNSPECIFIED', ORDER_REMOVAL_REASON_USER_CANCELED: 'APP.TRADE.ORDER_REMOVAL_REASON_USER_CANCELED', + ORDER_REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS: 'APP.TRADE.ORDER_REMOVAL_REASON_VIOLATES_ISOLATED_SUBACCOUNT_CONSTRAINTS', ORDER_TYPE: 'APP.TRADE.ORDER_TYPE', PARTIALLY_FILLED: 'APP.TRADE.PARTIALLY_FILLED', PAYMENT: 'APP.TRADE.PAYMENT', @@ -1613,6 +1614,7 @@ export const ERRORS_STRING_KEYS = { BROADCAST_ERROR_2001: 'ERRORS.BROADCAST_ERROR_2001', BROADCAST_ERROR_2002: 'ERRORS.BROADCAST_ERROR_2002', BROADCAST_ERROR_2003: 'ERRORS.BROADCAST_ERROR_2003', + BROADCAST_ERROR_2005: 'ERRORS.BROADCAST_ERROR_2005', BROADCAST_ERROR_3000: 'ERRORS.BROADCAST_ERROR_3000', BROADCAST_ERROR_3001: 'ERRORS.BROADCAST_ERROR_3001', BROADCAST_ERROR_3002: 'ERRORS.BROADCAST_ERROR_3002', From 3bdfc6610958eb579bc53b036bff6a47050c8dfb Mon Sep 17 00:00:00 2001 From: moo-onthelawn <70078372+moo-onthelawn@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:01:44 -0400 Subject: [PATCH 08/18] Add translation for actions (#418) * actions * forgot to generate --- config/localization/en/app.json | 1 + package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 04d725084..363a88aa0 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -43,6 +43,7 @@ "ACCOUNT": "Account", "ACKNOWLEDGEMENT": "Acknowledgement", "ACTION": "Action", + "ACTIONS": "Actions", "ACTIVE": "Active", "ADDING": "Adding", "ADDRESS": "Address", diff --git a/package-lock.json b/package-lock.json index 37328f5d5..233c00edd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.72", + "version": "1.1.73", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.72", + "version": "1.1.73", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index b1ae2cb11..eb0b3094e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.72", + "version": "1.1.73", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index 8092f6b7f..7d3971e63 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1,6 +1,6 @@ // !! GENERATED FILE - DO NOT EDIT -// Generated from ../config/localization/en/app.json using codegen_localization_app.swift +// Generated from ../config/localization/en/app.json using ./codegen_localization_app.swift export const APP_STRING_KEYS = { @@ -246,6 +246,7 @@ export const APP_STRING_KEYS = { ACCOUNT_LEVERAGE: 'APP.GENERAL.ACCOUNT_LEVERAGE', ACKNOWLEDGEMENT: 'APP.GENERAL.ACKNOWLEDGEMENT', ACTION: 'APP.GENERAL.ACTION', + ACTIONS: 'APP.GENERAL.ACTIONS', ACTIVE: 'APP.GENERAL.ACTIVE', ADDING: 'APP.GENERAL.ADDING', ADDRESS: 'APP.GENERAL.ADDRESS', From 5cbe8a6d22eba57a98f1f950fbf2d1bbdf8ca25f Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:41:10 -0400 Subject: [PATCH 09/18] feat: deposit ui revamp (#419) * l10n for deposite ui revampe strings * 1.1.74 --- config/localization/en/app.json | 1 + config/localization/en/tooltips.json | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 1 + scripts/generated/tooltips.ts | 2 ++ 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 363a88aa0..b3f51f18a 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -932,6 +932,7 @@ "GASLESS_DEPOSITS_SUBJECT_TO_RULES": "Gasless deposits are subject to these rules", "GASLESS_DEPOSITS_TEMPORARILY_DISABLED": "Gasless deposits are temporarily unavailable. Don't worry, they'll be back soon!", "GASLESS_ETH_DEPOSITS": "Gasless deposits are not available for ETH. You can convert your ETH to WETH on {1INCH_WETH_LINK} or {UNISWAP_WETH_LINK} and use WETH gasless deposits, or directly deposit ETH by paying your own gas costs.", + "LOWEST_FEE_DEPOSITS": "USDC deposits from {LOWEST_FEE_TOKENS_TOOLTIP} have the lowest fees. Other deposits may have additional third-party fees.", "MAX_SLIPPAGE": "Max Slippage", "MINIMUM_DEPOSIT_AMOUNT": "Minimum Deposit Amount", "MINIMUM_DEPOSIT_MET": "Nice! Your deposit meets the gasless deposit minimum of {GASLESS_DEPOSIT_THRESHOLD} {SYMBOL}. dYdX will cover the gas fees for this deposit.", diff --git a/config/localization/en/tooltips.json b/config/localization/en/tooltips.json index de658ccd2..c9bdcb5de 100644 --- a/config/localization/en/tooltips.json +++ b/config/localization/en/tooltips.json @@ -256,6 +256,10 @@ "TITLE": "Unavailable", "BODY": "Gasless deposits are temporarily unavailable. Don't worry, they'll be back soon!" }, + "GAS_FEES_DEPOSIT":{ + "TITLE": "Gas Fees", + "BODY": "Gas fees are transaction fees on the source chain, in this case {SOURCE_CHAIN}." + }, "GASLESS_DEPOSITS": { "TITLE": "Gasless Deposits", "BODY": "dYdX will cover your gas fees if you deposit {GASLESS_DEPOSIT_THRESHOLD} {SYMBOL} or more. You are eligible for one gasless deposit every three days. Gasless deposits are subject to rules." diff --git a/package-lock.json b/package-lock.json index 233c00edd..c01124d1c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.73", + "version": "1.1.74", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.73", + "version": "1.1.74", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index eb0b3094e..87a91b06d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.73", + "version": "1.1.74", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index 7d3971e63..5d5c63659 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -84,6 +84,7 @@ export const APP_STRING_KEYS = { GASLESS_DEPOSITS_SUBJECT_TO_RULES: 'APP.DEPOSIT_MODAL.GASLESS_DEPOSITS_SUBJECT_TO_RULES', GASLESS_DEPOSITS_TEMPORARILY_DISABLED: 'APP.DEPOSIT_MODAL.GASLESS_DEPOSITS_TEMPORARILY_DISABLED', GASLESS_ETH_DEPOSITS: 'APP.DEPOSIT_MODAL.GASLESS_ETH_DEPOSITS', + LOWEST_FEE_DEPOSITS: 'APP.DEPOSIT_MODAL.LOWEST_FEE_DEPOSITS', MAX_SLIPPAGE: 'APP.DEPOSIT_MODAL.MAX_SLIPPAGE', MINIMUM_DEPOSIT_AMOUNT: 'APP.DEPOSIT_MODAL.MINIMUM_DEPOSIT_AMOUNT', MINIMUM_DEPOSIT_MET: 'APP.DEPOSIT_MODAL.MINIMUM_DEPOSIT_MET', diff --git a/scripts/generated/tooltips.ts b/scripts/generated/tooltips.ts index 6674129da..bde66df2e 100644 --- a/scripts/generated/tooltips.ts +++ b/scripts/generated/tooltips.ts @@ -12,6 +12,8 @@ export const TOOLTIP_STRING_KEYS = { DISABLED_GASLESS_DEPOSITS_TITLE: 'TOOLTIPS.DEPOSIT.DISABLED_GASLESS_DEPOSITS.TITLE', GASLESS_DEPOSITS_BODY: 'TOOLTIPS.DEPOSIT.GASLESS_DEPOSITS.BODY', GASLESS_DEPOSITS_TITLE: 'TOOLTIPS.DEPOSIT.GASLESS_DEPOSITS.TITLE', + GAS_FEES_DEPOSIT_BODY: 'TOOLTIPS.DEPOSIT.GAS_FEES_DEPOSIT.BODY', + GAS_FEES_DEPOSIT_TITLE: 'TOOLTIPS.DEPOSIT.GAS_FEES_DEPOSIT.TITLE', MINIMUM_DEPOSIT_AMOUNT_BODY: 'TOOLTIPS.DEPOSIT.MINIMUM_DEPOSIT_AMOUNT.BODY', MINIMUM_DEPOSIT_AMOUNT_TITLE: 'TOOLTIPS.DEPOSIT.MINIMUM_DEPOSIT_AMOUNT.TITLE', SWAP_BODY: 'TOOLTIPS.DEPOSIT.SWAP.BODY', From ef4259bab28c3e2a778bf2dd54c9674354c23266 Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:43:46 -0400 Subject: [PATCH 10/18] chore: readme updates for standard practices (#413) --- readme.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/readme.md b/readme.md index 8fe50c322..c09638663 100644 --- a/readme.md +++ b/readme.md @@ -33,6 +33,28 @@ Each of them contains a list of language folders, such as Each folder contains either a list of JSON files ending .json, or text files ending .txt +# Syntax and Structure + +Text that goes within tooltip pop ups should go in the config/localization/{language}/tooltips.json +Other text goes to config/localization/{language}/app.json + +Within each json file, find the component/view that your text belongs in (or create a new key for it) and your text. + +Typically, tooltips will have both `TITLE` and `BODY` text. + +## Parameters + +If you need to inject dynamic text or other values, use {} to notate an input parameter. + +Ex: +``` +"SOME_TEXT": "A zebra has {ZEBRA_PATTERN} stripes" +``` + +The term within the {} will be the name of the variable used to inject your dynamic values. +Parameters are quite flexible - you can even insert react components (as long as they can be rendered properly). + + # Work with Github The "main" branch cannot be written directly. You must create a separate branch, make the changes there, commit and push the branch, and then create a PR (Push request) to "main" From a85b7b49ad838dabb6ed85e1af1ddddd19a3a704 Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Fri, 26 Apr 2024 18:25:03 -0400 Subject: [PATCH 11/18] feat: add lowest fee deposits text (#421) * add lowest fee deposits text * generate * 1.1.75 --- config/localization/en/tooltips.json | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/tooltips.ts | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config/localization/en/tooltips.json b/config/localization/en/tooltips.json index c9bdcb5de..746e901bf 100644 --- a/config/localization/en/tooltips.json +++ b/config/localization/en/tooltips.json @@ -264,6 +264,10 @@ "TITLE": "Gasless Deposits", "BODY": "dYdX will cover your gas fees if you deposit {GASLESS_DEPOSIT_THRESHOLD} {SYMBOL} or more. You are eligible for one gasless deposit every three days. Gasless deposits are subject to rules." }, + "LOWEST_FEE_DEPOSITS": { + "TITLE": "Lowest Fee Deposits", + "BODY": "USDC Deposits on {LOWEST_FEE_TOKEN_NAMES} have the lowest fees." + }, "MINIMUM_DEPOSIT_AMOUNT": { "TITLE": "Minimum Deposit Amount", "BODY": "Inclusive of any slippage that may occur due to liquidity changes while the bridge is in progress" diff --git a/package-lock.json b/package-lock.json index c01124d1c..c63792358 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.74", + "version": "1.1.75", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.74", + "version": "1.1.75", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index 87a91b06d..9d7317831 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.74", + "version": "1.1.75", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/tooltips.ts b/scripts/generated/tooltips.ts index bde66df2e..398d7122b 100644 --- a/scripts/generated/tooltips.ts +++ b/scripts/generated/tooltips.ts @@ -14,6 +14,8 @@ export const TOOLTIP_STRING_KEYS = { GASLESS_DEPOSITS_TITLE: 'TOOLTIPS.DEPOSIT.GASLESS_DEPOSITS.TITLE', GAS_FEES_DEPOSIT_BODY: 'TOOLTIPS.DEPOSIT.GAS_FEES_DEPOSIT.BODY', GAS_FEES_DEPOSIT_TITLE: 'TOOLTIPS.DEPOSIT.GAS_FEES_DEPOSIT.TITLE', + LOWEST_FEE_DEPOSITS_BODY: 'TOOLTIPS.DEPOSIT.LOWEST_FEE_DEPOSITS.BODY', + LOWEST_FEE_DEPOSITS_TITLE: 'TOOLTIPS.DEPOSIT.LOWEST_FEE_DEPOSITS.TITLE', MINIMUM_DEPOSIT_AMOUNT_BODY: 'TOOLTIPS.DEPOSIT.MINIMUM_DEPOSIT_AMOUNT.BODY', MINIMUM_DEPOSIT_AMOUNT_TITLE: 'TOOLTIPS.DEPOSIT.MINIMUM_DEPOSIT_AMOUNT.TITLE', SWAP_BODY: 'TOOLTIPS.DEPOSIT.SWAP.BODY', From 39758fa2b9c53c1d34c188c788c94ead393ea8ec Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Mon, 29 Apr 2024 11:25:16 -0400 Subject: [PATCH 12/18] v1.76 deposit UI revamp text (#422) * deposit bridge fees * 1.1.76 * capitalization fix --- config/localization/en/tooltips.json | 6 +++++- package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/tooltips.ts | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/localization/en/tooltips.json b/config/localization/en/tooltips.json index 746e901bf..93df53d29 100644 --- a/config/localization/en/tooltips.json +++ b/config/localization/en/tooltips.json @@ -252,6 +252,10 @@ "TITLE": "Available", "BODY": "You are eligible! Deposit at least {GASLESS_DEPOSIT_THRESHOLD} {SYMBOL} to enable gasless deposit." }, + "BRIDGE_FEES_DEPOSIT":{ + "TITLE": "Bridge Fees", + "BODY": "Bridge fees are paid to other protocols in order to complete the bridging, transferring, and swapping required for this deposit." + }, "DISABLED_GASLESS_DEPOSITS": { "TITLE": "Unavailable", "BODY": "Gasless deposits are temporarily unavailable. Don't worry, they'll be back soon!" @@ -266,7 +270,7 @@ }, "LOWEST_FEE_DEPOSITS": { "TITLE": "Lowest Fee Deposits", - "BODY": "USDC Deposits on {LOWEST_FEE_TOKEN_NAMES} have the lowest fees." + "BODY": "USDC deposits on {LOWEST_FEE_TOKEN_NAMES} have the lowest fees." }, "MINIMUM_DEPOSIT_AMOUNT": { "TITLE": "Minimum Deposit Amount", diff --git a/package-lock.json b/package-lock.json index c63792358..863a8c1eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.75", + "version": "1.1.76", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.75", + "version": "1.1.76", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index 9d7317831..720581cdb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.75", + "version": "1.1.76", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/tooltips.ts b/scripts/generated/tooltips.ts index 398d7122b..80a8b5aa6 100644 --- a/scripts/generated/tooltips.ts +++ b/scripts/generated/tooltips.ts @@ -8,6 +8,8 @@ export const TOOLTIP_STRING_KEYS = { AVAILABLE_GASLESS_DEPOSITS_BODY: 'TOOLTIPS.DEPOSIT.AVAILABLE_GASLESS_DEPOSITS.BODY', AVAILABLE_GASLESS_DEPOSITS_TITLE: 'TOOLTIPS.DEPOSIT.AVAILABLE_GASLESS_DEPOSITS.TITLE', + BRIDGE_FEES_DEPOSIT_BODY: 'TOOLTIPS.DEPOSIT.BRIDGE_FEES_DEPOSIT.BODY', + BRIDGE_FEES_DEPOSIT_TITLE: 'TOOLTIPS.DEPOSIT.BRIDGE_FEES_DEPOSIT.TITLE', DISABLED_GASLESS_DEPOSITS_BODY: 'TOOLTIPS.DEPOSIT.DISABLED_GASLESS_DEPOSITS.BODY', DISABLED_GASLESS_DEPOSITS_TITLE: 'TOOLTIPS.DEPOSIT.DISABLED_GASLESS_DEPOSITS.TITLE', GASLESS_DEPOSITS_BODY: 'TOOLTIPS.DEPOSIT.GASLESS_DEPOSITS.BODY', From e71854f094409838e199e5338e65467362d96abc Mon Sep 17 00:00:00 2001 From: aleka Date: Tue, 30 Apr 2024 12:45:20 -0400 Subject: [PATCH 13/18] place order failed strings (#423) * add place order failed strings * 1.1.77 --- config/localization/en/app.json | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index b3f51f18a..35ffa3dde 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1278,6 +1278,8 @@ "PLACE_ORDER": "Place {ORDER}", "PLACE_SIMPLE_TRADE": "Place a market order for {NAME}", "PLACE_TRADE": "Place a trade", + "PLACE_ORDER_FAILED": "Order failed", + "PLACE_ORDER_FAILED_DESCRIPTION": "Your trade was unsuccessful.", "PLACING_ORDER_DESCRIPTION": "Your trade is currently in progress.", "PLACING_ORDER_TITLE": "Placing order", "POSITION_COLLATERAL": "Position Collateral", diff --git a/package-lock.json b/package-lock.json index 863a8c1eb..af1b861f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.76", + "version": "1.1.77", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.76", + "version": "1.1.77", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index 720581cdb..9e04fc954 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.76", + "version": "1.1.77", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index 5d5c63659..6dec1f05f 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1,6 +1,6 @@ // !! GENERATED FILE - DO NOT EDIT -// Generated from ../config/localization/en/app.json using ./codegen_localization_app.swift +// Generated from ../config/localization/en/app.json using codegen_localization_app.swift export const APP_STRING_KEYS = { @@ -1417,6 +1417,8 @@ export const APP_STRING_KEYS = { PLACE_LIMIT_ORDER: 'APP.TRADE.PLACE_LIMIT_ORDER', PLACE_MARKET_ORDER: 'APP.TRADE.PLACE_MARKET_ORDER', PLACE_ORDER: 'APP.TRADE.PLACE_ORDER', + PLACE_ORDER_FAILED: 'APP.TRADE.PLACE_ORDER_FAILED', + PLACE_ORDER_FAILED_DESCRIPTION: 'APP.TRADE.PLACE_ORDER_FAILED_DESCRIPTION', PLACE_SIMPLE_TRADE: 'APP.TRADE.PLACE_SIMPLE_TRADE', PLACE_STOP_LIMIT_ORDER: 'APP.TRADE.PLACE_STOP_LIMIT_ORDER', PLACE_STOP_MARKET_ORDER: 'APP.TRADE.PLACE_STOP_MARKET_ORDER', From ecb9f0c1baca6f1411dfb63319edc7c2c1c95464 Mon Sep 17 00:00:00 2001 From: moo-onthelawn <70078372+moo-onthelawn@users.noreply.github.com> Date: Wed, 1 May 2024 17:21:47 -0400 Subject: [PATCH 14/18] chore(sltp): add text for sl/tp order revamp notification (#424) * localization text * 1.1.78 * fix english --- config/localization_notifications/en/app.json | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 2 +- scripts/generated/notifications.ts | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/localization_notifications/en/app.json b/config/localization_notifications/en/app.json index 30a00a651..1cc3100b9 100644 --- a/config/localization_notifications/en/app.json +++ b/config/localization_notifications/en/app.json @@ -4,6 +4,10 @@ "TITLE": "Reward Earned", "BODY": "You have earned {BLOCK_REWARD_AMOUNT} {TOKEN_NAME} trading reward." }, + "CONDITIONAL_ORDERS_REVAMP": { + "TITLE": "Refreshed conditional order experience!", + "BODY": "Conditional orders on dYdX Chain have been completely revamped! Now more reliable, intuitive, and performant than ever. Check out more details {TWITTER_LINK}." + }, "DELEVERAGED": { "TITLE": "Position Deleveraged", "BODY": "Your {SIDE} position on {MARKET} has been deleveraged." diff --git a/package-lock.json b/package-lock.json index af1b861f2..57d0eceaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.77", + "version": "1.1.78", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.77", + "version": "1.1.78", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index 9e04fc954..2bd6fd435 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.77", + "version": "1.1.78", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index 6dec1f05f..19ee63154 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1,6 +1,6 @@ // !! GENERATED FILE - DO NOT EDIT -// Generated from ../config/localization/en/app.json using codegen_localization_app.swift +// Generated from ../config/localization/en/app.json using ./codegen_localization_app.swift export const APP_STRING_KEYS = { diff --git a/scripts/generated/notifications.ts b/scripts/generated/notifications.ts index 718e69b3b..14890e234 100644 --- a/scripts/generated/notifications.ts +++ b/scripts/generated/notifications.ts @@ -5,6 +5,8 @@ export const NOTIFICATIONS_STRING_KEYS = { BLOCK_REWARD_BODY: 'NOTIFICATIONS.BLOCK_REWARD.BODY', BLOCK_REWARD_TITLE: 'NOTIFICATIONS.BLOCK_REWARD.TITLE', + CONDITIONAL_ORDERS_REVAMP_BODY: 'NOTIFICATIONS.CONDITIONAL_ORDERS_REVAMP.BODY', + CONDITIONAL_ORDERS_REVAMP_TITLE: 'NOTIFICATIONS.CONDITIONAL_ORDERS_REVAMP.TITLE', DELEVERAGED_BODY: 'NOTIFICATIONS.DELEVERAGED.BODY', DELEVERAGED_TITLE: 'NOTIFICATIONS.DELEVERAGED.TITLE', DEPOSIT_SUCCESS_BODY: 'NOTIFICATIONS.DEPOSIT_SUCCESS.BODY', From ded7a8f0f494cd8c4a16cef9f6775f82f8161ef9 Mon Sep 17 00:00:00 2001 From: aleka Date: Wed, 1 May 2024 17:32:10 -0400 Subject: [PATCH 15/18] add submitting string (#425) * add submitting * 1.1.79 --- config/localization/en/app.json | 1 + package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 35ffa3dde..ccccd0018 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1317,6 +1317,7 @@ "STOP_PRICE_ABBREVIATED": "Stop", "STOP_PRICE": "Stop Price", "SUBMITTED": "Submitted", + "SUBMITTING": "Submitting", "TAKE_PROFIT_LIMIT_DESCRIPTION": "A take profit limit order converts to a traditional limit order whenever the oracle price or last trade price crosses your trigger price.", "TAKE_PROFIT_LIMIT_SHORT": "Take Profit Limit", "TAKE_PROFIT_LIMIT": "Take Profit Limit", diff --git a/package-lock.json b/package-lock.json index 57d0eceaa..4c1728d3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.78", + "version": "1.1.79", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.78", + "version": "1.1.79", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index 2bd6fd435..fd7d805fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.78", + "version": "1.1.79", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index 19ee63154..e669a600f 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1,6 +1,6 @@ // !! GENERATED FILE - DO NOT EDIT -// Generated from ../config/localization/en/app.json using ./codegen_localization_app.swift +// Generated from ../config/localization/en/app.json using codegen_localization_app.swift export const APP_STRING_KEYS = { @@ -1463,6 +1463,7 @@ export const APP_STRING_KEYS = { STOP_PRICE: 'APP.TRADE.STOP_PRICE', STOP_PRICE_ABBREVIATED: 'APP.TRADE.STOP_PRICE_ABBREVIATED', SUBMITTED: 'APP.TRADE.SUBMITTED', + SUBMITTING: 'APP.TRADE.SUBMITTING', TAKER: 'APP.TRADE.TAKER', TAKER_FEE: 'APP.TRADE.TAKER_FEE', TAKE_PROFIT: 'APP.TRADE.TAKE_PROFIT', From ba29e55386b1c8bf095373859ac0188000edee52 Mon Sep 17 00:00:00 2001 From: aleka Date: Wed, 1 May 2024 18:07:44 -0400 Subject: [PATCH 16/18] nits: add periods to broadcast errors (#426) * add periods to broadcast errors * 1.1.80 --- config/localization/en/app.json | 30 +++++++++++++++--------------- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index ccccd0018..68b121b9e 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1970,21 +1970,21 @@ "V4_TESTNET_IMPERATOR": "V4 Testnet 3(Imperator)" }, "ERRORS": { - "BROADCAST_ERROR_2000": "Fill Or Kill order could not be fully filled", - "BROADCAST_ERROR_2001": "Reduce-only orders cannot increase the position size", - "BROADCAST_ERROR_2002": "Reduce-only orders cannot change the position side", - "BROADCAST_ERROR_2003": "Post-only order would cross one or more maker orders", - "BROADCAST_ERROR_2005": "Order would violate isolated subaccount constraints", - "BROADCAST_ERROR_3000": "Invalid order flags", - "BROADCAST_ERROR_3001": "Invalid order goodTilBlockTime", - "BROADCAST_ERROR_3002": "Stateful orders cannot require immediate execution", - "BROADCAST_ERROR_3003": "The block time is greater than the GoodTilBlockTime of the message", - "BROADCAST_ERROR_3004": "The GoodTilBlockTime of the message is further than StatefulOrderTimeWindow into the future", - "BROADCAST_ERROR_3005": "Existing stateful order has higher-or-equal priority than the new one", - "BROADCAST_ERROR_3006": "Stateful order does not exist", - "BROADCAST_ERROR_3007": "Stateful order collateralization check failed", - "BROADCAST_ERROR_3008": "Stateful order was previously cancelled and therefore cannot be placed", - "BROADCAST_ERROR_3009": "Stateful order was previously removed and therefore cannot be placed", + "BROADCAST_ERROR_2000": "Fill Or Kill order could not be fully filled.", + "BROADCAST_ERROR_2001": "Reduce-only orders cannot increase the position size.", + "BROADCAST_ERROR_2002": "Reduce-only orders cannot change the position side.", + "BROADCAST_ERROR_2003": "Post-only order would cross one or more maker orders.", + "BROADCAST_ERROR_2005": "Order would violate isolated subaccount constraints.", + "BROADCAST_ERROR_3000": "Invalid order flags.", + "BROADCAST_ERROR_3001": "Invalid order goodTilBlockTime.", + "BROADCAST_ERROR_3002": "Stateful orders cannot require immediate execution.", + "BROADCAST_ERROR_3003": "The block time is greater than the GoodTilBlockTime of the message.", + "BROADCAST_ERROR_3004": "The GoodTilBlockTime of the message is further than StatefulOrderTimeWindow into the future.", + "BROADCAST_ERROR_3005": "Existing stateful order has higher-or-equal priority than the new one.", + "BROADCAST_ERROR_3006": "Stateful order does not exist.", + "BROADCAST_ERROR_3007": "Stateful order collateralization check failed.", + "BROADCAST_ERROR_3008": "Stateful order was previously cancelled and therefore cannot be placed.", + "BROADCAST_ERROR_3009": "Stateful order was previously removed and therefore cannot be placed.", "BROADCAST_ERROR_10001": "Subaccount cannot open more orders due to equity tier limit.", "GENERAL": { "RATE_LIMIT_REACHED_ERROR_TITLE": "Rate Limit Reached", diff --git a/package-lock.json b/package-lock.json index 4c1728d3b..39d6053f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.79", + "version": "1.1.80", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.79", + "version": "1.1.80", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index fd7d805fb..fb46f4343 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.79", + "version": "1.1.80", "description": "v4 localization", "main": "index.ts", "scripts": { From ff36c187218d1be99fe75417d2c18314dd443f3f Mon Sep 17 00:00:00 2001 From: Bill Date: Thu, 2 May 2024 08:40:18 -0700 Subject: [PATCH 17/18] Update compliance strings (#428) * Update compliance strings * 1.1.81 --- config/localization/en/app.json | 3 ++- package-lock.json | 2 +- package.json | 2 +- scripts/generated/app.ts | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 68b121b9e..37fc08aa6 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1558,7 +1558,8 @@ "COMPLIANCE_MODAL": { "COMPLIANCE_BODY": "Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use and have not yet completed confirmation of your country of residence and the location from which you are trading, you have been blocked from placing orders other than market orders that reduce your positions.", "COMPLIANCE_BODY_FIRST_OFFENSE_1": "Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use and have not yet completed confirmation of your country of residence and the location from which you are trading, you have been blocked from placing orders other than market orders that reduce your positions.", - "COMPLIANCE_BODY_FIRST_OFFENSE_2": "If you would like to be unblocked, then please confirm (1) your country of residence and (2) the location from which you trade. In the event that you complete the confirmation and your account is unblocked, please be aware that any future violation of our terms of use will result in a permanent ban from the protocol - though your funds are always available for withdrawal.", + "COMPLIANCE_BODY_FIRST_OFFENSE_2": "If you would like to be unblocked, then please confirm (1) your country of residence and (2) your compliance with the Terms of Use. In the event that you complete the confirmation and your account is unblocked, please be aware that any future violation of our terms of use will result in a permanent ban from the protocol - though your funds are always available for withdrawal.", + "COMPLIANCE_ACKNOWLEDGEMENT": "I have read and confirm I am compliant with the Terms of Use, including the prohibition on persons or entities in the United States, Canada, or other restricted jurisdictions.", "COMPLIANCE_REQUEST": "Compliance request", "CONTINUE": "Continue", "COUNTRY_OF_RESIDENCE": "Country of Residence", diff --git a/package-lock.json b/package-lock.json index 39d6053f5..9e99ff43a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.80", + "version": "1.1.81", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index fb46f4343..2f1f48fac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.80", + "version": "1.1.81", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index e669a600f..b07761ecb 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -55,6 +55,7 @@ export const APP_STRING_KEYS = { // COMPLIANCE_MODAL + COMPLIANCE_ACKNOWLEDGEMENT: 'APP.COMPLIANCE_MODAL.COMPLIANCE_ACKNOWLEDGEMENT', COMPLIANCE_BODY: 'APP.COMPLIANCE_MODAL.COMPLIANCE_BODY', COMPLIANCE_BODY_FIRST_OFFENSE_1: 'APP.COMPLIANCE_MODAL.COMPLIANCE_BODY_FIRST_OFFENSE_1', COMPLIANCE_BODY_FIRST_OFFENSE_2: 'APP.COMPLIANCE_MODAL.COMPLIANCE_BODY_FIRST_OFFENSE_2', From 9d075db775efc5aeb97c2fdcbd6e972b9c536615 Mon Sep 17 00:00:00 2001 From: mike-dydx <149746839+mike-dydx@users.noreply.github.com> Date: Fri, 3 May 2024 11:42:52 -0400 Subject: [PATCH 18/18] SL/TP Strings (#427) * add mobile tp/sl copy * Update app.json * Update app.json * bump version * add new geo blocking strings --- config/localization/en/app.json | 9 ++++++++- config/localizations_native/en/app.json | 6 ++++++ package-lock.json | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 37fc08aa6..b48f8a90b 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -187,6 +187,7 @@ "LIVE": "Live", "LONG_POSITION_SHORT": "Long", "LONG_TAIL": "Long-tail", + "LOSS": "Loss", "MAINTENANCE_MARGIN_FRACTION": "Maintenance Margin Fraction", "MAINTENANCE_MARGIN_FRACTION_SHORT": "MMF", "MAKE_ONE_TRADE": "Make 1 trade", @@ -329,6 +330,7 @@ "VIEW_MORE": "View more", "VIEW_OPTIONS": "View options", "VIEW": "View", + "VIEW_ALL": "View all →", "VIEWS": "Views", "VOLUME_30D": "Volume (30d)", "VOTING_LIVE": "Voting live", @@ -1006,6 +1008,8 @@ "LIMIT_PRICE_TOOLTIP": "By identifying a limit price, you are placing a Take Profit Limit Order and/or a Stop Limit Order. Click {DOCUMENTATION_LINK} for more details.", "MULTIPLE_ORDERS_FOUND": "Multiple orders found.", "PRICE_TRIGGERS": "Price triggers", + "PRICE_TRIGGERS_DESCRIPTION": "Minimize losses & secure profits with triggers.", + "EXISTING_ORDERS_REPLACED": "Upon edit, your existing order will be replaced.", "SL_LIMIT": "SL Limit", "SL_PRICE": "SL Price", "STOP_LOSS_TOOLTIP": "Protects against losses by closing a trader’s position once the oracle price crosses the trigger price.", @@ -1119,7 +1123,9 @@ "TRADE": { "ADD_MARGIN": "Add Margin", "ADD_TRIGGERS": "Add trigger(s)", - "ADD_TP_OR_SL": "Add TP | SL", + "ADD_TP_SL": "Add TP | SL", + "ADD_STOP_LOSS": "Add stop loss", + "ADD_TAKE_PROFIT": "Add take profit", "ADJUST_ISOLATED_MARGIN": "Adjust Isolated Margin", "ADJUST_TARGET_LEVERAGE": "Adjust Target Leverage", "ADJUST_TARGET_LEVERAGE_DESCRIPTION": "Adjusting target leverage will not adjust margin until a new order is placed. For more information on target leverage, see {HERE}.", @@ -1222,6 +1228,7 @@ "MODIFY_SIZE_FIELD": "Modify amount", "MODIFY_TRAILING_PERCENT": "Modify trailing %", "MODIFY_TRIGGER_PRICE": "Modify trigger price", + "MULTIPLE_ARROW": "Multiple →", "NET_FUNDING": "Net Funding", "NEXT_FUNDING": "Next Funding", "NEXT_IN": "Next in {TIME}", diff --git a/config/localizations_native/en/app.json b/config/localizations_native/en/app.json index 011118c57..d6a72c540 100644 --- a/config/localizations_native/en/app.json +++ b/config/localizations_native/en/app.json @@ -302,6 +302,12 @@ "CROSS_SIDE": "Change {TOKEN} position to {SIDE}" } }, + "COMPLIANCE": { + "CLOSE_ONLY_TITLE": "Close-only mode", + "CLOSE_ONLY_BODY": "Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use, or have engaged in activity that violates our terms of use, you have been blocked. You have until {DATE} to withdraw your funds before your access to the app is blocked. Please visit the web interface to see next steps. If you believe there has been an error, please email {EMAIL}.", + "PERMANENTLY_BLOCKED_TITLE": "Permanently blocked", + "PERMANENTLY_BLOCKED_BODY": "Because you appear to be a resident of, or trading from, a jurisdiction that violates our terms of use and previously have been given an opportunity to redress circumstances that led to restrictions on your account, you have been permanently blocked. If you believe there has been an error, please email {EMAIL}" + }, "COMPLIANCE_MODAL": { "ACCOUNT_RESTRICTED": "Account Restricted", "COMPLIANCE_REQUIRED": "Compliance Required", diff --git a/package-lock.json b/package-lock.json index 9e99ff43a..77ec0883a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.80", + "version": "1.1.81", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7"