MINT-1788 Remove ui actions from core-dependencies

package.json

@@ -8,7 +8,6 @@
   "devDependencies": {
     "@chronobank/chronomint-presentation": "github:chronobank/ChronoMintPresentation",
     "@chronobank/core": "*",
-    "@chronobank/core-dependencies": "*",
     "@chronobank/login": "*",
     "@chronobank/login-ui": "*",
     "archiver": "^2.0.0",

packages/core/package.json

@@ -27,8 +27,5 @@
     "uuid": "^3.3.0",
     "web3": "npm:web3@1.0.0-beta.33",
     "web3-eth-abi": "^1.0.0-beta.33"
-  },
-  "peerDependencies": {
-    "@chronobank/core-dependencies": "*"
   }
 }

packages/core/redux/ducks.js

@@ -14,6 +14,7 @@ import ethMultisigWallet from './multisigWallet/reducer'
 import events from './events/reducer'
 import mainWallet from './mainWallet/reducer'
 import market from './market/reducer'
+import modals from './modals/reducer'
 import nem from './nem/reducer'
 import notifier from './notifier/reducer'
 import persistAccount from './persistAccount/reducer'
@@ -37,6 +38,7 @@ const coreReducers = {
   events,
   mainWallet,
   market,
+  modals,
   nem,
   notifier,
   persistAccount,

packages/core/redux/ethereum/thunks.js

@@ -5,7 +5,7 @@
 
 import BigNumber from 'bignumber.js'
 import { isNil, omitBy } from 'lodash'
-import { modalsOpen } from '@chronobank/core-dependencies/redux/modals/actions'
+import { modalsOpen } from '@chronobank/core/redux/modals/actions'
 import { SignerMemoryModel, TxEntryModel, HolderModel } from '../../models'
 import { ethereumPendingSelector, pendingEntrySelector, web3Selector } from './selectors'
 import { DUCK_ETHEREUM } from './constants'

src/redux/modals/actions.js → packages/core/redux/modals/actions.js

@@ -3,33 +3,38 @@
  * Licensed under the AGPL Version 3 license.
  */
 
+/*
+TODO: Futher refactoring. redux/modals MUST be moved
+out of packages/core after finishing TX send refactoring
+*/
+
 import {
   MODALS_OPEN,
   MODALS_REPLACE,
   MODALS_CLOSE,
   MODALS_CLEAR,
 } from './constants'
 
-export const modalsOpen = ({ componentName, props }) => (dispatch) =>
-  dispatch({
+export const modalsOpen = ({ componentName, props }) =>
+  ({
     type: MODALS_OPEN,
     componentName,
     props,
   })
 
-export const modalsReplace = ({ componentName, props }) => (dispatch) =>
-  dispatch({
+export const modalsReplace = ({ componentName, props }) =>
+  ({
     type: MODALS_REPLACE,
     componentName,
     props,
   })
 
-export const modalsClose = () => (dispatch) =>
-  dispatch({
+export const modalsClose = () =>
+  ({
     type: MODALS_CLOSE,
   })
 
-export const modalsClear = () => (dispatch) =>
-  dispatch({
+export const modalsClear = () =>
+  ({
     type: MODALS_CLEAR,
   })

src/redux/modals/actions.spec.js → packages/core/redux/modals/actions.spec.js

@@ -4,7 +4,7 @@
  */
 
 import { store } from 'specsInit'
-import * as actions from 'redux/modals/actions'
+import * as actions from './actions'
 
 describe('modals actions', () => {
   ['modalsOpen', 'modalsShow', 'modalsPush'].forEach((name) => {

src/redux/modals/reducer.spec.js → packages/core/redux/modals/reducer.spec.js

@@ -3,10 +3,10 @@
  * Licensed under the AGPL Version 3 license.
  */
 
-import React, { PureComponent } from 'react'
+import { PureComponent } from 'react'
 
-import * as actions from 'redux/modals/actions'
-import reducer from 'redux/modals/reducer'
+import * as actions from './actions'
+import reducer from './reducer'
 
 const initialState = {
   stack: [],

packages/core/redux/nem/thunks.js

@@ -3,7 +3,7 @@
  * Licensed under the AGPL Version 3 license.
  */
 
-import { modalsOpen } from '@chronobank/core-dependencies/redux/modals/actions'
+import { modalsOpen } from '@chronobank/core/redux/modals/actions'
 import { nemProvider } from '@chronobank/login/network/NemProvider'
 import { ErrorNoticeModel, SignerMemoryModel, TransferNoticeModel } from '../../models'
 import { nemPendingSelector, pendingEntrySelector } from './selectors'