diff --git a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js index 287b70a38..326dfdde6 100644 --- a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js +++ b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js @@ -8,9 +8,10 @@ import LockingTransactionsForm from './LockingTransactionsForm'; export default function LockingTransactionsDialogContent({ // #ownProps dialogName, + moduleName, }) { return ( - + ); diff --git a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.js b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.js index 4de89c382..2ff1aef29 100644 --- a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.js +++ b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.js @@ -16,7 +16,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions'; import { compose } from 'utils'; const defaultInitialValues = { - module: 'all', + module: '', lock_to_date: moment(new Date()).format('YYYY-MM-DD'), reason: '', }; @@ -28,12 +28,13 @@ function LockingTransactionsForm({ // #withDialogActions closeDialog, }) { - const { dialogName, createLockingTransactionMutate } = + const { dialogName, moduleName, createLockingTransactionMutate } = useLockingTransactionsContext(); // Initial form values. const initialValues = { ...defaultInitialValues, + module: moduleName, }; // Handles the form submit. diff --git a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js index d12a3ca30..4532f8e7d 100644 --- a/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js +++ b/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js @@ -7,15 +7,15 @@ const LockingTransactionsContext = React.createContext(); /** * Locking transactions form provider. */ -function LockingTransactionsFormProvider({ dialogName, ...props }) { - +function LockingTransactionsFormProvider({ moduleName, dialogName, ...props }) { // Create locking transactions mutations. const { mutateAsync: createLockingTransactionMutate } = - useCreateLockingTransactoin(); + useCreateLockingTransactoin(); // State provider. const provider = { dialogName, + moduleName, createLockingTransactionMutate, }; return ( diff --git a/src/containers/Dialogs/LockingTransactionsDialog/index.js b/src/containers/Dialogs/LockingTransactionsDialog/index.js index 2b1c19085..b3bcbb20a 100644 --- a/src/containers/Dialogs/LockingTransactionsDialog/index.js +++ b/src/containers/Dialogs/LockingTransactionsDialog/index.js @@ -10,7 +10,11 @@ const LockingTransactionsDialogContent = React.lazy(() => /** * Locking Transactions dialog */ -function LockingTransactionsDialog({ dialogName, payload = {}, isOpen }) { +function LockingTransactionsDialog({ + dialogName, + payload: { module }, + isOpen, +}) { return ( - + ); diff --git a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsDialogContent.js b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsDialogContent.js index 08e872ded..6b5772da2 100644 --- a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsDialogContent.js +++ b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsDialogContent.js @@ -8,10 +8,14 @@ import UnlockingPartialTransactionsForm from './UnlockingPartialTransactionsForm */ export default function UnlockingPartialTransactionsDialogContent({ // #ownProps + moduleName, dialogName, }) { return ( - + ); diff --git a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.js b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.js index 2859b570e..6e6cb04e2 100644 --- a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.js +++ b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.js @@ -16,7 +16,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions'; import { compose } from 'utils'; const defaultInitialValues = { - module: 'all', + module: '', unlock_from_date: moment(new Date()).format('YYYY-MM-DD'), unlock_to_date: moment(new Date()).format('YYYY-MM-DD'), reason: '', @@ -29,12 +29,13 @@ function UnlockingPartialTransactionsForm({ // #withDialogActions closeDialog, }) { - const { dialogName, createUnlockingPartialTransactionsMutate } = + const { dialogName, moduleName, createUnlockingPartialTransactionsMutate } = useUnlockingPartialTransactionsContext(); // Initial form values. const initialValues = { ...defaultInitialValues, + module: moduleName, }; // Handles the form submit. diff --git a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormProvider.js b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormProvider.js index 2669090c8..47266ea21 100644 --- a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormProvider.js +++ b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormProvider.js @@ -7,7 +7,11 @@ const UnlockingPartialTransactionsContext = React.createContext(); /** * Unlocking partial transactions form provider. */ -function UnlockingPartialTransactionsFormProvider({ dialogName, ...props }) { +function UnlockingPartialTransactionsFormProvider({ + moduleName, + dialogName, + ...props +}) { // Create unlocking partial transactions mutations. const { mutateAsync: createUnlockingPartialTransactionsMutate } = useCreateUnlockingPartialTransactions(); @@ -15,6 +19,7 @@ function UnlockingPartialTransactionsFormProvider({ dialogName, ...props }) { // State provider. const provider = { dialogName, + moduleName, createUnlockingPartialTransactionsMutate, }; diff --git a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/index.js b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/index.js index a3b8b1e3d..ab0b7cad8 100644 --- a/src/containers/Dialogs/UnlockingPartialTransactionsDialog/index.js +++ b/src/containers/Dialogs/UnlockingPartialTransactionsDialog/index.js @@ -13,7 +13,7 @@ const UnlockingPartialTransactionsDialogContent = React.lazy(() => function UnLockingPartialTransactionsDilaog({ isOpen, dialogName, - payload = {}, + payload: { module }, }) { return ( - + ); diff --git a/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsDialogContent.js b/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsDialogContent.js index 655d507fd..2b262c6d2 100644 --- a/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsDialogContent.js +++ b/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsDialogContent.js @@ -5,10 +5,11 @@ import { UnlockingTransactionsFormProvider } from './UnlockingTransactionsFormPr export default function UnlockingTransactionsDialogContent({ // #ownProps + moduleName, dialogName, }) { return ( - + ); diff --git a/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.js b/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.js index c99866be1..e2d86efa5 100644 --- a/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.js +++ b/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.js @@ -15,7 +15,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions'; import { compose } from 'utils'; const defaultInitialValues = { - module: 'all', + module: '', reason: '', }; @@ -28,6 +28,7 @@ function UnlockingTransactionsForm({ }) { const { dialogName, + moduleName, cancelLockingTransactionMutate, cancelUnLockingPartialTransactionMutate, } = useUnlockingTransactionsContext(); @@ -35,6 +36,7 @@ function UnlockingTransactionsForm({ // Initial form values. const initialValues = { ...defaultInitialValues, + module: moduleName, }; // Handles the form submit. diff --git a/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormProvider.js b/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormProvider.js index e64526478..8ca8adc57 100644 --- a/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormProvider.js +++ b/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormProvider.js @@ -10,7 +10,7 @@ const UnlockingTransactionsContext = React.createContext(); /** * Unlocking transactions form provider. */ -function UnlockingTransactionsFormProvider({ dialogName, ...props }) { +function UnlockingTransactionsFormProvider({ moduleName, dialogName, ...props }) { // Cancle locking transactions mutations. const { mutateAsync: cancelLockingTransactionMutate } = useCancelLockingTransaction(); @@ -22,6 +22,7 @@ function UnlockingTransactionsFormProvider({ dialogName, ...props }) { // State provider. const provider = { dialogName, + moduleName, cancelLockingTransactionMutate, cancelUnLockingPartialTransactionMutate, }; diff --git a/src/containers/Dialogs/UnlockingTransactionsDialog/index.js b/src/containers/Dialogs/UnlockingTransactionsDialog/index.js index 9c400de06..e5fd6540d 100644 --- a/src/containers/Dialogs/UnlockingTransactionsDialog/index.js +++ b/src/containers/Dialogs/UnlockingTransactionsDialog/index.js @@ -10,7 +10,11 @@ const UnlockingTransactionsDialogContent = React.lazy(() => /** * Unlocking transactions dialog. */ -function UnlockingTransactionsDialog({ dialogName, payload = {}, isOpen }) { +function UnlockingTransactionsDialog({ + dialogName, + payload: { module }, + isOpen, +}) { return ( - + ); diff --git a/src/containers/TransactionsLocking/TransactionsLockingList.js b/src/containers/TransactionsLocking/TransactionsLockingList.js index 5348dadbb..ba529b9c9 100644 --- a/src/containers/TransactionsLocking/TransactionsLockingList.js +++ b/src/containers/TransactionsLocking/TransactionsLockingList.js @@ -16,14 +16,15 @@ function Paragraph({ className, children }) { } function TransactionsLockingList({ items, onlock, onUnlock, onUnlockPartial }) { - return items.map(({ is_enabled, formatted_module, description }) => ( + return items.map(({ is_enabled, module, formatted_module, description }) => ( )); } @@ -36,17 +37,17 @@ function TransactionsLockingListPage({ openDialog, }) { // Handle locking transactions. - const handleLockingTransactions = () => { - openDialog('locking-transactions', {}); + const handleLockingTransactions = (module) => { + openDialog('locking-transactions', { module: module }); }; // Handle unlocking transactions - const handleUnlockTransactions = () => { - openDialog('unlocking-transactions', {}); + const handleUnlockTransactions = (module) => { + openDialog('unlocking-transactions', { module: module }); }; // Handle unlocking transactions - const handleUnlockingPartial = () => { - openDialog('unlocking-partial-transactions', {}); + const handleUnlockingPartial = (module) => { + openDialog('unlocking-partial-transactions', { module: module }); }; const { diff --git a/src/containers/TransactionsLocking/TransactionsLockingProvider.js b/src/containers/TransactionsLocking/TransactionsLockingProvider.js index 7ade11e12..e7448d458 100644 --- a/src/containers/TransactionsLocking/TransactionsLockingProvider.js +++ b/src/containers/TransactionsLocking/TransactionsLockingProvider.js @@ -15,8 +15,6 @@ function TransactionsLockingProvider({ ...props }) { isLoading: isTransactionLockingLoading, } = useTransactionsLocking(); - console.log(transactionsLocking, 'XX'); - // Provider const provider = { transactionsLocking,