From 743f591ee95864c6e1857eb81c136d7c4a4f680e Mon Sep 17 00:00:00 2001 From: mulan xia Date: Fri, 24 May 2024 16:31:02 -0400 Subject: [PATCH 1/3] Add keys --- config/localization/en/app.json | 31 ++++++++++++++++++++++++++++--- scripts/generated/app.ts | 25 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/config/localization/en/app.json b/config/localization/en/app.json index d7f3df913..9fee8c181 100644 --- a/config/localization/en/app.json +++ b/config/localization/en/app.json @@ -60,6 +60,8 @@ "ASSET_BALANCE": "{ASSET} Balance", "ASSET": "Asset", "AVAILABLE": "Available", + "AVAILABLE_IN": "Available in {DURATION}", + "AVAILABLE_ON_SHORT": "Avail. {ON_DATE}", "BACK": "Back", "BALANCE": "Balance", "BASE_INITIAL_MARGIN_FRACTION": "Base Initial Margin Fraction", @@ -73,6 +75,7 @@ "CARDS": "Cards", "CATEGORY": "Category", "CHAINS": "Chains", + "CLAIM": "Claim", "CLEAR": "Clear", "CLEAR_ALL": "Clear All", "CLICK_HERE": "Click here", @@ -126,6 +129,7 @@ "EMAIL": "Email", "ENDED": "Ended", "EQUITY": "Equity", + "EST_GAS": "Est. Gas", "ESTIMATED": "Estimated", "EXPAND_SECTION": "Expand section", "EXPAND": "Expand", @@ -287,8 +291,10 @@ "SLOW_WITHDRAW": "Slow Withdraw", "SORT_BY": "Sort by", "SOURCE_ADDRESS": "Source Address", + "STAKE": "Stake", "STAKED": "Staked", "START_TRADING": "Start trading", + "STARTED_FROM_DATE": "Started {FROM_DATE}", "STATISTICS": "Statistics", "STATUS": "Status", "STEP_SIZE": "Step Size", @@ -325,6 +331,9 @@ "UNCONFIRMED": "Unconfirmed", "UNKNOWN_ERROR": "Unknown error", "UNKNOWN": "Unknown", + "UNSTAKE": "Unstake", + "UNSTAKED": "Unstaked", + "UNSTAKING_FROM": "Unstaking from {VALIDATOR}", "USERNAME": "Username", "VIEW_DETAILS": "View details", "VIEW_LEAGUE": "View League", @@ -1063,7 +1072,9 @@ "IN_THIS_EPOCH": "in this epoch", "LAUNCH_INCENTIVES_TITLE": "Launch Incentives {FOR_V4}", "LAUNCH_INCENTIVES_DESCRIPTION": "Earn trading rewards each season. View how you compare to other traders and view past seasons on the leaderboard.", + "LAUNCH_INCENTIVES_SEASON_BEGINS_SOON": "Season {SEASON_NUMBER} begins soon!", "LAUNCH_INCENTIVES_SEASON_NUM": "Season {SEASON_NUMBER}", + "LAUNCH_INCENTIVES_SEASON_SUMMARY": "{NUM_POINTS} received during Season {SEASON_NUMBER}, which ended on {PAST_DATE}.", "LEADERBOARD": "Leaderboard", "LEARN_TO_EXPORT": "{STRONG_NO}, learn how to export my secret phrase.", "MAKER_MARKET_SHARE": "maker market share", @@ -1634,6 +1645,9 @@ "YOU_CAN_WIN_THESE": "You can win these in our {LEAGUES_LINK}" }, "STAKING_REWARDS": { + "CLAIM_USDC_AMOUNT": "Claim {USDC_AMOUNT} USDC", + "CLAIM_STAKING_REWARDS": "Claim Staking Rewards!", + "EARN_APR": "Earn {APR_PERCENTAGE} APR", "LEAVING_WEBSITE_STAKING_GOVERNANCE": "Staking, governance and leaving website disclaimer", "LIQUID_STAKE_ON_STRIDE": "Liquid Stake on Stride", "LIQUID_STAKING_AND_LEAVING": "Liquid staking and leaving website", @@ -1645,10 +1659,12 @@ "STAKE_WITH_KEPLR_AND_LEAVING_DESCRIPTION": "By selecting “{CTA}” below, you acknowledge and agree that (a) you will leave our website and join a website made available by Chainapsis, Inc. (“Keplr”), which is independent from and unaffiliated with the host and operator of this website (the “Operator”); (b) these services are provided to you directly by Keplr and do not involve the Operator; (c) these services and any staking or governance occur outside of the Operator’s website; and (d) any transaction or transmission of value will occur directly between you and Keplr. These services are not available to any persons located in the U.S., Canada or restricted territories. You also agree that any information requested from you by Keplr is not provided to the Operator, and that you will not hold the Operator liable for any aspect of any transaction or transmission between you and Keplr. Nothing on the Operator’s website constitutes, nor should be construed or relied upon as, financial advice, legal advice, tax advice, investment advice or advice of any other nature, and you agree that you are responsible to conduct independent research, perform due diligence and engage a professional advisor prior to taking any financial, tax, legal or investment action related to any of the foregoing.", "STAKING_AND_LEAVING": "Staking and leaving website disclaimer", "STAKING_PAGE_SUBTITLE": "Stake to earn APR. Unstaking can take up to 30 days.", - "STAKING_REWARDS": "Staking Rewards" + "STAKING_REWARDS": "Staking Rewards", + "STAKING_REWARDS_AVAILABLE": "Staking Rewards Available" }, "TOKEN_GOVERNANCE": { - "GOVERNANCE_PAGE_SUBTITLE": "Participate in the ecosystem by voting on Governance proposals or submitting your own." + "GOVERNANCE_PAGE_SUBTITLE": "Participate in the ecosystem by voting on Governance proposals or submitting your own.", + "GOVERNANCE_DETAILS": "To participate in governance, you'll need to export your secret phrase to Keplr Wallet." }, "TRADING_REWARDS": { "ABOUT": "About", @@ -1662,14 +1678,22 @@ "POWERED_BY": "POWERED BY", "SEASON_ID": "Season {SEASON_ID}", "TRADING_REWARD": "Trading Reward", + "TRADING_REWARD_CHART_EMPTY_STATE": "You have no rewards.", + "TRADING_REWARD_HISTORY": "Trading Reward History", + "TRADING_REWARD_TABLE_DISCONNECTED_STATE": "Your history will appear here.", + "TRADING_REWARD_TABLE_EMPTY_STATE": "You have no history.", + "TRADING_REWARDS_LEGAL_DISCLAIMER": "The above services are not available to any persons who are residents of, are located or incorporated in, or have a registered agent in the U.S., Canada or a restricted territory. All such services are provided to you directly by third parties, independent from and unaffiliated with the host and operator of this website (the “Operator”), and does not involve the Operator. All such services, including any staking, governance or swapping, occur outside of the Operator’s website, and any transaction or transmission of value will occur directly between you and the applicable third party. Any information requested from you by such applicable third party is not provided to the Operator, and the Operator is not liable for any aspect of any transaction or transmission between you and such applicable third party. Nothing on this website constitutes, nor should be construed or relied upon as, financial advice, legal advice, tax advice, investment advice or advice of any other nature. You agree that you are responsible to conduct independent research, perform due diligence and engage a professional advisor prior to taking any financial, tax, legal or investment action related to any of the foregoing, including confirming APY with the applicable third party.", "REWARD_HISTORY_DESCRIPTION": "While trading rewards are distributed immediately after every block, history is updated every five minutes. Trading rewards history goes back until {REWARDS_HISTORY_START_DATE}.", "EMPTY_HISTORICAL_REWARDS_DESCRIPTION": "Start trading to earn rewards.", + "FAQ_WHAT_IS_STAKING_QUESTION": "What is staking?", + "FAQ_HOW_DO_I_STAKE_AND_CLAIM_QUESTION": "How do I stake and claim staking rewards?", "FAQ_WHO_IS_ELIGIBLE_QUESTION": "Who is eligible for trading rewards?", "FAQ_WHO_IS_ELIGIBLE_ANSWER": "All traders are eligible for trading rewards.", "FAQ_HOW_DO_TRADING_REWARDS_WORK_QUESTION": "How do trading rewards work?", "FAQ_HOW_DO_TRADING_REWARDS_WORK_ANSWER": "Immediately after each fill, trading rewards are sent directly to the trader’s dYdX Chain address, based on the amount of fees paid by the trader.", "FAQ_HOW_DO_I_CLAIM_MY_REWARDS_QUESTION": "How do I claim my rewards?", - "FAQ_HOW_DO_I_CLAIM_MY_REWARDS_ANSWER": "Each block, trading rewards are automatically sent directly to the trader’s dYdX Chain address." + "FAQ_HOW_DO_I_CLAIM_MY_REWARDS_ANSWER": "Each block, trading rewards are automatically sent directly to the trader’s dYdX Chain address.", + "TRADING_REWARDS_UNAVAILABLE_IN_US": "These third-party products and services are not available to any persons who are residents of, are located or incorporated in, or have a registered agent in the U.S., Canada or a restricted territory. More details can be found in our {TERMS_OF_USE_LINK}." }, "EPOCH_END_MODAL": { "EPOCH_END_EARNED": "You earned {AMOUNT} $DYDX rewards during Epoch {EPOCH_NUMBER}! Claim your rewards on the governance dashboard.", @@ -1874,6 +1898,7 @@ "ADD_MARKET_STEP_1_DESCRIPTION": "Search or choose from a list of markets you’d like to add. This pre-populated list of markets is based on depth and volume on popular centralized exchanges, and does not reflect an endorsement of such markets. More information on methodology can be found {HERE}.", "ADD_MARKET_STEP_2_DESCRIPTION": "Once a market is selected, all of its parameters will be automatically populated.", "ADD_MARKET_STEP_3_DESCRIPTION": "Send a transaction that creates a proposal to add the new market. This requires a balance of {REQUIRED_NUM_TOKENS} unstaked {NATIVE_TOKEN_DENOM}.", + "ADD_NEW_MARKET_DETAILS": "Add a new asset to dYdX Chain via a governance proposal. Requires {AMOUNT} unstaked DYDX.", "CONFIRM_NEW_MARKET_PROPOSAL": "Confirm new market proposal", "HIDE_STEPS": "Hide steps", "IMPACT_NOTIONAL": "Impact notional", diff --git a/scripts/generated/app.ts b/scripts/generated/app.ts index c9d6e818e..419b38962 100644 --- a/scripts/generated/app.ts +++ b/scripts/generated/app.ts @@ -266,6 +266,8 @@ export const APP_STRING_KEYS = { ASSET: 'APP.GENERAL.ASSET', ASSET_BALANCE: 'APP.GENERAL.ASSET_BALANCE', AVAILABLE: 'APP.GENERAL.AVAILABLE', + AVAILABLE_IN: 'APP.GENERAL.AVAILABLE_IN', + AVAILABLE_ON_SHORT: 'APP.GENERAL.AVAILABLE_ON_SHORT', BACK: 'APP.GENERAL.BACK', BALANCE: 'APP.GENERAL.BALANCE', BASE_INITIAL_MARGIN_FRACTION: 'APP.GENERAL.BASE_INITIAL_MARGIN_FRACTION', @@ -280,6 +282,7 @@ export const APP_STRING_KEYS = { CARDS: 'APP.GENERAL.CARDS', CATEGORY: 'APP.GENERAL.CATEGORY', CHAINS: 'APP.GENERAL.CHAINS', + CLAIM: 'APP.GENERAL.CLAIM', CLEAR: 'APP.GENERAL.CLEAR', CLEAR_ALL: 'APP.GENERAL.CLEAR_ALL', CLICK_HERE: 'APP.GENERAL.CLICK_HERE', @@ -335,6 +338,7 @@ export const APP_STRING_KEYS = { ENDED: 'APP.GENERAL.ENDED', EQUITY: 'APP.GENERAL.EQUITY', ESTIMATED: 'APP.GENERAL.ESTIMATED', + EST_GAS: 'APP.GENERAL.EST_GAS', EXPAND: 'APP.GENERAL.EXPAND', EXPAND_SECTION: 'APP.GENERAL.EXPAND_SECTION', FAST_WITHDRAW: 'APP.GENERAL.FAST_WITHDRAW', @@ -493,7 +497,9 @@ export const APP_STRING_KEYS = { SLOW_WITHDRAW: 'APP.GENERAL.SLOW_WITHDRAW', SORT_BY: 'APP.GENERAL.SORT_BY', SOURCE_ADDRESS: 'APP.GENERAL.SOURCE_ADDRESS', + STAKE: 'APP.GENERAL.STAKE', STAKED: 'APP.GENERAL.STAKED', + STARTED_FROM_DATE: 'APP.GENERAL.STARTED_FROM_DATE', START_TRADING: 'APP.GENERAL.START_TRADING', STATISTICS: 'APP.GENERAL.STATISTICS', STATUS: 'APP.GENERAL.STATUS', @@ -566,6 +572,9 @@ export const APP_STRING_KEYS = { UNCONFIRMED: 'APP.GENERAL.UNCONFIRMED', UNKNOWN: 'APP.GENERAL.UNKNOWN', UNKNOWN_ERROR: 'APP.GENERAL.UNKNOWN_ERROR', + UNSTAKE: 'APP.GENERAL.UNSTAKE', + UNSTAKED: 'APP.GENERAL.UNSTAKED', + UNSTAKING_FROM: 'APP.GENERAL.UNSTAKING_FROM', USERNAME: 'APP.GENERAL.USERNAME', VIEW: 'APP.GENERAL.VIEW', VIEWS: 'APP.GENERAL.VIEWS', @@ -774,6 +783,7 @@ export const APP_STRING_KEYS = { ADD_MARKET_STEP_2_TITLE: 'APP.NEW_MARKET_WIDGET.ADD_MARKET_STEP_2_TITLE', ADD_MARKET_STEP_3_DESCRIPTION: 'APP.NEW_MARKET_WIDGET.ADD_MARKET_STEP_3_DESCRIPTION', ADD_MARKET_STEP_3_TITLE: 'APP.NEW_MARKET_WIDGET.ADD_MARKET_STEP_3_TITLE', + ADD_NEW_MARKET_DETAILS: 'APP.NEW_MARKET_WIDGET.ADD_NEW_MARKET_DETAILS', CONFIRM_NEW_MARKET_PROPOSAL: 'APP.NEW_MARKET_WIDGET.CONFIRM_NEW_MARKET_PROPOSAL', HIDE_STEPS: 'APP.NEW_MARKET_WIDGET.HIDE_STEPS', IMPACT_NOTIONAL: 'APP.NEW_MARKET_WIDGET.IMPACT_NOTIONAL', @@ -1042,7 +1052,9 @@ export const APP_STRING_KEYS = { HOLDING: 'APP.PORTFOLIO.HOLDING', IN_THIS_EPOCH: 'APP.PORTFOLIO.IN_THIS_EPOCH', LAUNCH_INCENTIVES_DESCRIPTION: 'APP.PORTFOLIO.LAUNCH_INCENTIVES_DESCRIPTION', + LAUNCH_INCENTIVES_SEASON_BEGINS_SOON: 'APP.PORTFOLIO.LAUNCH_INCENTIVES_SEASON_BEGINS_SOON', LAUNCH_INCENTIVES_SEASON_NUM: 'APP.PORTFOLIO.LAUNCH_INCENTIVES_SEASON_NUM', + LAUNCH_INCENTIVES_SEASON_SUMMARY: 'APP.PORTFOLIO.LAUNCH_INCENTIVES_SEASON_SUMMARY', LAUNCH_INCENTIVES_TITLE: 'APP.PORTFOLIO.LAUNCH_INCENTIVES_TITLE', LEADERBOARD: 'APP.PORTFOLIO.LEADERBOARD', LEARN_TO_EXPORT: 'APP.PORTFOLIO.LEARN_TO_EXPORT', @@ -1233,6 +1245,9 @@ export const APP_STRING_KEYS = { // STAKING_REWARDS + CLAIM_STAKING_REWARDS: 'APP.STAKING_REWARDS.CLAIM_STAKING_REWARDS', + CLAIM_USDC_AMOUNT: 'APP.STAKING_REWARDS.CLAIM_USDC_AMOUNT', + EARN_APR: 'APP.STAKING_REWARDS.EARN_APR', LEAVING_WEBSITE_STAKING_GOVERNANCE: 'APP.STAKING_REWARDS.LEAVING_WEBSITE_STAKING_GOVERNANCE', LIQUID_STAKE_ON_STRIDE: 'APP.STAKING_REWARDS.LIQUID_STAKE_ON_STRIDE', LIQUID_STAKE_STRIDE_DESCRIPTION: 'APP.STAKING_REWARDS.LIQUID_STAKE_STRIDE_DESCRIPTION', @@ -1245,6 +1260,7 @@ export const APP_STRING_KEYS = { STAKING_AND_LEAVING: 'APP.STAKING_REWARDS.STAKING_AND_LEAVING', STAKING_PAGE_SUBTITLE: 'APP.STAKING_REWARDS.STAKING_PAGE_SUBTITLE', STAKING_REWARDS: 'APP.STAKING_REWARDS.STAKING_REWARDS', + STAKING_REWARDS_AVAILABLE: 'APP.STAKING_REWARDS.STAKING_REWARDS_AVAILABLE', // TEST_FUNDS_MODAL @@ -1266,6 +1282,7 @@ export const APP_STRING_KEYS = { // TOKEN_GOVERNANCE + GOVERNANCE_DETAILS: 'APP.TOKEN_GOVERNANCE.GOVERNANCE_DETAILS', GOVERNANCE_PAGE_SUBTITLE: 'APP.TOKEN_GOVERNANCE.GOVERNANCE_PAGE_SUBTITLE', // TRADE @@ -1526,8 +1543,10 @@ export const APP_STRING_KEYS = { EVENT: 'APP.TRADING_REWARDS.EVENT', FAQ_HOW_DO_I_CLAIM_MY_REWARDS_ANSWER: 'APP.TRADING_REWARDS.FAQ_HOW_DO_I_CLAIM_MY_REWARDS_ANSWER', FAQ_HOW_DO_I_CLAIM_MY_REWARDS_QUESTION: 'APP.TRADING_REWARDS.FAQ_HOW_DO_I_CLAIM_MY_REWARDS_QUESTION', + FAQ_HOW_DO_I_STAKE_AND_CLAIM_QUESTION: 'APP.TRADING_REWARDS.FAQ_HOW_DO_I_STAKE_AND_CLAIM_QUESTION', FAQ_HOW_DO_TRADING_REWARDS_WORK_ANSWER: 'APP.TRADING_REWARDS.FAQ_HOW_DO_TRADING_REWARDS_WORK_ANSWER', FAQ_HOW_DO_TRADING_REWARDS_WORK_QUESTION: 'APP.TRADING_REWARDS.FAQ_HOW_DO_TRADING_REWARDS_WORK_QUESTION', + FAQ_WHAT_IS_STAKING_QUESTION: 'APP.TRADING_REWARDS.FAQ_WHAT_IS_STAKING_QUESTION', FAQ_WHO_IS_ELIGIBLE_ANSWER: 'APP.TRADING_REWARDS.FAQ_WHO_IS_ELIGIBLE_ANSWER', FAQ_WHO_IS_ELIGIBLE_QUESTION: 'APP.TRADING_REWARDS.FAQ_WHO_IS_ELIGIBLE_QUESTION', FOR_TRADING: 'APP.TRADING_REWARDS.FOR_TRADING', @@ -1535,6 +1554,12 @@ export const APP_STRING_KEYS = { REWARD_HISTORY_DESCRIPTION: 'APP.TRADING_REWARDS.REWARD_HISTORY_DESCRIPTION', SEASON_ID: 'APP.TRADING_REWARDS.SEASON_ID', TRADING_REWARD: 'APP.TRADING_REWARDS.TRADING_REWARD', + TRADING_REWARDS_LEGAL_DISCLAIMER: 'APP.TRADING_REWARDS.TRADING_REWARDS_LEGAL_DISCLAIMER', + TRADING_REWARDS_UNAVAILABLE_IN_US: 'APP.TRADING_REWARDS.TRADING_REWARDS_UNAVAILABLE_IN_US', + TRADING_REWARD_CHART_EMPTY_STATE: 'APP.TRADING_REWARDS.TRADING_REWARD_CHART_EMPTY_STATE', + TRADING_REWARD_HISTORY: 'APP.TRADING_REWARDS.TRADING_REWARD_HISTORY', + TRADING_REWARD_TABLE_DISCONNECTED_STATE: 'APP.TRADING_REWARDS.TRADING_REWARD_TABLE_DISCONNECTED_STATE', + TRADING_REWARD_TABLE_EMPTY_STATE: 'APP.TRADING_REWARDS.TRADING_REWARD_TABLE_EMPTY_STATE', // TRIGGERS_MODAL From aec79a4cecb227d24aebff9e6b3daeed23d60c65 Mon Sep 17 00:00:00 2001 From: mulan xia Date: Fri, 24 May 2024 16:31:04 -0400 Subject: [PATCH 2/3] 1.1.88 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b57efef55..694562d90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.87", + "version": "1.1.88", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.87", + "version": "1.1.88", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index 47dc5f48b..4c024472b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.87", + "version": "1.1.88", "description": "v4 localization", "main": "index.ts", "scripts": { From 9dd0e4a2858befcc17b700ec1633cbe8e670b9bb Mon Sep 17 00:00:00 2001 From: mulan xia Date: Fri, 24 May 2024 16:31:12 -0400 Subject: [PATCH 3/3] 1.1.89 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 694562d90..11279383a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.88", + "version": "1.1.89", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dydxprotocol/v4-localization", - "version": "1.1.88", + "version": "1.1.89", "license": "AGPL-3.0", "devDependencies": { "@types/node": "^20.1.7" diff --git a/package.json b/package.json index 4c024472b..65639193d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/v4-localization", - "version": "1.1.88", + "version": "1.1.89", "description": "v4 localization", "main": "index.ts", "scripts": {