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

update migrate strings and rename address #94

Merged
merged 2 commits into from
Oct 7, 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
14 changes: 8 additions & 6 deletions config/localization/en/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
"DISCOUNT": "Discount",
"DISMISS": "Dismiss",
"DONE": "Done",
"DYDX_ADDRESS": "dYdX address",
"DYDX_CHAIN_ADDRESS": "dYdX Chain Address",
"DYDX_CHAIN": "dYdX Chain",
"EDIT": "Edit",
Expand Down Expand Up @@ -1562,22 +1561,25 @@
"BALANCE_ON_CHAIN": "Balance on {CHAIN}",
"BEFORE": "Before",
"CHECK_STATUS": "Check status",
"CONFIRM_MIGRATION_DISCLAIMER": "I understand it will take 24-48 hours until my tokens are available on dYdX Chain.",
"CONFIRM_MIGRATION_DISCLAIMER_1": "I understand it may take 24-48 hours until my tokens are available on the dYdX Chain.",
"CONFIRM_MIGRATION_DISCLAIMER_2": "I understand that my ethDYDX tokens will be permanently locked in the wethDYDX Smart Contract and irrecoverable.",
"CONFIRM_MIGRATION": "Confirm migration",
"DYDX_CHAIN_SETTLEMENT": "dYdX Chain settlement",
"EMPTY_PENDING_MIGRATIONS_ALL": "There are no pending migrations currently.",
"EMPTY_PENDING_MIGRATIONS_MINE": "There are no pending migrations with your dYdX address currently.",
"EMPTY_PENDING_MIGRATIONS_MINE": "There are no pending migrations with your dYdX Chain address currently.",
"EMPTY_PENDING_MIGRATIONS_SEARCH": "There are no pending migrations with address matching {SEARCH_STRING} currently.",
"ENTER_ADDRESS": "Enter dYdX address",
"ENTER_ADDRESS": "Enter dYdX Chain address",
"ESTIMATED_TIME_LEFT": "Estimated time left",
"ESTIMATED_TIMELINE": "Estimated timeline",
"ETHEREUM_FINALIZATION": "Ethereum finalization",
"ETHEREUM_SETTLEMENT": "Ethereum settlement",
"FINALIZED": "Finalized",
"FINALIZING": "Finalizing",
"GENERATED_ADDRESS_INFO": "You'll be able to manage your dYdX Chain DYDX on {TRADE_URL} using the same wallet.",
"GENERATED_ADDRESS_VIA_ADDRESS": "Generated dYdX address via {ADDRESS_OR_WALLET_SIGNATURE}",
"GENERATED_ADDRESS_VIA_ADDRESS": "Generated dYdX Chain address via {ADDRESS_OR_WALLET_SIGNATURE}",
"LATEST_BLOCK_HEIGHT": "Latest block height",
"MIGRATION_BLOCKED_MESSAGE": "Because you appear to be a resident of, or using this user interface from, a jurisdiction that violates our terms of use, or have engaged in activity that violates our terms of use, you have been blocked and this transaction cannot be completed.",
"MIGRATION_BLOCKED_MESSAGE_DESTINATION": "Because the destination address appears to be a resident of, or using this user interface from, a jurisdiction that violates our terms of use, or has engaged in activity that violates our terms of use, the destination address has been blocked and this transaction cannot be completed.",
"MIGRATION_FAILED": "Migration failed",
"MIGRATION_FAQ_GAS_FEES_ANSWER": "Yes, holders who engage with the portal will have to pay gas costs on Ethereum. Users will not have to pay gas costs on dYdX Chain.",
"MIGRATION_FAQ_GAS_FEES": "Do I have to pay gas fees?",
Expand Down Expand Up @@ -1819,4 +1821,4 @@
"TAKE_PROFIT_MARKET_ORDER_MAY_NOT_EXECUTE": "Take Profit Market"
}
}
}
}
2 changes: 1 addition & 1 deletion config/localization/en/tooltips.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"GENERAL": {
"DYDX_ADDRESS": {
"BODY": "Your dYdX address \"{DYDX_ADDRESS}\" was created from the signature of the Ethereum address \"{EVM_ADDRESS}\"."
"BODY": "Your dYdX Chain address \"{DYDX_ADDRESS}\" was created from the signature of the Ethereum address \"{EVM_ADDRESS}\"."
},
"LEGACY_SIGNING": {
"TITLE": "Legacy Signing",
Expand Down
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": "0.1.25",
"version": "0.1.26",
"description": "v4 localization",
"main": "index.ts",
"scripts": {
Expand Down
8 changes: 5 additions & 3 deletions scripts/generated/app.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// !! GENERATED FILE - DO NOT EDIT

// Generated from ./config/localization/en/app.json using scripts/codegen_localization_app.swift
// Generated from ../config/localization/en/app.json using ./codegen_localization_app.swift

export const APP_STRING_KEYS = {

Expand Down Expand Up @@ -366,7 +366,6 @@ export const APP_STRING_KEYS = {
DISCOUNT: 'APP.GENERAL.DISCOUNT',
DISMISS: 'APP.GENERAL.DISMISS',
DONE: 'APP.GENERAL.DONE',
DYDX_ADDRESS: 'APP.GENERAL.DYDX_ADDRESS',
DYDX_CHAIN: 'APP.GENERAL.DYDX_CHAIN',
DYDX_CHAIN_ADDRESS: 'APP.GENERAL.DYDX_CHAIN_ADDRESS',
EDIT: 'APP.GENERAL.EDIT',
Expand Down Expand Up @@ -1540,7 +1539,8 @@ export const TOKEN_MIGRATION_STRING_KEYS = {
BEFORE: 'TOKEN_MIGRATION.BEFORE',
CHECK_STATUS: 'TOKEN_MIGRATION.CHECK_STATUS',
CONFIRM_MIGRATION: 'TOKEN_MIGRATION.CONFIRM_MIGRATION',
CONFIRM_MIGRATION_DISCLAIMER: 'TOKEN_MIGRATION.CONFIRM_MIGRATION_DISCLAIMER',
CONFIRM_MIGRATION_DISCLAIMER_1: 'TOKEN_MIGRATION.CONFIRM_MIGRATION_DISCLAIMER_1',
CONFIRM_MIGRATION_DISCLAIMER_2: 'TOKEN_MIGRATION.CONFIRM_MIGRATION_DISCLAIMER_2',
DYDX_CHAIN_SETTLEMENT: 'TOKEN_MIGRATION.DYDX_CHAIN_SETTLEMENT',
EMPTY_PENDING_MIGRATIONS_ALL: 'TOKEN_MIGRATION.EMPTY_PENDING_MIGRATIONS_ALL',
EMPTY_PENDING_MIGRATIONS_MINE: 'TOKEN_MIGRATION.EMPTY_PENDING_MIGRATIONS_MINE',
Expand All @@ -1555,6 +1555,8 @@ export const TOKEN_MIGRATION_STRING_KEYS = {
GENERATED_ADDRESS_INFO: 'TOKEN_MIGRATION.GENERATED_ADDRESS_INFO',
GENERATED_ADDRESS_VIA_ADDRESS: 'TOKEN_MIGRATION.GENERATED_ADDRESS_VIA_ADDRESS',
LATEST_BLOCK_HEIGHT: 'TOKEN_MIGRATION.LATEST_BLOCK_HEIGHT',
MIGRATION_BLOCKED_MESSAGE: 'TOKEN_MIGRATION.MIGRATION_BLOCKED_MESSAGE',
MIGRATION_BLOCKED_MESSAGE_DESTINATION: 'TOKEN_MIGRATION.MIGRATION_BLOCKED_MESSAGE_DESTINATION',
MIGRATION_FAILED: 'TOKEN_MIGRATION.MIGRATION_FAILED',
MIGRATION_FAQ_GAS_FEES: 'TOKEN_MIGRATION.MIGRATION_FAQ_GAS_FEES',
MIGRATION_FAQ_GAS_FEES_ANSWER: 'TOKEN_MIGRATION.MIGRATION_FAQ_GAS_FEES_ANSWER',
Expand Down