diff --git a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormFields.js b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormFields.js index 2c6d1a75b..1bcac265a 100644 --- a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormFields.js +++ b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormFields.js @@ -17,7 +17,7 @@ import { * locking Transactions form fields. */ export default function LockingTransactionsFormFields() { - const dateFieldRef = useAutofocus(); + const reasonFieldRef = useAutofocus(); return (
@@ -43,7 +43,6 @@ export default function LockingTransactionsFormFields() { minimal: true, }} intent={inputIntent({ error, touched })} - inputRef={(ref) => (dateFieldRef.current = ref)} /> )} @@ -63,6 +62,7 @@ export default function LockingTransactionsFormFields() { growVertically={true} large={true} intent={inputIntent({ error, touched })} + inputRef={(ref) => (reasonFieldRef.current = ref)} {...field} /> diff --git a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormFields.js b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormFields.js index 651e5690a..e7bf7a164 100644 --- a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormFields.js +++ b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormFields.js @@ -11,11 +11,14 @@ import { tansformDateValue, handleDateChange, } from 'utils'; +import { useAutofocus } from 'hooks'; /** * Parial Unlocking transactions form fields. */ export default function UnlockingPartialTransactionsFormFields() { + const reasonFieldRef = useAutofocus(); + return (
@@ -96,6 +99,7 @@ export default function UnlockingPartialTransactionsFormFields() { growVertically={true} large={true} intent={inputIntent({ error, touched })} + inputRef={(ref) => (reasonFieldRef.current = ref)} {...field} /> diff --git a/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormFields.js b/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormFields.js index c97398333..085506abc 100644 --- a/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormFields.js +++ b/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormFields.js @@ -2,12 +2,15 @@ import React from 'react'; import { FastField, ErrorMessage } from 'formik'; import { Classes, FormGroup, TextArea } from '@blueprintjs/core'; import { FieldRequiredHint, FormattedMessage as T } from 'components'; +import { useAutofocus } from 'hooks'; import { inputIntent } from 'utils'; /** * Unlocking transactions form fields. */ export default function UnlockingTransactionsFormFields() { + const reasonFieldRef = useAutofocus(); + return (
{/*------------ Locking Reason -----------*/} @@ -24,6 +27,7 @@ export default function UnlockingTransactionsFormFields() { growVertically={true} large={true} intent={inputIntent({ error, touched })} + inputRef={(ref) => (reasonFieldRef.current = ref)} {...field} /> diff --git a/src/containers/TransactionsLocking/TransactionsLockingList.js b/src/containers/TransactionsLocking/TransactionsLockingList.js index 08f403ea5..b9f1e8227 100644 --- a/src/containers/TransactionsLocking/TransactionsLockingList.js +++ b/src/containers/TransactionsLocking/TransactionsLockingList.js @@ -1,9 +1,17 @@ import React from 'react'; +import intl from 'react-intl-universal'; import { Intent } from '@blueprintjs/core'; import styled from 'styled-components'; import * as R from 'ramda'; -import { Alert, ButtonLink, AppToaster, Join, Paragraph } from 'components'; +import { + Alert, + ButtonLink, + AppToaster, + Join, + Paragraph, + FormattedMessage as T, +} from 'components'; import { TransactionsLockingProvider } from './TransactionsLockingProvider'; import { TransactionLockingContent, @@ -130,7 +138,7 @@ function TransactionsLockingAlert() { return transactionLockingType !== 'all' ? ( } intent={Intent.PRIMARY} >

@@ -138,7 +146,7 @@ function TransactionsLockingAlert() { tempor incididunt ut labore et dolore magna aliqua.

- Lock All Transactions At Once → +
) : ( @@ -148,7 +156,7 @@ function TransactionsLockingAlert() { tempor incididunt ut labore et dolore magna aliqua.

- Lock Modules Individually → + ); diff --git a/src/containers/TransactionsLocking/components.js b/src/containers/TransactionsLocking/components.js index 6d23875d7..cdc2e280a 100644 --- a/src/containers/TransactionsLocking/components.js +++ b/src/containers/TransactionsLocking/components.js @@ -1,5 +1,6 @@ import React from 'react'; import styled from 'styled-components'; +import intl from 'react-intl-universal'; import { Button, Position, @@ -96,13 +97,20 @@ export const TransactionLockingContent = ({ - Transactions of the module locked to{' '} - {lockToDate}. + {intl.formatHTMLMessage( + { id: 'transactions_locking.of_the_module_locked_to' }, + { + value: lockToDate, + }, + )} - Lock Reason: {lockReason} + {intl.formatHTMLMessage( + { id: 'transactions_locking.lock_reason' }, + { value: lockReason }, + )} @@ -111,13 +119,21 @@ export const TransactionLockingContent = ({ - Partial unlocked from {unlockFromDate} to{' '} - {unlockToDate}. + {intl.formatHTMLMessage( + { id: 'transactions_locking.partial_unlocked_from' }, + { + fromDate: unlockFromDate, + toDate: unlockToDate, + }, + )} - Unlock Reason: {unlockReason} + {intl.formatHTMLMessage( + { id: 'transactions_locking.unlock_reason' }, + { value: unlockReason }, + )} @@ -132,7 +148,7 @@ export const TransactionLockingContent = ({ intent={Intent.PRIMARY} onClick={handleLockClick} > - Lock + @@ -143,23 +159,28 @@ export const TransactionLockingContent = ({ intent={Intent.PRIMARY} onClick={handleEditBtn} > - Edit + - + } + onClick={handleUnlockFull} + /> } onClick={handleUnlockPartial} /> + } onClick={handleCanclel} /> @@ -169,7 +190,7 @@ export const TransactionLockingContent = ({ minimal={true} > diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 80dbb7944..a866ba3fc 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1608,7 +1608,7 @@ "locking_transactions.dialog.locking_date": "Locking date", "locking_transactions.dialog.reason": "Locking reason", "locking_transactions.dialog.success_message": "All transactions locking has been submit successfully.", - "unlocking_transactions.dialog.label": "transactions locking", + "unlocking_transactions.dialog.label": "Transactions unlocking", "unlocking_transactions.dialog.reason": "Unlocking reason", "unlocking_transactions.dialog.success_message": "Transactions locking has been canceled successfully.", "unlocking_partial_transactions.dialog.label": "Partial unlocking transactions", @@ -1620,5 +1620,18 @@ "unlocking_full_transactions.dialog.reason": "Unlocking reason", "unlocking_partial_transactions.alert.success_message": "Partial transaction unlocking has been canceled successfully.", "unlocking_partial_transactions.alert.message": "Are you sure you want to cancel partial unlock of this module?", - "yes": "Yes" + "yes": "Yes", + "transactions_locking.lock_all_transactions_at_once": "Lock All Transactions At Once →", + "transactions_locking.lock_modules_individually": "Lock Modules Individually →", + "transactions_locking_lock_all_transactions_at_once": "Lock All Transactions At Once.", + "transactions_locking.lock": "Lock", + "transactions_locking.unlock": "Unlock", + "transactions_locking.full_unlock": "Full Unlock", + "transactions_locking.paetial_unlock": "Partial Unlock", + "transactions_locking.cancel_partial_unlock": "Cancel Partial Unlock", + "transactions_locking.of_the_module_locked_to": "Transactions of the module locked to {value}.", + "transactions_locking.lock_reason": "Lock Reason: {value}.", + "transactions_locking.partial_unlocked_from": "Partial unlocked from {fromDate} to {toDate}.", + "transactions_locking.unlock_reason":"Unlock Reason: {value}." + } \ No newline at end of file diff --git a/src/style/pages/TransactionsLocking/TransactionsLockingDialog.scss b/src/style/pages/TransactionsLocking/TransactionsLockingDialog.scss index c02dbdd4f..a8d8bc7e6 100644 --- a/src/style/pages/TransactionsLocking/TransactionsLockingDialog.scss +++ b/src/style/pages/TransactionsLocking/TransactionsLockingDialog.scss @@ -16,6 +16,7 @@ .bp3-form-content { textarea { width: 100%; + min-height: 85px; min-width: 100%; font-size: 14px; } @@ -25,7 +26,7 @@ .bp3-dialog-footer { display: flex; justify-content: flex-start; - padding-top: 10px; + // padding-top: 10px; margin-left: 10px; } }