Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.1.2: Deposit withdraw receipts #213

Merged
merged 3 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions config/localization/en/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -530,25 +530,12 @@
"OTHER_WALLET": "Other"
},
"ONBOARDING": {
"INITIATED_DEPOSIT": "Initiated deposit",
"INITIATED_WITHDRAWAL": "Initiated withdrawal",
"INITIATED_TRANSFEROUT": "Initiated transfer",
"AMOUNT_RECEIVED": "Amount received",
"ESTIMATED_TIME": "Estimated time",
"BRIDGING_TOKENS": "Bridging tokens",
"DEPOSIT_TO_DYDX": "Deposit to dYdX",
"DEPOSIT_TO_DESTINATION": "Deposit to {DESTINATION_CHAIN}",
"DEPOSIT_ALERT_TITLE": "You have {PENDING_DEPOSITS} pending deposit from {SOURCE_CHAIN}.",
"DEPOSIT_ALERT_SUBTITLE": "Check status",
"DISCONNECT_CONFIRMATION": "Are you sure you want to disconnect your account?",
"WITHDRAWAL_ALERT_TITLE": "You have {PENDING_WITHDRAWALS} pending withdrawal to {DESTINATION_CHAIN}.",
"WITHDRAWAL_ALERT_SUBTITLE": "Check status",
"TRANSFEROUT_ALERT_TITLE": "You have pending transfer of {PENDING_TRANSFERS} {TOKEN}.",
"TRANSFEROUT_ALERT_SUBTITLE": "Check status",
"ABOUT_WALLETS": "About wallets",
"AMOUNT_RECEIVED": "Amount received",
"ACKNOWLEDGE_TERMS": "Acknowledge terms",
"API_KEYS_NOT_FOUND": "API Key not found",
"APPEARS_OUTSIDE_ACCESS": "It appears that you are accessing dYdX from outside the United States or a restricted territory. You hereby agree, represent and warrant that:",
"BRIDGING_TOKENS": "Bridging tokens",
"CHECK_WALLET_FOR_REQUEST": "Check your wallet for a request!",
"COMING_SOON": "Coming soon!",
"COMPLETE_ONBOARDING": "Complete onboarding",
Expand All @@ -562,14 +549,20 @@
"COULD_NOT_FIND_AFFILIATE": "We couldn't find this affiliate, please check the link.",
"CREATE_OR_VERIFY_COSMOS_ADDRESS": "Create or verify Cosmos address.",
"CREDITED_WITH": "Your account will be credited with ${AMOUNT_USD} in test funds.",
"DEPOSIT_ALERT_TITLE": "You have {PENDING_DEPOSITS} pending deposit from {SOURCE_CHAIN}.",
"DEPOSIT_ALERT_SUBTITLE": "Check status",
"DEPOSIT_COMPLETE": "Your deposit of {AMOUNT_USD} is now available.",
"DEPOSIT_OF": "Deposit of {AMOUNT_USD}",
"DEPOSIT_STATUS": "Your deposit of {AMOUNT_USD} will be available in approximately {ESTIMATED_DURATION}.",
"DEPOSIT_STATUS_SHORTLY": "Your deposit of {AMOUNT_USD} will be available shortly.",
"DEPOSIT_COMPLETE": "Your deposit of {AMOUNT_USD} is now available.",
"DEPOSIT_TO_DESTINATION": "Deposit to {DESTINATION_CHAIN}",
"DEPOSIT_TO_DYDX": "Deposit to dYdX",
"DISCONNECT_CONFIRMATION": "Are you sure you want to disconnect your account?",
"DONT_MISS": "Don't miss your chance to get a {DISCOUNT} on trading fees!",
"ENABLE_API": "Enable secure access to our API for lightning quick trading",
"ENABLE_TRADING": "Enable trading",
"ENSURES_WALLET_SUPPORT": "Ensures your wallet is supported.",
"ESTIMATED_TIME": "Estimated time",
"FINISH_ONBOARDING_DESCRIPTION": "Complete the onboarding flow to start trading on dYdX",
"FREE_SIGNING": "Signing is {FREE} and will not send a transaction.",
"GASLESS_ONBOARDING_RULES": "Gasless Onboarding Rules",
Expand All @@ -581,6 +574,9 @@
"GET_STARTED": "Get started",
"HAVING_TROUBLE": "Having trouble?",
"I_AGREE": "I agree",
"INITIATED_DEPOSIT": "Initiated deposit",
"INITIATED_WITHDRAWAL": "Initiated withdrawal",
"INITIATED_TRANSFEROUT": "Initiated transfer",
"INVITED_YOU": "has referred you to start trading on the world's most powerful open exchange.",
"JOIN_ME": "Join me on dYdX to receive a {DISCOUNT} on all trading fees!",
"LEDGER_DERIVATION_PATH": "Path",
Expand Down Expand Up @@ -620,6 +616,15 @@
"SKIP_FOR_NOW": "Skip for now",
"START_TRADING_BLURB": "Start trading on the world's most powerful open exchange.",
"SWITCH_NETWORK": "Switch network",
"TOS_TITLE": "By using any of our products and services, you agree to the {TERMS_LINK} and {PRIVACY_POLICY_LINK}. You hereby agree, represent and warrant that:",
"TOS_LINE1": "You are not a person or company who is a resident of, or is located, incorporated or has a registered agent in, the United States, Canada, or other blocked or restricted location.",
"TOS_LINE2": "You will not in the future access this site, or use our products or services, while located within the United States, Canada, or other blocked or restricted location.",
"TOS_LINE3": "You are not using, and will not in the future use, a VPN to mask your physical location from a blocked or restricted location.",
"TOS_LINE4": "You are lawfully permitted to access this site, and use our products and services, under the laws of the jurisdiction in which you reside and are located.",
"TOS_LINE5": "You understand the investment and technology risks associated with entering into perpetual contracts, using leverage, and engaging with blockchain and other web3 products and services.see legal request here.",
"TOS_TRANSLATION_DISCLAIMER": "As applicable, the non-English translated version of this notification is provided to you solely as a courtesy. In the event of a conflict between the translated version and the English version, the English version will prevail.",
"TRANSFEROUT_ALERT_TITLE": "You have pending transfer of {PENDING_TRANSFERS} {TOKEN}.",
"TRANSFEROUT_ALERT_SUBTITLE": "Check status",
"TRANSFERS_PAUSED": "Transfers temporarily paused",
"TRY_AGAIN": "Try again",
"TWO_SIGNATURE_REQUESTS": "You will receive two signature requests. Signing is free and will not send a transaction.",
Expand All @@ -637,23 +642,18 @@
"WANT_TO_LEARN": "Want to learn more?",
"WELCOME_DYDX": "Welcome to dYdX",
"WELCOME": "Welcome",
"WITHDRAW_STATUS": "Your withdrawal of {AMOUNT_USD} will be available in approximately {ESTIMATED_DURATION}.",
"WITHDRAW_STATUS_SHORTLY": "Your withdrawal of {AMOUNT_USD} will be available shortly.",
"WITHDRAWAL_ALERT_TITLE": "You have {PENDING_WITHDRAWALS} pending withdrawal to {DESTINATION_CHAIN}.",
"WITHDRAWAL_ALERT_SUBTITLE": "Check status",
"WITHDRAW_COMPLETE": "Your withdrawal of {AMOUNT_USD} is now available.",
"WITHDRAW_OF": "Withdraw of {AMOUNT_USD}",
"WITHDRAW_STATUS": "Your withdrawal of {AMOUNT_USD} will be available in approximately {ESTIMATED_DURATION}.",
"WITHDRAW_STATUS_SHORTLY": "Your withdrawal of {AMOUNT_USD} will be available shortly.",
"WITHDRAWALS_PAUSED": "Withdrawals temporarily paused",
"WITHDRAWALS_PAUSED_DESC": "Please try again in {ESTIMATED_DURATION}.",
"WRONG_NETWORK_EXPLANATION_PRODUCTION": "To complete dYdX onboarding, set your wallet network to 'Ethereum Mainnet'.",
"WRONG_NETWORK_EXPLANATION_STAGING": "To complete dYdX onboarding, set your wallet network to 'Goerli Test Network'.",
"WRONG_NETWORK": "Wrong network",
"YOU_AGREE_TO_TERMS": "By trading on dYdX, you agree to the {TERMS_LINK} and {PRIVACY_POLICY_LINK}.",
"TOS_TITLE": "By using any of our products and services, you agree to the {TERMS_LINK} and {PRIVACY_POLICY_LINK}. You hereby agree, represent and warrant that:",
"TOS_LINE1": "You are not a person or company who is a resident of, or is located, incorporated or has a registered agent in, the United States, Canada, or other blocked or restricted location.",
"TOS_LINE2": "You will not in the future access this site, or use our products or services, while located within the United States, Canada, or other blocked or restricted location.",
"TOS_LINE3": "You are not using, and will not in the future use, a VPN to mask your physical location from a blocked or restricted location.",
"TOS_LINE4": "You are lawfully permitted to access this site, and use our products and services, under the laws of the jurisdiction in which you reside and are located.",
"TOS_LINE5": "You understand the investment and technology risks associated with entering into perpetual contracts, using leverage, and engaging with blockchain and other web3 products and services.see legal request here.",
"TOS_TRANSLATION_DISCLAIMER": "As applicable, the non-English translated version of this notification is provided to you solely as a courtesy. In the event of a conflict between the translated version and the English version, the English version will prevail."
"YOU_AGREE_TO_TERMS": "By trading on dYdX, you agree to the {TERMS_LINK} and {PRIVACY_POLICY_LINK}."
},
"SIGN_INTO_MOBILE": {
"TITLE_SIGN_INTO_MOBILE": "Sign into mobile",
Expand Down Expand Up @@ -688,6 +688,7 @@
"ENABLE_SYMBOL": "Enable {SYMBOL}",
"ENABLING_SYMBOL": "Enabling {SYMBOL}...",
"EXCHANGE_RATE": "Exchange Rate",
"EXPECTED_DEPOSIT_AMOUNT": "Expected Deposit Amount",
"FREE_GAS": "Free!",
"GASLESS_DEPOSITS_DESCRIPTION_PLURAL": "You have {NUM_DEPOSITS} gasless deposits available.",
"GASLESS_DEPOSITS_DESCRIPTION_SINGULAR": "You have {NUM_DEPOSITS} gasless deposit available.",
Expand All @@ -696,6 +697,7 @@
"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.",
"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.",
"MINIMUM_DEPOSIT_UNMET": "Deposit at least {GASLESS_DEPOSIT_THRESHOLD} {SYMBOL} and dYdX will pay the gas fees for this deposit!",
"EXCHANGE_RECEIVED": "Receive",
Expand All @@ -710,6 +712,7 @@
"ENABLE_WITHDRAW": "Enable withdraw",
"ENABLE_WITHDRAW_BODY": "You must enable slow withdraws to continue. You can use fast withdraws anytime.",
"ENABLE_WITHDRAW_TITLE": "Enable slow withdraws",
"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.",
"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.",
Expand Down
8 changes: 8 additions & 0 deletions config/localization/en/tooltips.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,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."
},
"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"
},
"SWAP": {
"TITLE": "Swap & Deposit",
"BODY": "When depositing a non-USDC asset, your asset is automatically converted to USDC via the 0x API. Setting max slippage allows you to specify the slippage you will allow before the conversion fails."
Expand All @@ -233,6 +237,10 @@
"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)."
},
"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"
},
"WITHDRAW_TYPES": {
"TITLE": "Withdraw Types",
"BODY": "dYdX supports two types of withdraws from Layer 2. Fast withdraws carry a small fee but do not require gas and are sent immediately. Slow withdraws are free but require two steps, take much longer, and the user will have to pay their own gas fees."
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dydxprotocol/v4-localization",
"version": "1.1.1",
"version": "1.1.2",
"description": "v4 localization",
"main": "index.ts",
"scripts": {
Expand Down
3 changes: 3 additions & 0 deletions scripts/generated/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const APP_STRING_KEYS = {
ESTIMATED_TIME: 'APP.DEPOSIT_MODAL.ESTIMATED_TIME',
EXCHANGE_RATE: 'APP.DEPOSIT_MODAL.EXCHANGE_RATE',
EXCHANGE_RECEIVED: 'APP.DEPOSIT_MODAL.EXCHANGE_RECEIVED',
EXPECTED_DEPOSIT_AMOUNT: 'APP.DEPOSIT_MODAL.EXPECTED_DEPOSIT_AMOUNT',
FREE_GAS: 'APP.DEPOSIT_MODAL.FREE_GAS',
GASLESS_DEPOSITS_DESCRIPTION_PLURAL: 'APP.DEPOSIT_MODAL.GASLESS_DEPOSITS_DESCRIPTION_PLURAL',
GASLESS_DEPOSITS_DESCRIPTION_SINGULAR: 'APP.DEPOSIT_MODAL.GASLESS_DEPOSITS_DESCRIPTION_SINGULAR',
Expand All @@ -46,6 +47,7 @@ export const APP_STRING_KEYS = {
GASLESS_DEPOSITS_TEMPORARILY_DISABLED: 'APP.DEPOSIT_MODAL.GASLESS_DEPOSITS_TEMPORARILY_DISABLED',
GASLESS_ETH_DEPOSITS: 'APP.DEPOSIT_MODAL.GASLESS_ETH_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',
MINIMUM_DEPOSIT_UNMET: 'APP.DEPOSIT_MODAL.MINIMUM_DEPOSIT_UNMET',
SETTING_ALLOWANCE_EXPLANATION: 'APP.DEPOSIT_MODAL.SETTING_ALLOWANCE_EXPLANATION',
Expand Down Expand Up @@ -1316,6 +1318,7 @@ export const APP_STRING_KEYS = {
ENABLE_WITHDRAW: 'APP.WITHDRAW_MODAL.ENABLE_WITHDRAW',
ENABLE_WITHDRAW_BODY: 'APP.WITHDRAW_MODAL.ENABLE_WITHDRAW_BODY',
ENABLE_WITHDRAW_TITLE: 'APP.WITHDRAW_MODAL.ENABLE_WITHDRAW_TITLE',
EXPECTED_AMOUNT_RECEIVED: 'APP.WITHDRAW_MODAL.EXPECTED_AMOUNT_RECEIVED',
FAST: 'APP.WITHDRAW_MODAL.FAST',
FAST_WITHDRAW_CONFIRMATION: 'APP.WITHDRAW_MODAL.FAST_WITHDRAW_CONFIRMATION',
MAGIC_LINK_WITHDRAW_DESCRIPTION: 'APP.WITHDRAW_MODAL.MAGIC_LINK_WITHDRAW_DESCRIPTION',
Expand Down
4 changes: 4 additions & 0 deletions scripts/generated/tooltips.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
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',
SWAP_TITLE: 'TOOLTIPS.DEPOSIT.SWAP.TITLE',

Expand Down Expand Up @@ -142,6 +144,8 @@ export const TOOLTIP_STRING_KEYS = {

FAST_WITHDRAW_FEE_BODY: 'TOOLTIPS.WITHDRAW.FAST_WITHDRAW_FEE.BODY',
FAST_WITHDRAW_FEE_TITLE: 'TOOLTIPS.WITHDRAW.FAST_WITHDRAW_FEE.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',
WITHDRAW_TYPES_TITLE: 'TOOLTIPS.WITHDRAW.WITHDRAW_TYPES.TITLE',
};
Expand Down