From 9c175d9ba90cd9d2fcbd73dde7bf6775393915a7 Mon Sep 17 00:00:00 2001 From: Tyler Date: Fri, 15 Nov 2024 16:24:17 -0500 Subject: [PATCH 1/3] vault-tooltip --- config/localization/en/app.json | 3 +++ package-lock.json | 4 ++-- package.json | 2 +- scripts/generated/app.ts | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 7eb9430eb..ab9b7b044 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1713,6 +1713,9 @@ "YOUR_ALL_TIME_PNL": "Your All-time P&L", "VAULT_THIRTY_DAY_APR": "30d APR", "APR": "{PERCENT} APR", + "EST_APR_PLAIN": "Est. APR", + "APR_PLAN": "APR", + "VAULT_APR_DESCRIPTION": "Vault APR is the annualized return of the vault based on the P&L of the past 30 days.", "VAULT_THIRTY_DAY_PNL": "30d P&L", "YOUR_VAULT_BALANCE": "Your Vault Balance", "VIEW_VAULT": "View Vault", diff --git a/package-lock.json b/package-lock.json index b9507ba39..0867ee096 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.245", + "version": "1.1.246", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.245", + "version": "1.1.246", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index a9f522dd9..9400a429c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.245", + "version": "1.1.246", "description": "v4 localization", "main": "index.ts", "scripts": { diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index ddbaa1980..7c7343215 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1920,6 +1920,7 @@ export const APP_STRING_KEYS = { AMOUNT_TO_DEPOSIT: 'APP.VAULTS.AMOUNT_TO_DEPOSIT', AMOUNT_TO_WITHDRAW: 'APP.VAULTS.AMOUNT_TO_WITHDRAW', APR: 'APP.VAULTS.APR', + APR_PLAN: 'APP.VAULTS.APR_PLAN', AVAILABLE_TO_WITHDRAW: 'APP.VAULTS.AVAILABLE_TO_WITHDRAW', CONFIRM_DEPOSIT_CTA: 'APP.VAULTS.CONFIRM_DEPOSIT_CTA', CONFIRM_WITHDRAW_CTA: 'APP.VAULTS.CONFIRM_WITHDRAW_CTA', @@ -1930,6 +1931,7 @@ export const APP_STRING_KEYS = { ENTER_AMOUNT_TO_WITHDRAW: 'APP.VAULTS.ENTER_AMOUNT_TO_WITHDRAW', ESTIMATED_AMOUNT_RECEIVED: 'APP.VAULTS.ESTIMATED_AMOUNT_RECEIVED', ESTIMATED_SLIPPAGE: 'APP.VAULTS.ESTIMATED_SLIPPAGE', + EST_APR_PLAIN: 'APP.VAULTS.EST_APR_PLAIN', EST_SLIPPAGE: 'APP.VAULTS.EST_SLIPPAGE', HOLDINGS: 'APP.VAULTS.HOLDINGS', LEARN_MORE_ABOUT_MEGAVAULT: 'APP.VAULTS.LEARN_MORE_ABOUT_MEGAVAULT', @@ -1959,6 +1961,7 @@ export const APP_STRING_KEYS = { TVL: 'APP.VAULTS.TVL', VAULT: 'APP.VAULTS.VAULT', VAULTS: 'APP.VAULTS.VAULTS', + VAULT_APR_DESCRIPTION: 'APP.VAULTS.VAULT_APR_DESCRIPTION', VAULT_DESCRIPTION: 'APP.VAULTS.VAULT_DESCRIPTION', VAULT_EQUITY: 'APP.VAULTS.VAULT_EQUITY', VAULT_FAQS: 'APP.VAULTS.VAULT_FAQS', From f3b46da735a6ad883317cd9bfc4622a9b93a0034 Mon Sep 17 00:00:00 2001 From: Tyler Date: Fri, 15 Nov 2024 16:25:53 -0500 Subject: [PATCH 2/3] better --- config/localization/en/app.json | 1 - config/localization/en/tooltips.json | 3 +++ scripts/generated/app.ts | 1 - scripts/generated/tooltips.ts | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index ab9b7b044..78b79e7d6 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1715,7 +1715,6 @@ "APR": "{PERCENT} APR", "EST_APR_PLAIN": "Est. APR", "APR_PLAN": "APR", - "VAULT_APR_DESCRIPTION": "Vault APR is the annualized return of the vault based on the P&L of the past 30 days.", "VAULT_THIRTY_DAY_PNL": "30d P&L", "YOUR_VAULT_BALANCE": "Your Vault Balance", "VIEW_VAULT": "View Vault", diff --git a/config/localization/en/tooltips.json b/config/localization/en/tooltips.json index 8b5e87da3..adfaf1f1f 100644 --- a/config/localization/en/tooltips.json +++ b/config/localization/en/tooltips.json @@ -428,6 +428,9 @@ }, "YOUR_ALL_TIME_PNL": { "BODY": "The total PnL over time. This includes historical PnL of your vault deposits." + }, + "VAULT_APR": { + "BODY": "Vault APR is the annualized return of the vault based on the P&L of the past 30 days." } } } diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index 7c7343215..c6874bf0f 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1961,7 +1961,6 @@ export const APP_STRING_KEYS = { TVL: 'APP.VAULTS.TVL', VAULT: 'APP.VAULTS.VAULT', VAULTS: 'APP.VAULTS.VAULTS', - VAULT_APR_DESCRIPTION: 'APP.VAULTS.VAULT_APR_DESCRIPTION', VAULT_DESCRIPTION: 'APP.VAULTS.VAULT_DESCRIPTION', VAULT_EQUITY: 'APP.VAULTS.VAULT_EQUITY', VAULT_FAQS: 'APP.VAULTS.VAULT_FAQS', diff --git a/scripts/generated/tooltips.ts b/scripts/generated/tooltips.ts index 62f544614..29d66b662 100644 --- a/scripts/generated/tooltips.ts +++ b/scripts/generated/tooltips.ts @@ -225,6 +225,7 @@ export const TOOLTIP_STRING_KEYS = { AVAILABLE_TO_WITHDRAW_BODY: 'TOOLTIPS.VAULT.AVAILABLE_TO_WITHDRAW.BODY', ESTIMATED_AMOUNT_RECEIVED_BODY: 'TOOLTIPS.VAULT.ESTIMATED_AMOUNT_RECEIVED.BODY', ESTIMATED_SLIPPAGE_BODY: 'TOOLTIPS.VAULT.ESTIMATED_SLIPPAGE.BODY', + VAULT_APR_BODY: 'TOOLTIPS.VAULT.VAULT_APR.BODY', YOUR_ALL_TIME_PNL_BODY: 'TOOLTIPS.VAULT.YOUR_ALL_TIME_PNL.BODY', YOUR_VAULT_BALANCE_BODY: 'TOOLTIPS.VAULT.YOUR_VAULT_BALANCE.BODY', From 97ffdbf7da4c6b0fbf2713a235acc0fd3f262822 Mon Sep 17 00:00:00 2001 From: Tyler Date: Fri, 15 Nov 2024 16:26:34 -0500 Subject: [PATCH 3/3] fix --- config/localization/en/app.json | 2 +- scripts/generated/app.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index 78b79e7d6..6c03b586d 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -1714,7 +1714,7 @@ "VAULT_THIRTY_DAY_APR": "30d APR", "APR": "{PERCENT} APR", "EST_APR_PLAIN": "Est. APR", - "APR_PLAN": "APR", + "APR_PLAIN": "APR", "VAULT_THIRTY_DAY_PNL": "30d P&L", "YOUR_VAULT_BALANCE": "Your Vault Balance", "VIEW_VAULT": "View Vault", diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index c6874bf0f..6e5021eaa 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -1920,7 +1920,7 @@ export const APP_STRING_KEYS = { AMOUNT_TO_DEPOSIT: 'APP.VAULTS.AMOUNT_TO_DEPOSIT', AMOUNT_TO_WITHDRAW: 'APP.VAULTS.AMOUNT_TO_WITHDRAW', APR: 'APP.VAULTS.APR', - APR_PLAN: 'APP.VAULTS.APR_PLAN', + APR_PLAIN: 'APP.VAULTS.APR_PLAIN', AVAILABLE_TO_WITHDRAW: 'APP.VAULTS.AVAILABLE_TO_WITHDRAW', CONFIRM_DEPOSIT_CTA: 'APP.VAULTS.CONFIRM_DEPOSIT_CTA', CONFIRM_WITHDRAW_CTA: 'APP.VAULTS.CONFIRM_WITHDRAW_CTA',