Rename property to ethPrivateKeyRaw

oasisprotocol · May 15, 2024 · 046cee0 · 046cee0
1 parent ee970da
commit 046cee0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/src/app/pages/ParaTimesPage/TransactionRecipient/__tests__/index.test.tsx b/src/app/pages/ParaTimesPage/TransactionRecipient/__tests__/index.test.tsx
@@ -25,7 +25,7 @@ describe('<TransactionRecipient />', () => {
     ticker: 'ROSE',
     transactionForm: {
       recipient: '',
-      ethPrivateRawKey: '',
+      ethPrivateKeyRaw: '',
     },
     usesOasisAddress: true,
   } as ParaTimesHook
@@ -123,7 +123,7 @@ describe('<TransactionRecipient />', () => {
       ...mockUseParaTimesEVMcResult,
       transactionForm: {
         ...mockUseParaTimesEVMcResult.transactionForm,
-        ethPrivateRawKey: '123',
+        ethPrivateKeyRaw: '123',
       },
     })
     jest.mocked(useParaTimesNavigation).mockReturnValue({
@@ -144,7 +144,7 @@ describe('<TransactionRecipient />', () => {
       ...mockUseParaTimesEVMcResult,
       transactionForm: {
         ...mockUseParaTimesEVMcResult.transactionForm,
-        ethPrivateRawKey: '----------------------------------------------------------------',
+        ethPrivateKeyRaw: '----------------------------------------------------------------',
       },
     })
     jest.mocked(useParaTimesNavigation).mockReturnValue({
@@ -169,7 +169,7 @@ describe('<TransactionRecipient />', () => {
       setTransactionForm,
       transactionForm: {
         recipient: 'oasis1qq3xrq0urs8qcffhvmhfhz4p0mu7ewc8rscnlwxe',
-        ethPrivateRawKey: ethPrivateKeyWith0xPrefix,
+        ethPrivateKeyRaw: ethPrivateKeyWith0xPrefix,
       } as TransactionForm,
     })
     jest.mocked(useParaTimesNavigation).mockReturnValue({
@@ -182,7 +182,7 @@ describe('<TransactionRecipient />', () => {
 
     expect(setTransactionForm).toHaveBeenCalledWith({
       ethPrivateKey: ethPrivateKey,
-      ethPrivateRawKey: ethPrivateKeyWith0xPrefix,
+      ethPrivateKeyRaw: ethPrivateKeyWith0xPrefix,
       recipient: 'oasis1qq3xrq0urs8qcffhvmhfhz4p0mu7ewc8rscnlwxe',
     })
     expect(navigateToAmount).toHaveBeenCalled()

diff --git a/src/app/pages/ParaTimesPage/TransactionRecipient/index.tsx b/src/app/pages/ParaTimesPage/TransactionRecipient/index.tsx
@@ -66,16 +66,16 @@ export const TransactionRecipient = () => {
         onChange={nextValue =>
           setTransactionForm({
             ...nextValue,
-            ethPrivateRawKey:
-              typeof nextValue.ethPrivateRawKey === 'object'
-                ? (nextValue.ethPrivateRawKey as any).value // from suggestions
-                : nextValue.ethPrivateRawKey,
+            ethPrivateKeyRaw:
+              typeof nextValue.ethPrivateKeyRaw === 'object'
+                ? (nextValue.ethPrivateKeyRaw as any).value // from suggestions
+                : nextValue.ethPrivateKeyRaw,
           })
         }
         onSubmit={formData => {
           setTransactionForm({
             ...formData.value,
-            ethPrivateKey: stripHexPrefix(formData.value.ethPrivateRawKey),
+            ethPrivateKey: stripHexPrefix(formData.value.ethPrivateKeyRaw),
           })
           navigateToAmount()
         }}
@@ -86,15 +86,15 @@ export const TransactionRecipient = () => {
         <Box margin={{ bottom: 'medium' }}>
           {isEvmcParaTime && !isDepositing && (
             <PasswordField
-              inputElementId="ethPrivateRawKey"
-              name="ethPrivateRawKey"
-              validate={ethPrivateRawKey =>
-                !isValidEthPrivateKeyLength(stripHexPrefix(ethPrivateRawKey))
+              inputElementId="ethPrivateKeyRaw"
+              name="ethPrivateKeyRaw"
+              validate={ethPrivateKeyRaw =>
+                !isValidEthPrivateKeyLength(stripHexPrefix(ethPrivateKeyRaw))
                   ? t(
                       'paraTimes.validation.invalidEthPrivateKeyLength',
                       'Private key should be 64 characters long',
                     )
-                  : !isValidEthPrivateKey(stripHexPrefix(ethPrivateRawKey))
+                  : !isValidEthPrivateKey(stripHexPrefix(ethPrivateKeyRaw))
                   ? t(
                       'paraTimes.validation.invalidEthPrivateKey',
                       'Ethereum-compatible private key is invalid',
@@ -105,7 +105,7 @@ export const TransactionRecipient = () => {
                 'paraTimes.recipient.ethPrivateKeyPlaceholder',
                 'Enter Ethereum-compatible private key',
               )}
-              value={transactionForm.ethPrivateRawKey}
+              value={transactionForm.ethPrivateKeyRaw}
               showTip={t('openWallet.privateKey.showPrivateKey', 'Show private key')}
               hideTip={t('openWallet.privateKey.hidePrivateKey', 'Hide private key')}
               suggestions={evmAccounts.map(acc => ({ label: acc.ethAddress, value: acc.ethPrivateKey }))}

diff --git a/src/app/state/paratimes/index.ts b/src/app/state/paratimes/index.ts
@@ -14,7 +14,7 @@ export const initialState: ParaTimesState = {
     confirmTransferToForeignAccount: false,
     defaultFeeAmount: '',
     ethPrivateKey: '',
-    ethPrivateRawKey: '',
+    ethPrivateKeyRaw: '',
     feeAmount: '',
     feeGas: '',
     paraTime: undefined,

diff --git a/src/app/state/paratimes/types.ts b/src/app/state/paratimes/types.ts
@@ -26,7 +26,7 @@ export interface TransactionForm {
   // compatible with oasisRT.signatureSecp256k1
   ethPrivateKey: string
   // provided by user and used in form inputs allowing back and forth form navigation
-  ethPrivateRawKey: string
+  ethPrivateKeyRaw: string
   feeAmount: string
   feeGas: string
   paraTime?: ParaTime

diff --git a/src/utils/__fixtures__/test-inputs.ts b/src/utils/__fixtures__/test-inputs.ts
@@ -80,7 +80,7 @@ export const privateKeyUnlockedState = {
       confirmTransferToForeignAccount: false,
       defaultFeeAmount: '',
       ethPrivateKey: '',
-      ethPrivateRawKey: '',
+      ethPrivateKeyRaw: '',
       feeAmount: '',
       feeGas: '',
       paraTime: undefined,
@@ -274,7 +274,7 @@ export const walletExtensionV0UnlockedState = {
       confirmTransferToForeignAccount: false,
       defaultFeeAmount: '',
       ethPrivateKey: '',
-      ethPrivateRawKey: '',
+      ethPrivateKeyRaw: '',
       feeAmount: '',
       feeGas: '',
       paraTime: undefined,