Merge branch 'main' into jv/pml-strings

dydxprotocol · Oct 3, 2024 · 0ccbfe3 · 0ccbfe3
2 parents 68c3945 + 34b6e40
commit 0ccbfe3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/config/localization/en/app.json b/config/localization/en/app.json
@@ -389,6 +389,7 @@
       "TRADING_REWARDS_SUMMARY": "Trading Rewards Summary",
       "TRADING": "Trading",
       "TRADING_ACCOUNT": "Trading Account",
+      "TRADING_ACCOUNT_BALANCE": "Trading Account Balance",
       "TRAILING_STOP_SHORT": "Trailing",
       "TRANSFER_IN": "Transfer In",
       "TRANSFER_OUT": "Transfer Out",
@@ -1670,6 +1671,7 @@
       "MEGAVAULT_FAQS": "MegaVault FAQs",
       "YOUR_ALL_TIME_PNL": "Your All-time P&L",
       "VAULT_THIRTY_DAY_APR": "30d APR",
+      "APR": "{PERCENT} APR",
       "VAULT_THIRTY_DAY_PNL": "30d P&L",
       "YOUR_VAULT_BALANCE": "Your Vault Balance",
       "VIEW_VAULT": "View Vault",
@@ -1697,6 +1699,7 @@
       "PROTOCOL_VAULT": "dYdX Protocol Vault",
       "LOCKED_BALANCE": "Locked Balance",
       "WITHDRAW_TOO_HIGH": "You cannot withdraw more than your vault balance.",
+      "WITHDRAW_TOO_LOW": "Your withdrawal amount is below the $20 minimum withdrawal threshold.",
       "DEPOSIT_TOO_HIGH": "You cannot deposit more than your free collateral.",
       "DEPOSIT_TOO_LOW": "Your deposit amount is below the $20 minimum deposit threshold.",
       "ENTER_AMOUNT_TO_DEPOSIT": "Enter amount to deposit",

diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts
@@ -681,6 +681,7 @@ export const APP_STRING_KEYS = {
     TRADE_NOW: 'APP.GENERAL.TRADE_NOW',
     TRADING: 'APP.GENERAL.TRADING',
     TRADING_ACCOUNT: 'APP.GENERAL.TRADING_ACCOUNT',
+    TRADING_ACCOUNT_BALANCE: 'APP.GENERAL.TRADING_ACCOUNT_BALANCE',
     TRADING_FEE_REDUCTION: 'APP.GENERAL.TRADING_FEE_REDUCTION',
     TRADING_FEE_REDUCTION_DESCRIPTION_2: 'APP.GENERAL.TRADING_FEE_REDUCTION_DESCRIPTION_2',
     TRADING_REWARDS: 'APP.GENERAL.TRADING_REWARDS',
@@ -1845,6 +1846,7 @@ export const APP_STRING_KEYS = {
     ACKNOWLEDGE_HIGH_SLIPPAGE: 'APP.VAULTS.ACKNOWLEDGE_HIGH_SLIPPAGE',
     AMOUNT_TO_DEPOSIT: 'APP.VAULTS.AMOUNT_TO_DEPOSIT',
     AMOUNT_TO_WITHDRAW: 'APP.VAULTS.AMOUNT_TO_WITHDRAW',
+    APR: 'APP.VAULTS.APR',
     AVAILABLE_TO_WITHDRAW: 'APP.VAULTS.AVAILABLE_TO_WITHDRAW',
     CONFIRM_DEPOSIT_CTA: 'APP.VAULTS.CONFIRM_DEPOSIT_CTA',
     CONFIRM_WITHDRAW_CTA: 'APP.VAULTS.CONFIRM_WITHDRAW_CTA',
@@ -1888,6 +1890,7 @@ export const APP_STRING_KEYS = {
     VIEW_MEGAVAULT: 'APP.VAULTS.VIEW_MEGAVAULT',
     VIEW_VAULT: 'APP.VAULTS.VIEW_VAULT',
     WITHDRAW_TOO_HIGH: 'APP.VAULTS.WITHDRAW_TOO_HIGH',
+    WITHDRAW_TOO_LOW: 'APP.VAULTS.WITHDRAW_TOO_LOW',
     YOUR_ALL_TIME_PNL: 'APP.VAULTS.YOUR_ALL_TIME_PNL',
     YOUR_DEPOSITS_AND_WITHDRAWALS: 'APP.VAULTS.YOUR_DEPOSITS_AND_WITHDRAWALS',
     YOUR_VAULT_BALANCE: 'APP.VAULTS.YOUR_VAULT_BALANCE',