Merge remote-tracking branch 'origin/accounts_fix'

client/src/containers/Dialogs/AccountFormDialog.container.js

@@ -8,12 +8,16 @@ import withAccounts from 'containers/Accounts/withAccounts';
 
 export const mapStateToProps = (state, props) => ({
   dialogName: 'account-form',
+  accountId:
+    props.payload.action === 'edit' && props.payload.id
+      ? props.payload.id
+      : null,
 });
 const AccountFormDialogConnect = connect(mapStateToProps);
 
 export default compose(
-  AccountFormDialogConnect,
   withDialogRedux(null, 'account-form'),
+  AccountFormDialogConnect,
   withAccountsActions,
   withAccountDetail,
   withAccounts(({ accountsTypes, accounts }) => ({