Merge pull request #1736 from oasisprotocol/lw/consistent-rename

Rename privateKeyPlaceholder to ethPrivateKeyPlaceholder
oasisprotocol · Oct 20, 2023 · b05c379 · b05c379
2 parents 0c16bcf + f84ebb3
commit b05c379
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.changelog/1736.internal.md b/.changelog/1736.internal.md
@@ -0,0 +1 @@
+Rename privateKeyPlaceholder to ethPrivateKeyPlaceholder
diff --git a/src/app/lib/eth-helpers.ts b/src/app/lib/eth-helpers.ts
@@ -4,16 +4,16 @@ import { bytesToHex, isValidPrivate, privateToAddress, toChecksumAddress } from
 export { isValidAddress as isValidEthAddress } from '@ethereumjs/util'
 
 export const hexToBuffer = (value: string): Buffer => Buffer.from(value, 'hex')
-export const isValidEthPrivateKey = (value: string): boolean => {
+export const isValidEthPrivateKey = (ethPrivateKey: string): boolean => {
   try {
-    return isValidPrivate(hexToBuffer(value))
+    return isValidPrivate(hexToBuffer(ethPrivateKey))
   } catch {
     return false
   }
 }
-export const isValidEthPrivateKeyLength = (value: string) => value.length === 64
-export const privateToEthAddress = (value: string): string =>
-  toChecksumAddress(bytesToHex(privateToAddress(hexToBuffer(value))))
+export const isValidEthPrivateKeyLength = (ethPrivateKey: string) => ethPrivateKey.length === 64
+export const privateToEthAddress = (ethPrivateKey: string): string =>
+  toChecksumAddress(bytesToHex(privateToAddress(hexToBuffer(ethPrivateKey))))
 
 export async function getEvmBech32Address(evmAddress: string) {
   const evmBytes = oasis.misc.fromHex(evmAddress.replace('0x', ''))

diff --git a/src/app/pages/ParaTimesPage/TransactionRecipient/index.tsx b/src/app/pages/ParaTimesPage/TransactionRecipient/index.tsx
@@ -86,7 +86,7 @@ export const TransactionRecipient = () => {
                   : undefined
               }
               placeholder={t(
-                'paraTimes.recipient.privateKeyPlaceholder',
+                'paraTimes.recipient.ethPrivateKeyPlaceholder',
                 'Enter Ethereum-compatible private key',
               )}
               value={transactionForm.ethPrivateKey}

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -323,9 +323,9 @@
     "pageInaccessible": "Transfers are not available.",
     "recipient": {
       "depositDescription": "Please enter the recipient address on <strong>{{paraTime}}</strong> {{paratimeType}} and then click \"{{nextButtonLabel}}\"",
+      "ethPrivateKeyPlaceholder": "Enter Ethereum-compatible private key",
       "evmcWithdrawDescription": "Please enter the private key of the account on ParaTime, the recipient address on consensus and click \"{{nextButtonLabel}}\"",
       "placeholder": "0x...",
-      "privateKeyPlaceholder": "Enter Ethereum-compatible private key",
       "withdrawDescription": "Please enter the recipient address on consensus and click \"{{nextButtonLabel}}\""
     },
     "selection": {