From 517487d23d0514c9d23b683f5e09289ed72e5fd9 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 20 Jun 2018 12:23:39 +0300 Subject: [PATCH 01/30] Ignore .vscode folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2763c9a4e..336e39afa 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ coverage/ .idea/ *.log *.bac +.vscode build/ report/ From c339fe3254bf304b08a9c836906e754c5921d90e Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 20 Jun 2018 15:02:10 +0300 Subject: [PATCH 02/30] Remove unused .babelrc --- .babelrc | 31 ------------------------------- config/babel.dev.js | 16 +++++++++++++--- config/babel.prod.js | 16 +++++++++++++--- 3 files changed, 26 insertions(+), 37 deletions(-) delete mode 100644 .babelrc diff --git a/.babelrc b/.babelrc deleted file mode 100644 index bea419b5f..000000000 --- a/.babelrc +++ /dev/null @@ -1,31 +0,0 @@ -{ - "presets": [ - "env", - "react" - ], - "plugins": [ - ["babel-plugin-react-css-modules", { - "generateScopedName": "[name]__[local]___[hash:base64:5]", - "filetypes": { - ".scss": "postcss-scss" - } - }], - "add-module-exports", - "syntax-decorators", - "syntax-trailing-function-commas", - "transform-class-properties", - "transform-decorators-legacy", - "transform-object-rest-spread", - "transform-react-constant-elements", - "transform-runtime", - [ - "react-css-modules", - { - "generateScopedName": "[name]__[local]___[hash:base64:5]", - "filetypes": { - ".scss": "postcss-scss" - } - } - ] - ] -} diff --git a/config/babel.dev.js b/config/babel.dev.js index a40674050..eb7954300 100644 --- a/config/babel.dev.js +++ b/config/babel.dev.js @@ -3,6 +3,11 @@ * Licensed under the AGPL Version 3 license. */ +const resolver = (module) => + (typeof module === 'string') + ? require.resolve(module) + : [require.resolve(module[0]), module[1]] + module.exports = { cacheDirectory: true, presets: [ @@ -10,7 +15,7 @@ module.exports = { 'babel-preset-env', 'babel-preset-react-hmre', 'babel-preset-stage-0', - ].map(require.resolve), + ].map(resolver), plugins: [ 'babel-plugin-transform-decorators-legacy', 'babel-plugin-syntax-decorators', @@ -20,7 +25,12 @@ module.exports = { 'babel-plugin-transform-object-rest-spread', 'babel-plugin-transform-react-constant-elements', 'babel-plugin-transform-class-properties', - 'babel-plugin-react-css-modules', + ['babel-plugin-react-css-modules', { + "generateScopedName": "[name]__[local]___[hash:base64:5]", + "filetypes": { + ".scss": "postcss-scss", + }, + }], 'react-hot-loader/babel', - ].map(require.resolve), + ].map(resolver), } diff --git a/config/babel.prod.js b/config/babel.prod.js index c6038de6e..39f7d764e 100644 --- a/config/babel.prod.js +++ b/config/babel.prod.js @@ -3,12 +3,17 @@ * Licensed under the AGPL Version 3 license. */ +const resolver = (module) => + (typeof module === 'string') + ? require.resolve(module) + : [require.resolve(module[0]), module[1]] + module.exports = { presets: [ 'babel-preset-env', 'babel-preset-react', 'babel-preset-stage-0', - ].map(require.resolve), + ].map(resolver), plugins: [ 'babel-plugin-transform-decorators-legacy', 'babel-plugin-syntax-decorators', @@ -18,6 +23,11 @@ module.exports = { 'babel-plugin-transform-object-rest-spread', 'babel-plugin-transform-react-constant-elements', 'babel-plugin-transform-class-properties', - 'babel-plugin-react-css-modules', - ].map(require.resolve), + ['babel-plugin-react-css-modules', { + "generateScopedName": "[name]__[local]___[hash:base64:5]", + "filetypes": { + ".scss": "postcss-scss", + }, + }], + ].map(resolver), } From a3c86e37e347d3fb35596e46217250f2948c835a Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 20 Jun 2018 15:17:54 +0300 Subject: [PATCH 03/30] Remove babel-plugin-add-module-exports and fix relevant files --- config/babel.dev.js | 1 - config/babel.prod.js | 1 - package.json | 1 - src/i18n/en.js | 8 ++++---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/config/babel.dev.js b/config/babel.dev.js index eb7954300..6f431aeba 100644 --- a/config/babel.dev.js +++ b/config/babel.dev.js @@ -19,7 +19,6 @@ module.exports = { plugins: [ 'babel-plugin-transform-decorators-legacy', 'babel-plugin-syntax-decorators', - 'babel-plugin-add-module-exports', 'babel-plugin-syntax-trailing-function-commas', 'babel-plugin-transform-runtime', 'babel-plugin-transform-object-rest-spread', diff --git a/config/babel.prod.js b/config/babel.prod.js index 39f7d764e..e307dc720 100644 --- a/config/babel.prod.js +++ b/config/babel.prod.js @@ -17,7 +17,6 @@ module.exports = { plugins: [ 'babel-plugin-transform-decorators-legacy', 'babel-plugin-syntax-decorators', - 'babel-plugin-add-module-exports', 'babel-plugin-syntax-trailing-function-commas', 'babel-plugin-transform-runtime', 'babel-plugin-transform-object-rest-spread', diff --git a/package.json b/package.json index 12defe247..adc07658a 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "babel-eslint": "^8.1.1", "babel-jest": "21.2.0", "babel-loader": "7.0.0", - "babel-plugin-add-module-exports": "^0.2.1", "babel-plugin-syntax-decorators": "^6.13.0", "babel-plugin-syntax-trailing-function-commas": "6.22.0", "babel-plugin-transform-class-properties": "6.24.1", diff --git a/src/i18n/en.js b/src/i18n/en.js index 999157624..34b7559f5 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -4,7 +4,7 @@ */ import { en as Login } from '@chronobank/login-ui/lang' -import { en as components } from 'components/lang' +import components from 'components/lang' import * as assetDonator from 'dao/AssetDonatorDAO' import * as erc20 from 'dao/ERC20DAO' import * as erc20Manager from 'dao/ERC20ManagerDAO' @@ -18,7 +18,7 @@ import * as pollInterface from 'dao/PollInterfaceDAO' import * as rewards from 'dao/RewardsDAO' import * as time from 'dao/AssetHolderDAO' import * as user from 'dao/UserManagerDAO' -import { en as layouts } from 'layouts/lang' +import layouts from 'layouts/lang' import * as votingManager from 'dao/VotingManagerDAO' import * as chronoBankAsset from 'dao/ChronoBankAssetDAO' @@ -32,8 +32,8 @@ export default { false: 'no', tokenNotAvailable: 'Token Not Available', ...Login, - ...components, - layouts, + ...components.en, + layouts: layouts.en, global: { about: 'About', labourHours: 'Labour—Hours', From 108eb34efc30c02ab8bb3879a7aa0618d623192b Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 20 Jun 2018 15:21:31 +0300 Subject: [PATCH 04/30] Fix exports is not defined --- config/babel.dev.js | 2 +- config/babel.prod.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/babel.dev.js b/config/babel.dev.js index 6f431aeba..2fdf1742c 100644 --- a/config/babel.dev.js +++ b/config/babel.dev.js @@ -20,7 +20,7 @@ module.exports = { 'babel-plugin-transform-decorators-legacy', 'babel-plugin-syntax-decorators', 'babel-plugin-syntax-trailing-function-commas', - 'babel-plugin-transform-runtime', + ['babel-plugin-transform-runtime', { polyfill: false }], 'babel-plugin-transform-object-rest-spread', 'babel-plugin-transform-react-constant-elements', 'babel-plugin-transform-class-properties', diff --git a/config/babel.prod.js b/config/babel.prod.js index e307dc720..b370e57c0 100644 --- a/config/babel.prod.js +++ b/config/babel.prod.js @@ -18,7 +18,7 @@ module.exports = { 'babel-plugin-transform-decorators-legacy', 'babel-plugin-syntax-decorators', 'babel-plugin-syntax-trailing-function-commas', - 'babel-plugin-transform-runtime', + ['babel-plugin-transform-runtime', { polyfill: false }], 'babel-plugin-transform-object-rest-spread', 'babel-plugin-transform-react-constant-elements', 'babel-plugin-transform-class-properties', From 265959b0960af842cebd53e380ca46bccffbc0b4 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 6 Jun 2018 15:44:23 +0300 Subject: [PATCH 05/30] Create core package --- packages/core/package.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/core/package.json diff --git a/packages/core/package.json b/packages/core/package.json new file mode 100644 index 000000000..47f94511a --- /dev/null +++ b/packages/core/package.json @@ -0,0 +1,7 @@ +{ + "name": "@chronobank/core", + "version": "0.8.1", + "peerDependencies": { + "@chronobank/core-dependencies": "*" + } +} \ No newline at end of file From af4fc9db246c6bb4798a1b9de3b7d4fc01daee95 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 6 Jun 2018 15:50:05 +0300 Subject: [PATCH 06/30] Move files to core package Refers to: CM-58 --- {src => packages/core}/dao/AbstractContractDAO.js | 0 {src => packages/core}/dao/AbstractMultisigContractDAO.js | 0 {src => packages/core}/dao/AbstractTokenDAO.js | 0 {src => packages/core}/dao/AssetDonatorDAO.js | 0 {src => packages/core}/dao/AssetHolderDAO.js | 0 {src => packages/core}/dao/AssetsManagerDAO.js | 0 {src => packages/core}/dao/BitcoinDAO.js | 0 {src => packages/core}/dao/ChronoBankAssetDAO.js | 0 {src => packages/core}/dao/ChronoBankAssetProxyDAO.js | 0 {src => packages/core}/dao/ChronoBankPlatformDAO.js | 0 {src => packages/core}/dao/ContractsManagerDAO.js | 0 {src => packages/core}/dao/ERC20DAO.js | 0 {src => packages/core}/dao/ERC20ManagerDAO.js | 0 {src => packages/core}/dao/EthereumDAO.js | 0 {src => packages/core}/dao/ExchangeDAO.js | 0 {src => packages/core}/dao/ExchangeManagerDAO.js | 0 {src => packages/core}/dao/FakeCoinDAO.js | 0 {src => packages/core}/dao/FeeInterfaceDAO.js | 0 {src => packages/core}/dao/LHTDAO.js | 0 {src => packages/core}/dao/LOCManagerDAO.js | 0 {src => packages/core}/dao/MultisigWalletDAO.js | 0 {src => packages/core}/dao/MultisigWalletsManagerDAO.js | 0 {src => packages/core}/dao/NemDAO.js | 0 {src => packages/core}/dao/PendingManagerDAO.js | 0 .../core}/dao/PlatformTokenExtensionGatewayManagerEmitterDAO.js | 0 {src => packages/core}/dao/PlatformsManagerDAO.js | 0 {src => packages/core}/dao/PollEmitterDAO.js | 0 {src => packages/core}/dao/PollInterfaceDAO.js | 0 {src => packages/core}/dao/RewardsDAO.js | 0 {src => packages/core}/dao/TokenManagementExtensionDAO.js | 0 {src => packages/core}/dao/UserManagerDAO.js | 0 {src => packages/core}/dao/VotingManagerDAO.js | 0 {src => packages/core}/dao/abi/ERC20DAODefaultABI.js | 0 {src => packages/core}/dao/abi/index.js | 0 {src => packages/core}/market/MarketSocket.js | 0 {src => packages/core}/market/__mocks__/socket.io-client.js | 0 {src => packages/core}/market/ccc-streamer-utilities.js | 0 {src => packages/core}/models/AbstractFetchingCollection.js | 0 {src => packages/core}/models/AbstractFetchingModel.js | 0 {src => packages/core}/models/AbstractModel.js | 0 {src => packages/core}/models/AdditionalActionModel.js | 0 {src => packages/core}/models/Amount.js | 0 {src => packages/core}/models/CBEModel.js | 0 {src => packages/core}/models/FileSelect/FileCollection.js | 0 {src => packages/core}/models/FileSelect/FileExtension.js | 0 {src => packages/core}/models/FileSelect/FileModel.js | 0 {src => packages/core}/models/LOCModel.js | 0 {src => packages/core}/models/LOCModel.spec.js | 0 {src => packages/core}/models/OperationModel.js | 0 {src => packages/core}/models/PollDetailsModel.js | 0 {src => packages/core}/models/PollModel.js | 0 {src => packages/core}/models/ProfileModel.js | 0 {src => packages/core}/models/ProfileModel.spec.js | 0 {src => packages/core}/models/TransferError.js | 0 {src => packages/core}/models/TransferExecModel.js | 0 {src => packages/core}/models/TxError.js | 0 {src => packages/core}/models/TxExecModel.js | 0 {src => packages/core}/models/TxModel.js | 0 {src => packages/core}/models/__snapshots__/LOCModel.spec.js.snap | 0 {src => packages/core}/models/assetHolder/AssetHolderModel.js | 0 {src => packages/core}/models/assetHolder/AssetModel.js | 0 {src => packages/core}/models/assetHolder/AssetsCollection.js | 0 .../core}/models/assetsManager/MainAssetsManagerModel.js | 0 {src => packages/core}/models/constants.js | 0 {src => packages/core}/models/exchange/ExchangeModel.js | 0 {src => packages/core}/models/exchange/ExchangeOrderModel.js | 0 {src => packages/core}/models/exchange/ExchangesCollection.js | 0 {src => packages/core}/models/notices/AbstractNoticeModel.js | 0 {src => packages/core}/models/notices/ApprovalNoticeModel.js | 0 {src => packages/core}/models/notices/ArbitraryNoticeModel.js | 0 {src => packages/core}/models/notices/AssetsManagerNoticeModel.js | 0 {src => packages/core}/models/notices/CBENoticeModel.js | 0 {src => packages/core}/models/notices/CBENoticeModel.spec.js | 0 {src => packages/core}/models/notices/ErrorNoticeModel.js | 0 {src => packages/core}/models/notices/LOCNoticeModel.js | 0 {src => packages/core}/models/notices/OperationNoticeModel.js | 0 {src => packages/core}/models/notices/PollNoticeModel.js | 0 {src => packages/core}/models/notices/ProfileNoticeModel.js | 0 {src => packages/core}/models/notices/TokenNoticeModel.js | 0 .../core}/models/notices/TransactionErrorNoticeModel.js | 0 {src => packages/core}/models/notices/TransferErrorNoticeModel.js | 0 {src => packages/core}/models/notices/TransferNoticeModel.js | 0 {src => packages/core}/models/notices/WalletNoticeModel.js | 0 {src => packages/core}/models/rewards/AbstractPeriodModel.js | 0 {src => packages/core}/models/rewards/RewardsCollection.js | 0 .../core}/models/rewards/RewardsCurrentPeriodModel.js | 0 {src => packages/core}/models/rewards/RewardsModel.js | 0 {src => packages/core}/models/rewards/RewardsModel.spec.js | 0 {src => packages/core}/models/rewards/RewardsPeriodModel.js | 0 {src => packages/core}/models/rewards/RewardsPeriodModel.spec.js | 0 {src => packages/core}/models/tokens/BalanceModel.js | 0 {src => packages/core}/models/tokens/BalancesCollection.js | 0 {src => packages/core}/models/tokens/BlacklistModel.js | 0 {src => packages/core}/models/tokens/FeeModel.js | 0 {src => packages/core}/models/tokens/PausedModel.js | 0 {src => packages/core}/models/tokens/ReissuableModel.js | 0 {src => packages/core}/models/tokens/TokenModel.js | 0 {src => packages/core}/models/tokens/TokensCollection.js | 0 {src => packages/core}/models/validator.js | 0 {src => packages/core}/models/validator.spec.js | 0 {src => packages/core}/models/voting/VotingCollection.js | 0 {src => packages/core}/models/voting/VotingMainModel.js | 0 {src => packages/core}/models/wallet/AddressModel.js | 0 {src => packages/core}/models/wallet/AddressesCollection.js | 0 {src => packages/core}/models/wallet/AllowanceCollection.js | 0 {src => packages/core}/models/wallet/AllowanceModel.js | 0 {src => packages/core}/models/wallet/DerivedWalletModel.js | 0 {src => packages/core}/models/wallet/MainWalletModel.js | 0 {src => packages/core}/models/wallet/MultisigTransactionModel.js | 0 {src => packages/core}/models/wallet/MultisigWalletCollection.js | 0 {src => packages/core}/models/wallet/MultisigWalletModel.js | 0 {src => packages/core}/models/wallet/MultisigWalletModel.spec.js | 0 .../core}/models/wallet/MultisigWalletPendingTxCollection.js | 0 .../core}/models/wallet/MultisigWalletPendingTxModel.js | 0 {src => packages/core}/models/wallet/OwnerCollection.js | 0 {src => packages/core}/models/wallet/OwnerModel.js | 0 {src => packages/core}/models/wallet/TransactionsCollection.js | 0 .../models/wallet/__snapshots__/MultisigWalletModel.spec.js.snap | 0 {src => packages/core}/redux/assetsHolder/actions.js | 0 {src => packages/core}/redux/assetsHolder/index.js | 0 {src => packages/core}/redux/assetsHolder/reducer.js | 0 {src => packages/core}/redux/assetsHolder/selectors.js | 0 .../core}/redux/assetsManager/__snapshots__/reducer.spec.js.snap | 0 {src => packages/core}/redux/assetsManager/actions.js | 0 {src => packages/core}/redux/assetsManager/actions.spec.js | 0 {src => packages/core}/redux/assetsManager/index.js | 0 {src => packages/core}/redux/assetsManager/reducer.js | 0 {src => packages/core}/redux/assetsManager/reducer.spec.js | 0 {src => packages/core}/redux/assetsManager/selectors.js | 0 .../core}/redux/exchange/__snapshots__/actions.spec.js.snap | 0 .../core}/redux/exchange/__snapshots__/reducer.spec.js.snap | 0 {src => packages/core}/redux/exchange/actions.js | 0 {src => packages/core}/redux/exchange/actions.spec.js | 0 {src => packages/core}/redux/exchange/index.js | 0 {src => packages/core}/redux/exchange/reducer.js | 0 {src => packages/core}/redux/exchange/reducer.spec.js | 0 {src => packages/core}/redux/locs/actions.js | 0 {src => packages/core}/redux/locs/actions.spec.js | 0 {src => packages/core}/redux/locs/index.js | 0 {src => packages/core}/redux/locs/reducer.js | 0 {src => packages/core}/redux/locs/reducer.spec.js | 0 {src => packages/core}/redux/locs/selectors.js | 0 .../core}/redux/mainWallet/__snapshots__/reducer.spec.js.snap | 0 {src => packages/core}/redux/mainWallet/actions.js | 0 {src => packages/core}/redux/mainWallet/index.js | 0 {src => packages/core}/redux/mainWallet/reducer.js | 0 {src => packages/core}/redux/mainWallet/reducer.spec.js | 0 {src => packages/core}/redux/mainWallet/selectors.js | 0 {src => packages/core}/redux/market/action.js | 0 {src => packages/core}/redux/market/action.spec.js | 0 {src => packages/core}/redux/market/index.js | 0 {src => packages/core}/redux/market/reducer.js | 0 {src => packages/core}/redux/market/reducer.spec.js | 0 .../core}/redux/multisigWallet/__snapshots__/reducer.spec.js.snap | 0 {src => packages/core}/redux/multisigWallet/actions.js | 0 {src => packages/core}/redux/multisigWallet/actions.spec.js | 0 {src => packages/core}/redux/multisigWallet/index.js | 0 {src => packages/core}/redux/multisigWallet/reducer.js | 0 {src => packages/core}/redux/multisigWallet/reducer.spec.js | 0 {src => packages/core}/redux/multisigWallet/selectors.js | 0 {src => packages/core}/redux/notifier/actions.js | 0 {src => packages/core}/redux/notifier/actions.spec.js | 0 {src => packages/core}/redux/notifier/index.js | 0 {src => packages/core}/redux/notifier/reducer.js | 0 {src => packages/core}/redux/notifier/reducer.spec.js | 0 {src => packages/core}/redux/operations/actions.js | 0 {src => packages/core}/redux/operations/actions.spec.js | 0 {src => packages/core}/redux/operations/index.js | 0 {src => packages/core}/redux/operations/reducer.js | 0 {src => packages/core}/redux/operations/reducer.spec.js | 0 {src => packages/core}/redux/rewards/actions.js | 0 {src => packages/core}/redux/rewards/index.js | 0 {src => packages/core}/redux/rewards/reducer.js | 0 {src => packages/core}/redux/rewards/reducer.spec.js | 0 .../core}/redux/session/__snapshots__/actions.spec.js.snap | 0 {src => packages/core}/redux/session/actions.js | 0 {src => packages/core}/redux/session/actions.spec.js | 0 {src => packages/core}/redux/session/index.js | 0 {src => packages/core}/redux/session/reducer.js | 0 {src => packages/core}/redux/session/reducer.spec.js | 0 {src => packages/core}/redux/session/saveAccountMiddleWare.js | 0 {src => packages/core}/redux/session/selectors.js | 0 .../settings/erc20/tokens/__snapshots__/actions.spec.js.snap | 0 {src => packages/core}/redux/settings/erc20/tokens/actions.js | 0 .../core}/redux/settings/erc20/tokens/actions.spec.js | 0 {src => packages/core}/redux/settings/erc20/tokens/reducer.js | 0 .../core}/redux/settings/erc20/tokens/reducer.spec.js | 0 {src => packages/core}/redux/settings/erc20/tokens/selectors.js | 0 {src => packages/core}/redux/settings/index.js | 0 .../redux/settings/user/cbe/__snapshots__/actions.spec.js.snap | 0 {src => packages/core}/redux/settings/user/cbe/actions.js | 0 {src => packages/core}/redux/settings/user/cbe/actions.spec.js | 0 {src => packages/core}/redux/settings/user/cbe/reducer.js | 0 {src => packages/core}/redux/settings/user/cbe/reducer.spec.js | 0 {src => packages/core}/redux/tokens/actions.js | 0 {src => packages/core}/redux/tokens/index.js | 0 {src => packages/core}/redux/tokens/reducer.js | 0 {src => packages/core}/redux/tokens/selectors.js | 0 .../core}/redux/voting/__snapshots__/reducer.spec.js.snap | 0 {src => packages/core}/redux/voting/actions.js | 0 {src => packages/core}/redux/voting/actions.spec.js | 0 {src => packages/core}/redux/voting/getters.js | 0 {src => packages/core}/redux/voting/index.js | 0 {src => packages/core}/redux/voting/reducer.js | 0 {src => packages/core}/redux/voting/reducer.spec.js | 0 {src => packages/core}/redux/wallet/actions.js | 0 {src => packages/core}/redux/wallet/index.js | 0 {src => packages/core}/redux/wallet/reducer.js | 0 {src => packages/core}/redux/wallet/selectors.js | 0 .../core}/redux/watcher/__snapshots__/actions.spec.js.snap | 0 {src => packages/core}/redux/watcher/actions.js | 0 {src => packages/core}/redux/watcher/actions.spec.js | 0 {src => packages/core}/redux/watcher/index.js | 0 {src => packages/core}/redux/watcher/reducer.js | 0 {src => packages/core}/redux/watcher/reducer.spec.js | 0 {src => packages/core}/services/ExchangeService.js | 0 {src => packages/core}/services/MultisigWalletService.js | 0 {src => packages/core}/services/TokenService.js | 0 {src => packages/core}/services/VotingService.js | 0 {src => packages/core}/utils/Web3Converter.js | 0 {src => packages/core}/utils/Web3Converter.spec.js | 0 221 files changed, 0 insertions(+), 0 deletions(-) rename {src => packages/core}/dao/AbstractContractDAO.js (100%) rename {src => packages/core}/dao/AbstractMultisigContractDAO.js (100%) rename {src => packages/core}/dao/AbstractTokenDAO.js (100%) rename {src => packages/core}/dao/AssetDonatorDAO.js (100%) rename {src => packages/core}/dao/AssetHolderDAO.js (100%) rename {src => packages/core}/dao/AssetsManagerDAO.js (100%) rename {src => packages/core}/dao/BitcoinDAO.js (100%) rename {src => packages/core}/dao/ChronoBankAssetDAO.js (100%) rename {src => packages/core}/dao/ChronoBankAssetProxyDAO.js (100%) rename {src => packages/core}/dao/ChronoBankPlatformDAO.js (100%) rename {src => packages/core}/dao/ContractsManagerDAO.js (100%) rename {src => packages/core}/dao/ERC20DAO.js (100%) rename {src => packages/core}/dao/ERC20ManagerDAO.js (100%) rename {src => packages/core}/dao/EthereumDAO.js (100%) rename {src => packages/core}/dao/ExchangeDAO.js (100%) rename {src => packages/core}/dao/ExchangeManagerDAO.js (100%) rename {src => packages/core}/dao/FakeCoinDAO.js (100%) rename {src => packages/core}/dao/FeeInterfaceDAO.js (100%) rename {src => packages/core}/dao/LHTDAO.js (100%) rename {src => packages/core}/dao/LOCManagerDAO.js (100%) rename {src => packages/core}/dao/MultisigWalletDAO.js (100%) rename {src => packages/core}/dao/MultisigWalletsManagerDAO.js (100%) rename {src => packages/core}/dao/NemDAO.js (100%) rename {src => packages/core}/dao/PendingManagerDAO.js (100%) rename {src => packages/core}/dao/PlatformTokenExtensionGatewayManagerEmitterDAO.js (100%) rename {src => packages/core}/dao/PlatformsManagerDAO.js (100%) rename {src => packages/core}/dao/PollEmitterDAO.js (100%) rename {src => packages/core}/dao/PollInterfaceDAO.js (100%) rename {src => packages/core}/dao/RewardsDAO.js (100%) rename {src => packages/core}/dao/TokenManagementExtensionDAO.js (100%) rename {src => packages/core}/dao/UserManagerDAO.js (100%) rename {src => packages/core}/dao/VotingManagerDAO.js (100%) rename {src => packages/core}/dao/abi/ERC20DAODefaultABI.js (100%) rename {src => packages/core}/dao/abi/index.js (100%) rename {src => packages/core}/market/MarketSocket.js (100%) rename {src => packages/core}/market/__mocks__/socket.io-client.js (100%) rename {src => packages/core}/market/ccc-streamer-utilities.js (100%) rename {src => packages/core}/models/AbstractFetchingCollection.js (100%) rename {src => packages/core}/models/AbstractFetchingModel.js (100%) rename {src => packages/core}/models/AbstractModel.js (100%) rename {src => packages/core}/models/AdditionalActionModel.js (100%) rename {src => packages/core}/models/Amount.js (100%) rename {src => packages/core}/models/CBEModel.js (100%) rename {src => packages/core}/models/FileSelect/FileCollection.js (100%) rename {src => packages/core}/models/FileSelect/FileExtension.js (100%) rename {src => packages/core}/models/FileSelect/FileModel.js (100%) rename {src => packages/core}/models/LOCModel.js (100%) rename {src => packages/core}/models/LOCModel.spec.js (100%) rename {src => packages/core}/models/OperationModel.js (100%) rename {src => packages/core}/models/PollDetailsModel.js (100%) rename {src => packages/core}/models/PollModel.js (100%) rename {src => packages/core}/models/ProfileModel.js (100%) rename {src => packages/core}/models/ProfileModel.spec.js (100%) rename {src => packages/core}/models/TransferError.js (100%) rename {src => packages/core}/models/TransferExecModel.js (100%) rename {src => packages/core}/models/TxError.js (100%) rename {src => packages/core}/models/TxExecModel.js (100%) rename {src => packages/core}/models/TxModel.js (100%) rename {src => packages/core}/models/__snapshots__/LOCModel.spec.js.snap (100%) rename {src => packages/core}/models/assetHolder/AssetHolderModel.js (100%) rename {src => packages/core}/models/assetHolder/AssetModel.js (100%) rename {src => packages/core}/models/assetHolder/AssetsCollection.js (100%) rename {src => packages/core}/models/assetsManager/MainAssetsManagerModel.js (100%) rename {src => packages/core}/models/constants.js (100%) rename {src => packages/core}/models/exchange/ExchangeModel.js (100%) rename {src => packages/core}/models/exchange/ExchangeOrderModel.js (100%) rename {src => packages/core}/models/exchange/ExchangesCollection.js (100%) rename {src => packages/core}/models/notices/AbstractNoticeModel.js (100%) rename {src => packages/core}/models/notices/ApprovalNoticeModel.js (100%) rename {src => packages/core}/models/notices/ArbitraryNoticeModel.js (100%) rename {src => packages/core}/models/notices/AssetsManagerNoticeModel.js (100%) rename {src => packages/core}/models/notices/CBENoticeModel.js (100%) rename {src => packages/core}/models/notices/CBENoticeModel.spec.js (100%) rename {src => packages/core}/models/notices/ErrorNoticeModel.js (100%) rename {src => packages/core}/models/notices/LOCNoticeModel.js (100%) rename {src => packages/core}/models/notices/OperationNoticeModel.js (100%) rename {src => packages/core}/models/notices/PollNoticeModel.js (100%) rename {src => packages/core}/models/notices/ProfileNoticeModel.js (100%) rename {src => packages/core}/models/notices/TokenNoticeModel.js (100%) rename {src => packages/core}/models/notices/TransactionErrorNoticeModel.js (100%) rename {src => packages/core}/models/notices/TransferErrorNoticeModel.js (100%) rename {src => packages/core}/models/notices/TransferNoticeModel.js (100%) rename {src => packages/core}/models/notices/WalletNoticeModel.js (100%) rename {src => packages/core}/models/rewards/AbstractPeriodModel.js (100%) rename {src => packages/core}/models/rewards/RewardsCollection.js (100%) rename {src => packages/core}/models/rewards/RewardsCurrentPeriodModel.js (100%) rename {src => packages/core}/models/rewards/RewardsModel.js (100%) rename {src => packages/core}/models/rewards/RewardsModel.spec.js (100%) rename {src => packages/core}/models/rewards/RewardsPeriodModel.js (100%) rename {src => packages/core}/models/rewards/RewardsPeriodModel.spec.js (100%) rename {src => packages/core}/models/tokens/BalanceModel.js (100%) rename {src => packages/core}/models/tokens/BalancesCollection.js (100%) rename {src => packages/core}/models/tokens/BlacklistModel.js (100%) rename {src => packages/core}/models/tokens/FeeModel.js (100%) rename {src => packages/core}/models/tokens/PausedModel.js (100%) rename {src => packages/core}/models/tokens/ReissuableModel.js (100%) rename {src => packages/core}/models/tokens/TokenModel.js (100%) rename {src => packages/core}/models/tokens/TokensCollection.js (100%) rename {src => packages/core}/models/validator.js (100%) rename {src => packages/core}/models/validator.spec.js (100%) rename {src => packages/core}/models/voting/VotingCollection.js (100%) rename {src => packages/core}/models/voting/VotingMainModel.js (100%) rename {src => packages/core}/models/wallet/AddressModel.js (100%) rename {src => packages/core}/models/wallet/AddressesCollection.js (100%) rename {src => packages/core}/models/wallet/AllowanceCollection.js (100%) rename {src => packages/core}/models/wallet/AllowanceModel.js (100%) rename {src => packages/core}/models/wallet/DerivedWalletModel.js (100%) rename {src => packages/core}/models/wallet/MainWalletModel.js (100%) rename {src => packages/core}/models/wallet/MultisigTransactionModel.js (100%) rename {src => packages/core}/models/wallet/MultisigWalletCollection.js (100%) rename {src => packages/core}/models/wallet/MultisigWalletModel.js (100%) rename {src => packages/core}/models/wallet/MultisigWalletModel.spec.js (100%) rename {src => packages/core}/models/wallet/MultisigWalletPendingTxCollection.js (100%) rename {src => packages/core}/models/wallet/MultisigWalletPendingTxModel.js (100%) rename {src => packages/core}/models/wallet/OwnerCollection.js (100%) rename {src => packages/core}/models/wallet/OwnerModel.js (100%) rename {src => packages/core}/models/wallet/TransactionsCollection.js (100%) rename {src => packages/core}/models/wallet/__snapshots__/MultisigWalletModel.spec.js.snap (100%) rename {src => packages/core}/redux/assetsHolder/actions.js (100%) rename {src => packages/core}/redux/assetsHolder/index.js (100%) rename {src => packages/core}/redux/assetsHolder/reducer.js (100%) rename {src => packages/core}/redux/assetsHolder/selectors.js (100%) rename {src => packages/core}/redux/assetsManager/__snapshots__/reducer.spec.js.snap (100%) rename {src => packages/core}/redux/assetsManager/actions.js (100%) rename {src => packages/core}/redux/assetsManager/actions.spec.js (100%) rename {src => packages/core}/redux/assetsManager/index.js (100%) rename {src => packages/core}/redux/assetsManager/reducer.js (100%) rename {src => packages/core}/redux/assetsManager/reducer.spec.js (100%) rename {src => packages/core}/redux/assetsManager/selectors.js (100%) rename {src => packages/core}/redux/exchange/__snapshots__/actions.spec.js.snap (100%) rename {src => packages/core}/redux/exchange/__snapshots__/reducer.spec.js.snap (100%) rename {src => packages/core}/redux/exchange/actions.js (100%) rename {src => packages/core}/redux/exchange/actions.spec.js (100%) rename {src => packages/core}/redux/exchange/index.js (100%) rename {src => packages/core}/redux/exchange/reducer.js (100%) rename {src => packages/core}/redux/exchange/reducer.spec.js (100%) rename {src => packages/core}/redux/locs/actions.js (100%) rename {src => packages/core}/redux/locs/actions.spec.js (100%) rename {src => packages/core}/redux/locs/index.js (100%) rename {src => packages/core}/redux/locs/reducer.js (100%) rename {src => packages/core}/redux/locs/reducer.spec.js (100%) rename {src => packages/core}/redux/locs/selectors.js (100%) rename {src => packages/core}/redux/mainWallet/__snapshots__/reducer.spec.js.snap (100%) rename {src => packages/core}/redux/mainWallet/actions.js (100%) rename {src => packages/core}/redux/mainWallet/index.js (100%) rename {src => packages/core}/redux/mainWallet/reducer.js (100%) rename {src => packages/core}/redux/mainWallet/reducer.spec.js (100%) rename {src => packages/core}/redux/mainWallet/selectors.js (100%) rename {src => packages/core}/redux/market/action.js (100%) rename {src => packages/core}/redux/market/action.spec.js (100%) rename {src => packages/core}/redux/market/index.js (100%) rename {src => packages/core}/redux/market/reducer.js (100%) rename {src => packages/core}/redux/market/reducer.spec.js (100%) rename {src => packages/core}/redux/multisigWallet/__snapshots__/reducer.spec.js.snap (100%) rename {src => packages/core}/redux/multisigWallet/actions.js (100%) rename {src => packages/core}/redux/multisigWallet/actions.spec.js (100%) rename {src => packages/core}/redux/multisigWallet/index.js (100%) rename {src => packages/core}/redux/multisigWallet/reducer.js (100%) rename {src => packages/core}/redux/multisigWallet/reducer.spec.js (100%) rename {src => packages/core}/redux/multisigWallet/selectors.js (100%) rename {src => packages/core}/redux/notifier/actions.js (100%) rename {src => packages/core}/redux/notifier/actions.spec.js (100%) rename {src => packages/core}/redux/notifier/index.js (100%) rename {src => packages/core}/redux/notifier/reducer.js (100%) rename {src => packages/core}/redux/notifier/reducer.spec.js (100%) rename {src => packages/core}/redux/operations/actions.js (100%) rename {src => packages/core}/redux/operations/actions.spec.js (100%) rename {src => packages/core}/redux/operations/index.js (100%) rename {src => packages/core}/redux/operations/reducer.js (100%) rename {src => packages/core}/redux/operations/reducer.spec.js (100%) rename {src => packages/core}/redux/rewards/actions.js (100%) rename {src => packages/core}/redux/rewards/index.js (100%) rename {src => packages/core}/redux/rewards/reducer.js (100%) rename {src => packages/core}/redux/rewards/reducer.spec.js (100%) rename {src => packages/core}/redux/session/__snapshots__/actions.spec.js.snap (100%) rename {src => packages/core}/redux/session/actions.js (100%) rename {src => packages/core}/redux/session/actions.spec.js (100%) rename {src => packages/core}/redux/session/index.js (100%) rename {src => packages/core}/redux/session/reducer.js (100%) rename {src => packages/core}/redux/session/reducer.spec.js (100%) rename {src => packages/core}/redux/session/saveAccountMiddleWare.js (100%) rename {src => packages/core}/redux/session/selectors.js (100%) rename {src => packages/core}/redux/settings/erc20/tokens/__snapshots__/actions.spec.js.snap (100%) rename {src => packages/core}/redux/settings/erc20/tokens/actions.js (100%) rename {src => packages/core}/redux/settings/erc20/tokens/actions.spec.js (100%) rename {src => packages/core}/redux/settings/erc20/tokens/reducer.js (100%) rename {src => packages/core}/redux/settings/erc20/tokens/reducer.spec.js (100%) rename {src => packages/core}/redux/settings/erc20/tokens/selectors.js (100%) rename {src => packages/core}/redux/settings/index.js (100%) rename {src => packages/core}/redux/settings/user/cbe/__snapshots__/actions.spec.js.snap (100%) rename {src => packages/core}/redux/settings/user/cbe/actions.js (100%) rename {src => packages/core}/redux/settings/user/cbe/actions.spec.js (100%) rename {src => packages/core}/redux/settings/user/cbe/reducer.js (100%) rename {src => packages/core}/redux/settings/user/cbe/reducer.spec.js (100%) rename {src => packages/core}/redux/tokens/actions.js (100%) rename {src => packages/core}/redux/tokens/index.js (100%) rename {src => packages/core}/redux/tokens/reducer.js (100%) rename {src => packages/core}/redux/tokens/selectors.js (100%) rename {src => packages/core}/redux/voting/__snapshots__/reducer.spec.js.snap (100%) rename {src => packages/core}/redux/voting/actions.js (100%) rename {src => packages/core}/redux/voting/actions.spec.js (100%) rename {src => packages/core}/redux/voting/getters.js (100%) rename {src => packages/core}/redux/voting/index.js (100%) rename {src => packages/core}/redux/voting/reducer.js (100%) rename {src => packages/core}/redux/voting/reducer.spec.js (100%) rename {src => packages/core}/redux/wallet/actions.js (100%) rename {src => packages/core}/redux/wallet/index.js (100%) rename {src => packages/core}/redux/wallet/reducer.js (100%) rename {src => packages/core}/redux/wallet/selectors.js (100%) rename {src => packages/core}/redux/watcher/__snapshots__/actions.spec.js.snap (100%) rename {src => packages/core}/redux/watcher/actions.js (100%) rename {src => packages/core}/redux/watcher/actions.spec.js (100%) rename {src => packages/core}/redux/watcher/index.js (100%) rename {src => packages/core}/redux/watcher/reducer.js (100%) rename {src => packages/core}/redux/watcher/reducer.spec.js (100%) rename {src => packages/core}/services/ExchangeService.js (100%) rename {src => packages/core}/services/MultisigWalletService.js (100%) rename {src => packages/core}/services/TokenService.js (100%) rename {src => packages/core}/services/VotingService.js (100%) rename {src => packages/core}/utils/Web3Converter.js (100%) rename {src => packages/core}/utils/Web3Converter.spec.js (100%) diff --git a/src/dao/AbstractContractDAO.js b/packages/core/dao/AbstractContractDAO.js similarity index 100% rename from src/dao/AbstractContractDAO.js rename to packages/core/dao/AbstractContractDAO.js diff --git a/src/dao/AbstractMultisigContractDAO.js b/packages/core/dao/AbstractMultisigContractDAO.js similarity index 100% rename from src/dao/AbstractMultisigContractDAO.js rename to packages/core/dao/AbstractMultisigContractDAO.js diff --git a/src/dao/AbstractTokenDAO.js b/packages/core/dao/AbstractTokenDAO.js similarity index 100% rename from src/dao/AbstractTokenDAO.js rename to packages/core/dao/AbstractTokenDAO.js diff --git a/src/dao/AssetDonatorDAO.js b/packages/core/dao/AssetDonatorDAO.js similarity index 100% rename from src/dao/AssetDonatorDAO.js rename to packages/core/dao/AssetDonatorDAO.js diff --git a/src/dao/AssetHolderDAO.js b/packages/core/dao/AssetHolderDAO.js similarity index 100% rename from src/dao/AssetHolderDAO.js rename to packages/core/dao/AssetHolderDAO.js diff --git a/src/dao/AssetsManagerDAO.js b/packages/core/dao/AssetsManagerDAO.js similarity index 100% rename from src/dao/AssetsManagerDAO.js rename to packages/core/dao/AssetsManagerDAO.js diff --git a/src/dao/BitcoinDAO.js b/packages/core/dao/BitcoinDAO.js similarity index 100% rename from src/dao/BitcoinDAO.js rename to packages/core/dao/BitcoinDAO.js diff --git a/src/dao/ChronoBankAssetDAO.js b/packages/core/dao/ChronoBankAssetDAO.js similarity index 100% rename from src/dao/ChronoBankAssetDAO.js rename to packages/core/dao/ChronoBankAssetDAO.js diff --git a/src/dao/ChronoBankAssetProxyDAO.js b/packages/core/dao/ChronoBankAssetProxyDAO.js similarity index 100% rename from src/dao/ChronoBankAssetProxyDAO.js rename to packages/core/dao/ChronoBankAssetProxyDAO.js diff --git a/src/dao/ChronoBankPlatformDAO.js b/packages/core/dao/ChronoBankPlatformDAO.js similarity index 100% rename from src/dao/ChronoBankPlatformDAO.js rename to packages/core/dao/ChronoBankPlatformDAO.js diff --git a/src/dao/ContractsManagerDAO.js b/packages/core/dao/ContractsManagerDAO.js similarity index 100% rename from src/dao/ContractsManagerDAO.js rename to packages/core/dao/ContractsManagerDAO.js diff --git a/src/dao/ERC20DAO.js b/packages/core/dao/ERC20DAO.js similarity index 100% rename from src/dao/ERC20DAO.js rename to packages/core/dao/ERC20DAO.js diff --git a/src/dao/ERC20ManagerDAO.js b/packages/core/dao/ERC20ManagerDAO.js similarity index 100% rename from src/dao/ERC20ManagerDAO.js rename to packages/core/dao/ERC20ManagerDAO.js diff --git a/src/dao/EthereumDAO.js b/packages/core/dao/EthereumDAO.js similarity index 100% rename from src/dao/EthereumDAO.js rename to packages/core/dao/EthereumDAO.js diff --git a/src/dao/ExchangeDAO.js b/packages/core/dao/ExchangeDAO.js similarity index 100% rename from src/dao/ExchangeDAO.js rename to packages/core/dao/ExchangeDAO.js diff --git a/src/dao/ExchangeManagerDAO.js b/packages/core/dao/ExchangeManagerDAO.js similarity index 100% rename from src/dao/ExchangeManagerDAO.js rename to packages/core/dao/ExchangeManagerDAO.js diff --git a/src/dao/FakeCoinDAO.js b/packages/core/dao/FakeCoinDAO.js similarity index 100% rename from src/dao/FakeCoinDAO.js rename to packages/core/dao/FakeCoinDAO.js diff --git a/src/dao/FeeInterfaceDAO.js b/packages/core/dao/FeeInterfaceDAO.js similarity index 100% rename from src/dao/FeeInterfaceDAO.js rename to packages/core/dao/FeeInterfaceDAO.js diff --git a/src/dao/LHTDAO.js b/packages/core/dao/LHTDAO.js similarity index 100% rename from src/dao/LHTDAO.js rename to packages/core/dao/LHTDAO.js diff --git a/src/dao/LOCManagerDAO.js b/packages/core/dao/LOCManagerDAO.js similarity index 100% rename from src/dao/LOCManagerDAO.js rename to packages/core/dao/LOCManagerDAO.js diff --git a/src/dao/MultisigWalletDAO.js b/packages/core/dao/MultisigWalletDAO.js similarity index 100% rename from src/dao/MultisigWalletDAO.js rename to packages/core/dao/MultisigWalletDAO.js diff --git a/src/dao/MultisigWalletsManagerDAO.js b/packages/core/dao/MultisigWalletsManagerDAO.js similarity index 100% rename from src/dao/MultisigWalletsManagerDAO.js rename to packages/core/dao/MultisigWalletsManagerDAO.js diff --git a/src/dao/NemDAO.js b/packages/core/dao/NemDAO.js similarity index 100% rename from src/dao/NemDAO.js rename to packages/core/dao/NemDAO.js diff --git a/src/dao/PendingManagerDAO.js b/packages/core/dao/PendingManagerDAO.js similarity index 100% rename from src/dao/PendingManagerDAO.js rename to packages/core/dao/PendingManagerDAO.js diff --git a/src/dao/PlatformTokenExtensionGatewayManagerEmitterDAO.js b/packages/core/dao/PlatformTokenExtensionGatewayManagerEmitterDAO.js similarity index 100% rename from src/dao/PlatformTokenExtensionGatewayManagerEmitterDAO.js rename to packages/core/dao/PlatformTokenExtensionGatewayManagerEmitterDAO.js diff --git a/src/dao/PlatformsManagerDAO.js b/packages/core/dao/PlatformsManagerDAO.js similarity index 100% rename from src/dao/PlatformsManagerDAO.js rename to packages/core/dao/PlatformsManagerDAO.js diff --git a/src/dao/PollEmitterDAO.js b/packages/core/dao/PollEmitterDAO.js similarity index 100% rename from src/dao/PollEmitterDAO.js rename to packages/core/dao/PollEmitterDAO.js diff --git a/src/dao/PollInterfaceDAO.js b/packages/core/dao/PollInterfaceDAO.js similarity index 100% rename from src/dao/PollInterfaceDAO.js rename to packages/core/dao/PollInterfaceDAO.js diff --git a/src/dao/RewardsDAO.js b/packages/core/dao/RewardsDAO.js similarity index 100% rename from src/dao/RewardsDAO.js rename to packages/core/dao/RewardsDAO.js diff --git a/src/dao/TokenManagementExtensionDAO.js b/packages/core/dao/TokenManagementExtensionDAO.js similarity index 100% rename from src/dao/TokenManagementExtensionDAO.js rename to packages/core/dao/TokenManagementExtensionDAO.js diff --git a/src/dao/UserManagerDAO.js b/packages/core/dao/UserManagerDAO.js similarity index 100% rename from src/dao/UserManagerDAO.js rename to packages/core/dao/UserManagerDAO.js diff --git a/src/dao/VotingManagerDAO.js b/packages/core/dao/VotingManagerDAO.js similarity index 100% rename from src/dao/VotingManagerDAO.js rename to packages/core/dao/VotingManagerDAO.js diff --git a/src/dao/abi/ERC20DAODefaultABI.js b/packages/core/dao/abi/ERC20DAODefaultABI.js similarity index 100% rename from src/dao/abi/ERC20DAODefaultABI.js rename to packages/core/dao/abi/ERC20DAODefaultABI.js diff --git a/src/dao/abi/index.js b/packages/core/dao/abi/index.js similarity index 100% rename from src/dao/abi/index.js rename to packages/core/dao/abi/index.js diff --git a/src/market/MarketSocket.js b/packages/core/market/MarketSocket.js similarity index 100% rename from src/market/MarketSocket.js rename to packages/core/market/MarketSocket.js diff --git a/src/market/__mocks__/socket.io-client.js b/packages/core/market/__mocks__/socket.io-client.js similarity index 100% rename from src/market/__mocks__/socket.io-client.js rename to packages/core/market/__mocks__/socket.io-client.js diff --git a/src/market/ccc-streamer-utilities.js b/packages/core/market/ccc-streamer-utilities.js similarity index 100% rename from src/market/ccc-streamer-utilities.js rename to packages/core/market/ccc-streamer-utilities.js diff --git a/src/models/AbstractFetchingCollection.js b/packages/core/models/AbstractFetchingCollection.js similarity index 100% rename from src/models/AbstractFetchingCollection.js rename to packages/core/models/AbstractFetchingCollection.js diff --git a/src/models/AbstractFetchingModel.js b/packages/core/models/AbstractFetchingModel.js similarity index 100% rename from src/models/AbstractFetchingModel.js rename to packages/core/models/AbstractFetchingModel.js diff --git a/src/models/AbstractModel.js b/packages/core/models/AbstractModel.js similarity index 100% rename from src/models/AbstractModel.js rename to packages/core/models/AbstractModel.js diff --git a/src/models/AdditionalActionModel.js b/packages/core/models/AdditionalActionModel.js similarity index 100% rename from src/models/AdditionalActionModel.js rename to packages/core/models/AdditionalActionModel.js diff --git a/src/models/Amount.js b/packages/core/models/Amount.js similarity index 100% rename from src/models/Amount.js rename to packages/core/models/Amount.js diff --git a/src/models/CBEModel.js b/packages/core/models/CBEModel.js similarity index 100% rename from src/models/CBEModel.js rename to packages/core/models/CBEModel.js diff --git a/src/models/FileSelect/FileCollection.js b/packages/core/models/FileSelect/FileCollection.js similarity index 100% rename from src/models/FileSelect/FileCollection.js rename to packages/core/models/FileSelect/FileCollection.js diff --git a/src/models/FileSelect/FileExtension.js b/packages/core/models/FileSelect/FileExtension.js similarity index 100% rename from src/models/FileSelect/FileExtension.js rename to packages/core/models/FileSelect/FileExtension.js diff --git a/src/models/FileSelect/FileModel.js b/packages/core/models/FileSelect/FileModel.js similarity index 100% rename from src/models/FileSelect/FileModel.js rename to packages/core/models/FileSelect/FileModel.js diff --git a/src/models/LOCModel.js b/packages/core/models/LOCModel.js similarity index 100% rename from src/models/LOCModel.js rename to packages/core/models/LOCModel.js diff --git a/src/models/LOCModel.spec.js b/packages/core/models/LOCModel.spec.js similarity index 100% rename from src/models/LOCModel.spec.js rename to packages/core/models/LOCModel.spec.js diff --git a/src/models/OperationModel.js b/packages/core/models/OperationModel.js similarity index 100% rename from src/models/OperationModel.js rename to packages/core/models/OperationModel.js diff --git a/src/models/PollDetailsModel.js b/packages/core/models/PollDetailsModel.js similarity index 100% rename from src/models/PollDetailsModel.js rename to packages/core/models/PollDetailsModel.js diff --git a/src/models/PollModel.js b/packages/core/models/PollModel.js similarity index 100% rename from src/models/PollModel.js rename to packages/core/models/PollModel.js diff --git a/src/models/ProfileModel.js b/packages/core/models/ProfileModel.js similarity index 100% rename from src/models/ProfileModel.js rename to packages/core/models/ProfileModel.js diff --git a/src/models/ProfileModel.spec.js b/packages/core/models/ProfileModel.spec.js similarity index 100% rename from src/models/ProfileModel.spec.js rename to packages/core/models/ProfileModel.spec.js diff --git a/src/models/TransferError.js b/packages/core/models/TransferError.js similarity index 100% rename from src/models/TransferError.js rename to packages/core/models/TransferError.js diff --git a/src/models/TransferExecModel.js b/packages/core/models/TransferExecModel.js similarity index 100% rename from src/models/TransferExecModel.js rename to packages/core/models/TransferExecModel.js diff --git a/src/models/TxError.js b/packages/core/models/TxError.js similarity index 100% rename from src/models/TxError.js rename to packages/core/models/TxError.js diff --git a/src/models/TxExecModel.js b/packages/core/models/TxExecModel.js similarity index 100% rename from src/models/TxExecModel.js rename to packages/core/models/TxExecModel.js diff --git a/src/models/TxModel.js b/packages/core/models/TxModel.js similarity index 100% rename from src/models/TxModel.js rename to packages/core/models/TxModel.js diff --git a/src/models/__snapshots__/LOCModel.spec.js.snap b/packages/core/models/__snapshots__/LOCModel.spec.js.snap similarity index 100% rename from src/models/__snapshots__/LOCModel.spec.js.snap rename to packages/core/models/__snapshots__/LOCModel.spec.js.snap diff --git a/src/models/assetHolder/AssetHolderModel.js b/packages/core/models/assetHolder/AssetHolderModel.js similarity index 100% rename from src/models/assetHolder/AssetHolderModel.js rename to packages/core/models/assetHolder/AssetHolderModel.js diff --git a/src/models/assetHolder/AssetModel.js b/packages/core/models/assetHolder/AssetModel.js similarity index 100% rename from src/models/assetHolder/AssetModel.js rename to packages/core/models/assetHolder/AssetModel.js diff --git a/src/models/assetHolder/AssetsCollection.js b/packages/core/models/assetHolder/AssetsCollection.js similarity index 100% rename from src/models/assetHolder/AssetsCollection.js rename to packages/core/models/assetHolder/AssetsCollection.js diff --git a/src/models/assetsManager/MainAssetsManagerModel.js b/packages/core/models/assetsManager/MainAssetsManagerModel.js similarity index 100% rename from src/models/assetsManager/MainAssetsManagerModel.js rename to packages/core/models/assetsManager/MainAssetsManagerModel.js diff --git a/src/models/constants.js b/packages/core/models/constants.js similarity index 100% rename from src/models/constants.js rename to packages/core/models/constants.js diff --git a/src/models/exchange/ExchangeModel.js b/packages/core/models/exchange/ExchangeModel.js similarity index 100% rename from src/models/exchange/ExchangeModel.js rename to packages/core/models/exchange/ExchangeModel.js diff --git a/src/models/exchange/ExchangeOrderModel.js b/packages/core/models/exchange/ExchangeOrderModel.js similarity index 100% rename from src/models/exchange/ExchangeOrderModel.js rename to packages/core/models/exchange/ExchangeOrderModel.js diff --git a/src/models/exchange/ExchangesCollection.js b/packages/core/models/exchange/ExchangesCollection.js similarity index 100% rename from src/models/exchange/ExchangesCollection.js rename to packages/core/models/exchange/ExchangesCollection.js diff --git a/src/models/notices/AbstractNoticeModel.js b/packages/core/models/notices/AbstractNoticeModel.js similarity index 100% rename from src/models/notices/AbstractNoticeModel.js rename to packages/core/models/notices/AbstractNoticeModel.js diff --git a/src/models/notices/ApprovalNoticeModel.js b/packages/core/models/notices/ApprovalNoticeModel.js similarity index 100% rename from src/models/notices/ApprovalNoticeModel.js rename to packages/core/models/notices/ApprovalNoticeModel.js diff --git a/src/models/notices/ArbitraryNoticeModel.js b/packages/core/models/notices/ArbitraryNoticeModel.js similarity index 100% rename from src/models/notices/ArbitraryNoticeModel.js rename to packages/core/models/notices/ArbitraryNoticeModel.js diff --git a/src/models/notices/AssetsManagerNoticeModel.js b/packages/core/models/notices/AssetsManagerNoticeModel.js similarity index 100% rename from src/models/notices/AssetsManagerNoticeModel.js rename to packages/core/models/notices/AssetsManagerNoticeModel.js diff --git a/src/models/notices/CBENoticeModel.js b/packages/core/models/notices/CBENoticeModel.js similarity index 100% rename from src/models/notices/CBENoticeModel.js rename to packages/core/models/notices/CBENoticeModel.js diff --git a/src/models/notices/CBENoticeModel.spec.js b/packages/core/models/notices/CBENoticeModel.spec.js similarity index 100% rename from src/models/notices/CBENoticeModel.spec.js rename to packages/core/models/notices/CBENoticeModel.spec.js diff --git a/src/models/notices/ErrorNoticeModel.js b/packages/core/models/notices/ErrorNoticeModel.js similarity index 100% rename from src/models/notices/ErrorNoticeModel.js rename to packages/core/models/notices/ErrorNoticeModel.js diff --git a/src/models/notices/LOCNoticeModel.js b/packages/core/models/notices/LOCNoticeModel.js similarity index 100% rename from src/models/notices/LOCNoticeModel.js rename to packages/core/models/notices/LOCNoticeModel.js diff --git a/src/models/notices/OperationNoticeModel.js b/packages/core/models/notices/OperationNoticeModel.js similarity index 100% rename from src/models/notices/OperationNoticeModel.js rename to packages/core/models/notices/OperationNoticeModel.js diff --git a/src/models/notices/PollNoticeModel.js b/packages/core/models/notices/PollNoticeModel.js similarity index 100% rename from src/models/notices/PollNoticeModel.js rename to packages/core/models/notices/PollNoticeModel.js diff --git a/src/models/notices/ProfileNoticeModel.js b/packages/core/models/notices/ProfileNoticeModel.js similarity index 100% rename from src/models/notices/ProfileNoticeModel.js rename to packages/core/models/notices/ProfileNoticeModel.js diff --git a/src/models/notices/TokenNoticeModel.js b/packages/core/models/notices/TokenNoticeModel.js similarity index 100% rename from src/models/notices/TokenNoticeModel.js rename to packages/core/models/notices/TokenNoticeModel.js diff --git a/src/models/notices/TransactionErrorNoticeModel.js b/packages/core/models/notices/TransactionErrorNoticeModel.js similarity index 100% rename from src/models/notices/TransactionErrorNoticeModel.js rename to packages/core/models/notices/TransactionErrorNoticeModel.js diff --git a/src/models/notices/TransferErrorNoticeModel.js b/packages/core/models/notices/TransferErrorNoticeModel.js similarity index 100% rename from src/models/notices/TransferErrorNoticeModel.js rename to packages/core/models/notices/TransferErrorNoticeModel.js diff --git a/src/models/notices/TransferNoticeModel.js b/packages/core/models/notices/TransferNoticeModel.js similarity index 100% rename from src/models/notices/TransferNoticeModel.js rename to packages/core/models/notices/TransferNoticeModel.js diff --git a/src/models/notices/WalletNoticeModel.js b/packages/core/models/notices/WalletNoticeModel.js similarity index 100% rename from src/models/notices/WalletNoticeModel.js rename to packages/core/models/notices/WalletNoticeModel.js diff --git a/src/models/rewards/AbstractPeriodModel.js b/packages/core/models/rewards/AbstractPeriodModel.js similarity index 100% rename from src/models/rewards/AbstractPeriodModel.js rename to packages/core/models/rewards/AbstractPeriodModel.js diff --git a/src/models/rewards/RewardsCollection.js b/packages/core/models/rewards/RewardsCollection.js similarity index 100% rename from src/models/rewards/RewardsCollection.js rename to packages/core/models/rewards/RewardsCollection.js diff --git a/src/models/rewards/RewardsCurrentPeriodModel.js b/packages/core/models/rewards/RewardsCurrentPeriodModel.js similarity index 100% rename from src/models/rewards/RewardsCurrentPeriodModel.js rename to packages/core/models/rewards/RewardsCurrentPeriodModel.js diff --git a/src/models/rewards/RewardsModel.js b/packages/core/models/rewards/RewardsModel.js similarity index 100% rename from src/models/rewards/RewardsModel.js rename to packages/core/models/rewards/RewardsModel.js diff --git a/src/models/rewards/RewardsModel.spec.js b/packages/core/models/rewards/RewardsModel.spec.js similarity index 100% rename from src/models/rewards/RewardsModel.spec.js rename to packages/core/models/rewards/RewardsModel.spec.js diff --git a/src/models/rewards/RewardsPeriodModel.js b/packages/core/models/rewards/RewardsPeriodModel.js similarity index 100% rename from src/models/rewards/RewardsPeriodModel.js rename to packages/core/models/rewards/RewardsPeriodModel.js diff --git a/src/models/rewards/RewardsPeriodModel.spec.js b/packages/core/models/rewards/RewardsPeriodModel.spec.js similarity index 100% rename from src/models/rewards/RewardsPeriodModel.spec.js rename to packages/core/models/rewards/RewardsPeriodModel.spec.js diff --git a/src/models/tokens/BalanceModel.js b/packages/core/models/tokens/BalanceModel.js similarity index 100% rename from src/models/tokens/BalanceModel.js rename to packages/core/models/tokens/BalanceModel.js diff --git a/src/models/tokens/BalancesCollection.js b/packages/core/models/tokens/BalancesCollection.js similarity index 100% rename from src/models/tokens/BalancesCollection.js rename to packages/core/models/tokens/BalancesCollection.js diff --git a/src/models/tokens/BlacklistModel.js b/packages/core/models/tokens/BlacklistModel.js similarity index 100% rename from src/models/tokens/BlacklistModel.js rename to packages/core/models/tokens/BlacklistModel.js diff --git a/src/models/tokens/FeeModel.js b/packages/core/models/tokens/FeeModel.js similarity index 100% rename from src/models/tokens/FeeModel.js rename to packages/core/models/tokens/FeeModel.js diff --git a/src/models/tokens/PausedModel.js b/packages/core/models/tokens/PausedModel.js similarity index 100% rename from src/models/tokens/PausedModel.js rename to packages/core/models/tokens/PausedModel.js diff --git a/src/models/tokens/ReissuableModel.js b/packages/core/models/tokens/ReissuableModel.js similarity index 100% rename from src/models/tokens/ReissuableModel.js rename to packages/core/models/tokens/ReissuableModel.js diff --git a/src/models/tokens/TokenModel.js b/packages/core/models/tokens/TokenModel.js similarity index 100% rename from src/models/tokens/TokenModel.js rename to packages/core/models/tokens/TokenModel.js diff --git a/src/models/tokens/TokensCollection.js b/packages/core/models/tokens/TokensCollection.js similarity index 100% rename from src/models/tokens/TokensCollection.js rename to packages/core/models/tokens/TokensCollection.js diff --git a/src/models/validator.js b/packages/core/models/validator.js similarity index 100% rename from src/models/validator.js rename to packages/core/models/validator.js diff --git a/src/models/validator.spec.js b/packages/core/models/validator.spec.js similarity index 100% rename from src/models/validator.spec.js rename to packages/core/models/validator.spec.js diff --git a/src/models/voting/VotingCollection.js b/packages/core/models/voting/VotingCollection.js similarity index 100% rename from src/models/voting/VotingCollection.js rename to packages/core/models/voting/VotingCollection.js diff --git a/src/models/voting/VotingMainModel.js b/packages/core/models/voting/VotingMainModel.js similarity index 100% rename from src/models/voting/VotingMainModel.js rename to packages/core/models/voting/VotingMainModel.js diff --git a/src/models/wallet/AddressModel.js b/packages/core/models/wallet/AddressModel.js similarity index 100% rename from src/models/wallet/AddressModel.js rename to packages/core/models/wallet/AddressModel.js diff --git a/src/models/wallet/AddressesCollection.js b/packages/core/models/wallet/AddressesCollection.js similarity index 100% rename from src/models/wallet/AddressesCollection.js rename to packages/core/models/wallet/AddressesCollection.js diff --git a/src/models/wallet/AllowanceCollection.js b/packages/core/models/wallet/AllowanceCollection.js similarity index 100% rename from src/models/wallet/AllowanceCollection.js rename to packages/core/models/wallet/AllowanceCollection.js diff --git a/src/models/wallet/AllowanceModel.js b/packages/core/models/wallet/AllowanceModel.js similarity index 100% rename from src/models/wallet/AllowanceModel.js rename to packages/core/models/wallet/AllowanceModel.js diff --git a/src/models/wallet/DerivedWalletModel.js b/packages/core/models/wallet/DerivedWalletModel.js similarity index 100% rename from src/models/wallet/DerivedWalletModel.js rename to packages/core/models/wallet/DerivedWalletModel.js diff --git a/src/models/wallet/MainWalletModel.js b/packages/core/models/wallet/MainWalletModel.js similarity index 100% rename from src/models/wallet/MainWalletModel.js rename to packages/core/models/wallet/MainWalletModel.js diff --git a/src/models/wallet/MultisigTransactionModel.js b/packages/core/models/wallet/MultisigTransactionModel.js similarity index 100% rename from src/models/wallet/MultisigTransactionModel.js rename to packages/core/models/wallet/MultisigTransactionModel.js diff --git a/src/models/wallet/MultisigWalletCollection.js b/packages/core/models/wallet/MultisigWalletCollection.js similarity index 100% rename from src/models/wallet/MultisigWalletCollection.js rename to packages/core/models/wallet/MultisigWalletCollection.js diff --git a/src/models/wallet/MultisigWalletModel.js b/packages/core/models/wallet/MultisigWalletModel.js similarity index 100% rename from src/models/wallet/MultisigWalletModel.js rename to packages/core/models/wallet/MultisigWalletModel.js diff --git a/src/models/wallet/MultisigWalletModel.spec.js b/packages/core/models/wallet/MultisigWalletModel.spec.js similarity index 100% rename from src/models/wallet/MultisigWalletModel.spec.js rename to packages/core/models/wallet/MultisigWalletModel.spec.js diff --git a/src/models/wallet/MultisigWalletPendingTxCollection.js b/packages/core/models/wallet/MultisigWalletPendingTxCollection.js similarity index 100% rename from src/models/wallet/MultisigWalletPendingTxCollection.js rename to packages/core/models/wallet/MultisigWalletPendingTxCollection.js diff --git a/src/models/wallet/MultisigWalletPendingTxModel.js b/packages/core/models/wallet/MultisigWalletPendingTxModel.js similarity index 100% rename from src/models/wallet/MultisigWalletPendingTxModel.js rename to packages/core/models/wallet/MultisigWalletPendingTxModel.js diff --git a/src/models/wallet/OwnerCollection.js b/packages/core/models/wallet/OwnerCollection.js similarity index 100% rename from src/models/wallet/OwnerCollection.js rename to packages/core/models/wallet/OwnerCollection.js diff --git a/src/models/wallet/OwnerModel.js b/packages/core/models/wallet/OwnerModel.js similarity index 100% rename from src/models/wallet/OwnerModel.js rename to packages/core/models/wallet/OwnerModel.js diff --git a/src/models/wallet/TransactionsCollection.js b/packages/core/models/wallet/TransactionsCollection.js similarity index 100% rename from src/models/wallet/TransactionsCollection.js rename to packages/core/models/wallet/TransactionsCollection.js diff --git a/src/models/wallet/__snapshots__/MultisigWalletModel.spec.js.snap b/packages/core/models/wallet/__snapshots__/MultisigWalletModel.spec.js.snap similarity index 100% rename from src/models/wallet/__snapshots__/MultisigWalletModel.spec.js.snap rename to packages/core/models/wallet/__snapshots__/MultisigWalletModel.spec.js.snap diff --git a/src/redux/assetsHolder/actions.js b/packages/core/redux/assetsHolder/actions.js similarity index 100% rename from src/redux/assetsHolder/actions.js rename to packages/core/redux/assetsHolder/actions.js diff --git a/src/redux/assetsHolder/index.js b/packages/core/redux/assetsHolder/index.js similarity index 100% rename from src/redux/assetsHolder/index.js rename to packages/core/redux/assetsHolder/index.js diff --git a/src/redux/assetsHolder/reducer.js b/packages/core/redux/assetsHolder/reducer.js similarity index 100% rename from src/redux/assetsHolder/reducer.js rename to packages/core/redux/assetsHolder/reducer.js diff --git a/src/redux/assetsHolder/selectors.js b/packages/core/redux/assetsHolder/selectors.js similarity index 100% rename from src/redux/assetsHolder/selectors.js rename to packages/core/redux/assetsHolder/selectors.js diff --git a/src/redux/assetsManager/__snapshots__/reducer.spec.js.snap b/packages/core/redux/assetsManager/__snapshots__/reducer.spec.js.snap similarity index 100% rename from src/redux/assetsManager/__snapshots__/reducer.spec.js.snap rename to packages/core/redux/assetsManager/__snapshots__/reducer.spec.js.snap diff --git a/src/redux/assetsManager/actions.js b/packages/core/redux/assetsManager/actions.js similarity index 100% rename from src/redux/assetsManager/actions.js rename to packages/core/redux/assetsManager/actions.js diff --git a/src/redux/assetsManager/actions.spec.js b/packages/core/redux/assetsManager/actions.spec.js similarity index 100% rename from src/redux/assetsManager/actions.spec.js rename to packages/core/redux/assetsManager/actions.spec.js diff --git a/src/redux/assetsManager/index.js b/packages/core/redux/assetsManager/index.js similarity index 100% rename from src/redux/assetsManager/index.js rename to packages/core/redux/assetsManager/index.js diff --git a/src/redux/assetsManager/reducer.js b/packages/core/redux/assetsManager/reducer.js similarity index 100% rename from src/redux/assetsManager/reducer.js rename to packages/core/redux/assetsManager/reducer.js diff --git a/src/redux/assetsManager/reducer.spec.js b/packages/core/redux/assetsManager/reducer.spec.js similarity index 100% rename from src/redux/assetsManager/reducer.spec.js rename to packages/core/redux/assetsManager/reducer.spec.js diff --git a/src/redux/assetsManager/selectors.js b/packages/core/redux/assetsManager/selectors.js similarity index 100% rename from src/redux/assetsManager/selectors.js rename to packages/core/redux/assetsManager/selectors.js diff --git a/src/redux/exchange/__snapshots__/actions.spec.js.snap b/packages/core/redux/exchange/__snapshots__/actions.spec.js.snap similarity index 100% rename from src/redux/exchange/__snapshots__/actions.spec.js.snap rename to packages/core/redux/exchange/__snapshots__/actions.spec.js.snap diff --git a/src/redux/exchange/__snapshots__/reducer.spec.js.snap b/packages/core/redux/exchange/__snapshots__/reducer.spec.js.snap similarity index 100% rename from src/redux/exchange/__snapshots__/reducer.spec.js.snap rename to packages/core/redux/exchange/__snapshots__/reducer.spec.js.snap diff --git a/src/redux/exchange/actions.js b/packages/core/redux/exchange/actions.js similarity index 100% rename from src/redux/exchange/actions.js rename to packages/core/redux/exchange/actions.js diff --git a/src/redux/exchange/actions.spec.js b/packages/core/redux/exchange/actions.spec.js similarity index 100% rename from src/redux/exchange/actions.spec.js rename to packages/core/redux/exchange/actions.spec.js diff --git a/src/redux/exchange/index.js b/packages/core/redux/exchange/index.js similarity index 100% rename from src/redux/exchange/index.js rename to packages/core/redux/exchange/index.js diff --git a/src/redux/exchange/reducer.js b/packages/core/redux/exchange/reducer.js similarity index 100% rename from src/redux/exchange/reducer.js rename to packages/core/redux/exchange/reducer.js diff --git a/src/redux/exchange/reducer.spec.js b/packages/core/redux/exchange/reducer.spec.js similarity index 100% rename from src/redux/exchange/reducer.spec.js rename to packages/core/redux/exchange/reducer.spec.js diff --git a/src/redux/locs/actions.js b/packages/core/redux/locs/actions.js similarity index 100% rename from src/redux/locs/actions.js rename to packages/core/redux/locs/actions.js diff --git a/src/redux/locs/actions.spec.js b/packages/core/redux/locs/actions.spec.js similarity index 100% rename from src/redux/locs/actions.spec.js rename to packages/core/redux/locs/actions.spec.js diff --git a/src/redux/locs/index.js b/packages/core/redux/locs/index.js similarity index 100% rename from src/redux/locs/index.js rename to packages/core/redux/locs/index.js diff --git a/src/redux/locs/reducer.js b/packages/core/redux/locs/reducer.js similarity index 100% rename from src/redux/locs/reducer.js rename to packages/core/redux/locs/reducer.js diff --git a/src/redux/locs/reducer.spec.js b/packages/core/redux/locs/reducer.spec.js similarity index 100% rename from src/redux/locs/reducer.spec.js rename to packages/core/redux/locs/reducer.spec.js diff --git a/src/redux/locs/selectors.js b/packages/core/redux/locs/selectors.js similarity index 100% rename from src/redux/locs/selectors.js rename to packages/core/redux/locs/selectors.js diff --git a/src/redux/mainWallet/__snapshots__/reducer.spec.js.snap b/packages/core/redux/mainWallet/__snapshots__/reducer.spec.js.snap similarity index 100% rename from src/redux/mainWallet/__snapshots__/reducer.spec.js.snap rename to packages/core/redux/mainWallet/__snapshots__/reducer.spec.js.snap diff --git a/src/redux/mainWallet/actions.js b/packages/core/redux/mainWallet/actions.js similarity index 100% rename from src/redux/mainWallet/actions.js rename to packages/core/redux/mainWallet/actions.js diff --git a/src/redux/mainWallet/index.js b/packages/core/redux/mainWallet/index.js similarity index 100% rename from src/redux/mainWallet/index.js rename to packages/core/redux/mainWallet/index.js diff --git a/src/redux/mainWallet/reducer.js b/packages/core/redux/mainWallet/reducer.js similarity index 100% rename from src/redux/mainWallet/reducer.js rename to packages/core/redux/mainWallet/reducer.js diff --git a/src/redux/mainWallet/reducer.spec.js b/packages/core/redux/mainWallet/reducer.spec.js similarity index 100% rename from src/redux/mainWallet/reducer.spec.js rename to packages/core/redux/mainWallet/reducer.spec.js diff --git a/src/redux/mainWallet/selectors.js b/packages/core/redux/mainWallet/selectors.js similarity index 100% rename from src/redux/mainWallet/selectors.js rename to packages/core/redux/mainWallet/selectors.js diff --git a/src/redux/market/action.js b/packages/core/redux/market/action.js similarity index 100% rename from src/redux/market/action.js rename to packages/core/redux/market/action.js diff --git a/src/redux/market/action.spec.js b/packages/core/redux/market/action.spec.js similarity index 100% rename from src/redux/market/action.spec.js rename to packages/core/redux/market/action.spec.js diff --git a/src/redux/market/index.js b/packages/core/redux/market/index.js similarity index 100% rename from src/redux/market/index.js rename to packages/core/redux/market/index.js diff --git a/src/redux/market/reducer.js b/packages/core/redux/market/reducer.js similarity index 100% rename from src/redux/market/reducer.js rename to packages/core/redux/market/reducer.js diff --git a/src/redux/market/reducer.spec.js b/packages/core/redux/market/reducer.spec.js similarity index 100% rename from src/redux/market/reducer.spec.js rename to packages/core/redux/market/reducer.spec.js diff --git a/src/redux/multisigWallet/__snapshots__/reducer.spec.js.snap b/packages/core/redux/multisigWallet/__snapshots__/reducer.spec.js.snap similarity index 100% rename from src/redux/multisigWallet/__snapshots__/reducer.spec.js.snap rename to packages/core/redux/multisigWallet/__snapshots__/reducer.spec.js.snap diff --git a/src/redux/multisigWallet/actions.js b/packages/core/redux/multisigWallet/actions.js similarity index 100% rename from src/redux/multisigWallet/actions.js rename to packages/core/redux/multisigWallet/actions.js diff --git a/src/redux/multisigWallet/actions.spec.js b/packages/core/redux/multisigWallet/actions.spec.js similarity index 100% rename from src/redux/multisigWallet/actions.spec.js rename to packages/core/redux/multisigWallet/actions.spec.js diff --git a/src/redux/multisigWallet/index.js b/packages/core/redux/multisigWallet/index.js similarity index 100% rename from src/redux/multisigWallet/index.js rename to packages/core/redux/multisigWallet/index.js diff --git a/src/redux/multisigWallet/reducer.js b/packages/core/redux/multisigWallet/reducer.js similarity index 100% rename from src/redux/multisigWallet/reducer.js rename to packages/core/redux/multisigWallet/reducer.js diff --git a/src/redux/multisigWallet/reducer.spec.js b/packages/core/redux/multisigWallet/reducer.spec.js similarity index 100% rename from src/redux/multisigWallet/reducer.spec.js rename to packages/core/redux/multisigWallet/reducer.spec.js diff --git a/src/redux/multisigWallet/selectors.js b/packages/core/redux/multisigWallet/selectors.js similarity index 100% rename from src/redux/multisigWallet/selectors.js rename to packages/core/redux/multisigWallet/selectors.js diff --git a/src/redux/notifier/actions.js b/packages/core/redux/notifier/actions.js similarity index 100% rename from src/redux/notifier/actions.js rename to packages/core/redux/notifier/actions.js diff --git a/src/redux/notifier/actions.spec.js b/packages/core/redux/notifier/actions.spec.js similarity index 100% rename from src/redux/notifier/actions.spec.js rename to packages/core/redux/notifier/actions.spec.js diff --git a/src/redux/notifier/index.js b/packages/core/redux/notifier/index.js similarity index 100% rename from src/redux/notifier/index.js rename to packages/core/redux/notifier/index.js diff --git a/src/redux/notifier/reducer.js b/packages/core/redux/notifier/reducer.js similarity index 100% rename from src/redux/notifier/reducer.js rename to packages/core/redux/notifier/reducer.js diff --git a/src/redux/notifier/reducer.spec.js b/packages/core/redux/notifier/reducer.spec.js similarity index 100% rename from src/redux/notifier/reducer.spec.js rename to packages/core/redux/notifier/reducer.spec.js diff --git a/src/redux/operations/actions.js b/packages/core/redux/operations/actions.js similarity index 100% rename from src/redux/operations/actions.js rename to packages/core/redux/operations/actions.js diff --git a/src/redux/operations/actions.spec.js b/packages/core/redux/operations/actions.spec.js similarity index 100% rename from src/redux/operations/actions.spec.js rename to packages/core/redux/operations/actions.spec.js diff --git a/src/redux/operations/index.js b/packages/core/redux/operations/index.js similarity index 100% rename from src/redux/operations/index.js rename to packages/core/redux/operations/index.js diff --git a/src/redux/operations/reducer.js b/packages/core/redux/operations/reducer.js similarity index 100% rename from src/redux/operations/reducer.js rename to packages/core/redux/operations/reducer.js diff --git a/src/redux/operations/reducer.spec.js b/packages/core/redux/operations/reducer.spec.js similarity index 100% rename from src/redux/operations/reducer.spec.js rename to packages/core/redux/operations/reducer.spec.js diff --git a/src/redux/rewards/actions.js b/packages/core/redux/rewards/actions.js similarity index 100% rename from src/redux/rewards/actions.js rename to packages/core/redux/rewards/actions.js diff --git a/src/redux/rewards/index.js b/packages/core/redux/rewards/index.js similarity index 100% rename from src/redux/rewards/index.js rename to packages/core/redux/rewards/index.js diff --git a/src/redux/rewards/reducer.js b/packages/core/redux/rewards/reducer.js similarity index 100% rename from src/redux/rewards/reducer.js rename to packages/core/redux/rewards/reducer.js diff --git a/src/redux/rewards/reducer.spec.js b/packages/core/redux/rewards/reducer.spec.js similarity index 100% rename from src/redux/rewards/reducer.spec.js rename to packages/core/redux/rewards/reducer.spec.js diff --git a/src/redux/session/__snapshots__/actions.spec.js.snap b/packages/core/redux/session/__snapshots__/actions.spec.js.snap similarity index 100% rename from src/redux/session/__snapshots__/actions.spec.js.snap rename to packages/core/redux/session/__snapshots__/actions.spec.js.snap diff --git a/src/redux/session/actions.js b/packages/core/redux/session/actions.js similarity index 100% rename from src/redux/session/actions.js rename to packages/core/redux/session/actions.js diff --git a/src/redux/session/actions.spec.js b/packages/core/redux/session/actions.spec.js similarity index 100% rename from src/redux/session/actions.spec.js rename to packages/core/redux/session/actions.spec.js diff --git a/src/redux/session/index.js b/packages/core/redux/session/index.js similarity index 100% rename from src/redux/session/index.js rename to packages/core/redux/session/index.js diff --git a/src/redux/session/reducer.js b/packages/core/redux/session/reducer.js similarity index 100% rename from src/redux/session/reducer.js rename to packages/core/redux/session/reducer.js diff --git a/src/redux/session/reducer.spec.js b/packages/core/redux/session/reducer.spec.js similarity index 100% rename from src/redux/session/reducer.spec.js rename to packages/core/redux/session/reducer.spec.js diff --git a/src/redux/session/saveAccountMiddleWare.js b/packages/core/redux/session/saveAccountMiddleWare.js similarity index 100% rename from src/redux/session/saveAccountMiddleWare.js rename to packages/core/redux/session/saveAccountMiddleWare.js diff --git a/src/redux/session/selectors.js b/packages/core/redux/session/selectors.js similarity index 100% rename from src/redux/session/selectors.js rename to packages/core/redux/session/selectors.js diff --git a/src/redux/settings/erc20/tokens/__snapshots__/actions.spec.js.snap b/packages/core/redux/settings/erc20/tokens/__snapshots__/actions.spec.js.snap similarity index 100% rename from src/redux/settings/erc20/tokens/__snapshots__/actions.spec.js.snap rename to packages/core/redux/settings/erc20/tokens/__snapshots__/actions.spec.js.snap diff --git a/src/redux/settings/erc20/tokens/actions.js b/packages/core/redux/settings/erc20/tokens/actions.js similarity index 100% rename from src/redux/settings/erc20/tokens/actions.js rename to packages/core/redux/settings/erc20/tokens/actions.js diff --git a/src/redux/settings/erc20/tokens/actions.spec.js b/packages/core/redux/settings/erc20/tokens/actions.spec.js similarity index 100% rename from src/redux/settings/erc20/tokens/actions.spec.js rename to packages/core/redux/settings/erc20/tokens/actions.spec.js diff --git a/src/redux/settings/erc20/tokens/reducer.js b/packages/core/redux/settings/erc20/tokens/reducer.js similarity index 100% rename from src/redux/settings/erc20/tokens/reducer.js rename to packages/core/redux/settings/erc20/tokens/reducer.js diff --git a/src/redux/settings/erc20/tokens/reducer.spec.js b/packages/core/redux/settings/erc20/tokens/reducer.spec.js similarity index 100% rename from src/redux/settings/erc20/tokens/reducer.spec.js rename to packages/core/redux/settings/erc20/tokens/reducer.spec.js diff --git a/src/redux/settings/erc20/tokens/selectors.js b/packages/core/redux/settings/erc20/tokens/selectors.js similarity index 100% rename from src/redux/settings/erc20/tokens/selectors.js rename to packages/core/redux/settings/erc20/tokens/selectors.js diff --git a/src/redux/settings/index.js b/packages/core/redux/settings/index.js similarity index 100% rename from src/redux/settings/index.js rename to packages/core/redux/settings/index.js diff --git a/src/redux/settings/user/cbe/__snapshots__/actions.spec.js.snap b/packages/core/redux/settings/user/cbe/__snapshots__/actions.spec.js.snap similarity index 100% rename from src/redux/settings/user/cbe/__snapshots__/actions.spec.js.snap rename to packages/core/redux/settings/user/cbe/__snapshots__/actions.spec.js.snap diff --git a/src/redux/settings/user/cbe/actions.js b/packages/core/redux/settings/user/cbe/actions.js similarity index 100% rename from src/redux/settings/user/cbe/actions.js rename to packages/core/redux/settings/user/cbe/actions.js diff --git a/src/redux/settings/user/cbe/actions.spec.js b/packages/core/redux/settings/user/cbe/actions.spec.js similarity index 100% rename from src/redux/settings/user/cbe/actions.spec.js rename to packages/core/redux/settings/user/cbe/actions.spec.js diff --git a/src/redux/settings/user/cbe/reducer.js b/packages/core/redux/settings/user/cbe/reducer.js similarity index 100% rename from src/redux/settings/user/cbe/reducer.js rename to packages/core/redux/settings/user/cbe/reducer.js diff --git a/src/redux/settings/user/cbe/reducer.spec.js b/packages/core/redux/settings/user/cbe/reducer.spec.js similarity index 100% rename from src/redux/settings/user/cbe/reducer.spec.js rename to packages/core/redux/settings/user/cbe/reducer.spec.js diff --git a/src/redux/tokens/actions.js b/packages/core/redux/tokens/actions.js similarity index 100% rename from src/redux/tokens/actions.js rename to packages/core/redux/tokens/actions.js diff --git a/src/redux/tokens/index.js b/packages/core/redux/tokens/index.js similarity index 100% rename from src/redux/tokens/index.js rename to packages/core/redux/tokens/index.js diff --git a/src/redux/tokens/reducer.js b/packages/core/redux/tokens/reducer.js similarity index 100% rename from src/redux/tokens/reducer.js rename to packages/core/redux/tokens/reducer.js diff --git a/src/redux/tokens/selectors.js b/packages/core/redux/tokens/selectors.js similarity index 100% rename from src/redux/tokens/selectors.js rename to packages/core/redux/tokens/selectors.js diff --git a/src/redux/voting/__snapshots__/reducer.spec.js.snap b/packages/core/redux/voting/__snapshots__/reducer.spec.js.snap similarity index 100% rename from src/redux/voting/__snapshots__/reducer.spec.js.snap rename to packages/core/redux/voting/__snapshots__/reducer.spec.js.snap diff --git a/src/redux/voting/actions.js b/packages/core/redux/voting/actions.js similarity index 100% rename from src/redux/voting/actions.js rename to packages/core/redux/voting/actions.js diff --git a/src/redux/voting/actions.spec.js b/packages/core/redux/voting/actions.spec.js similarity index 100% rename from src/redux/voting/actions.spec.js rename to packages/core/redux/voting/actions.spec.js diff --git a/src/redux/voting/getters.js b/packages/core/redux/voting/getters.js similarity index 100% rename from src/redux/voting/getters.js rename to packages/core/redux/voting/getters.js diff --git a/src/redux/voting/index.js b/packages/core/redux/voting/index.js similarity index 100% rename from src/redux/voting/index.js rename to packages/core/redux/voting/index.js diff --git a/src/redux/voting/reducer.js b/packages/core/redux/voting/reducer.js similarity index 100% rename from src/redux/voting/reducer.js rename to packages/core/redux/voting/reducer.js diff --git a/src/redux/voting/reducer.spec.js b/packages/core/redux/voting/reducer.spec.js similarity index 100% rename from src/redux/voting/reducer.spec.js rename to packages/core/redux/voting/reducer.spec.js diff --git a/src/redux/wallet/actions.js b/packages/core/redux/wallet/actions.js similarity index 100% rename from src/redux/wallet/actions.js rename to packages/core/redux/wallet/actions.js diff --git a/src/redux/wallet/index.js b/packages/core/redux/wallet/index.js similarity index 100% rename from src/redux/wallet/index.js rename to packages/core/redux/wallet/index.js diff --git a/src/redux/wallet/reducer.js b/packages/core/redux/wallet/reducer.js similarity index 100% rename from src/redux/wallet/reducer.js rename to packages/core/redux/wallet/reducer.js diff --git a/src/redux/wallet/selectors.js b/packages/core/redux/wallet/selectors.js similarity index 100% rename from src/redux/wallet/selectors.js rename to packages/core/redux/wallet/selectors.js diff --git a/src/redux/watcher/__snapshots__/actions.spec.js.snap b/packages/core/redux/watcher/__snapshots__/actions.spec.js.snap similarity index 100% rename from src/redux/watcher/__snapshots__/actions.spec.js.snap rename to packages/core/redux/watcher/__snapshots__/actions.spec.js.snap diff --git a/src/redux/watcher/actions.js b/packages/core/redux/watcher/actions.js similarity index 100% rename from src/redux/watcher/actions.js rename to packages/core/redux/watcher/actions.js diff --git a/src/redux/watcher/actions.spec.js b/packages/core/redux/watcher/actions.spec.js similarity index 100% rename from src/redux/watcher/actions.spec.js rename to packages/core/redux/watcher/actions.spec.js diff --git a/src/redux/watcher/index.js b/packages/core/redux/watcher/index.js similarity index 100% rename from src/redux/watcher/index.js rename to packages/core/redux/watcher/index.js diff --git a/src/redux/watcher/reducer.js b/packages/core/redux/watcher/reducer.js similarity index 100% rename from src/redux/watcher/reducer.js rename to packages/core/redux/watcher/reducer.js diff --git a/src/redux/watcher/reducer.spec.js b/packages/core/redux/watcher/reducer.spec.js similarity index 100% rename from src/redux/watcher/reducer.spec.js rename to packages/core/redux/watcher/reducer.spec.js diff --git a/src/services/ExchangeService.js b/packages/core/services/ExchangeService.js similarity index 100% rename from src/services/ExchangeService.js rename to packages/core/services/ExchangeService.js diff --git a/src/services/MultisigWalletService.js b/packages/core/services/MultisigWalletService.js similarity index 100% rename from src/services/MultisigWalletService.js rename to packages/core/services/MultisigWalletService.js diff --git a/src/services/TokenService.js b/packages/core/services/TokenService.js similarity index 100% rename from src/services/TokenService.js rename to packages/core/services/TokenService.js diff --git a/src/services/VotingService.js b/packages/core/services/VotingService.js similarity index 100% rename from src/services/VotingService.js rename to packages/core/services/VotingService.js diff --git a/src/utils/Web3Converter.js b/packages/core/utils/Web3Converter.js similarity index 100% rename from src/utils/Web3Converter.js rename to packages/core/utils/Web3Converter.js diff --git a/src/utils/Web3Converter.spec.js b/packages/core/utils/Web3Converter.spec.js similarity index 100% rename from src/utils/Web3Converter.spec.js rename to packages/core/utils/Web3Converter.spec.js From 2ae9b7256b7251ce684950c160d798fb0909184c Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 13 Jun 2018 17:12:31 +0300 Subject: [PATCH 07/30] Add platform-dependent module reexports Refers to: CM-58 --- packages/core/redux/ui/actions.js | 8 ++++++++ packages/core/utils/ErrorList.js | 6 ++++++ packages/core/utils/IPFS.js | 6 ++++++ packages/core/utils/LocalStorage.js | 6 ++++++ packages/core/utils/SessionStorage.js | 6 ++++++ packages/core/utils/i18n/index.js | 6 ++++++ packages/core/utils/icons/index.js | 6 ++++++ packages/core/utils/imageValidator.js | 6 ++++++ packages/core/utils/logger.js | 6 ++++++ 9 files changed, 56 insertions(+) create mode 100644 packages/core/redux/ui/actions.js create mode 100644 packages/core/utils/ErrorList.js create mode 100644 packages/core/utils/IPFS.js create mode 100644 packages/core/utils/LocalStorage.js create mode 100644 packages/core/utils/SessionStorage.js create mode 100644 packages/core/utils/i18n/index.js create mode 100644 packages/core/utils/icons/index.js create mode 100644 packages/core/utils/imageValidator.js create mode 100644 packages/core/utils/logger.js diff --git a/packages/core/redux/ui/actions.js b/packages/core/redux/ui/actions.js new file mode 100644 index 000000000..1da45519f --- /dev/null +++ b/packages/core/redux/ui/actions.js @@ -0,0 +1,8 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +import * as actions from '@chronobank/core-dependencies/redux/ui/actions' + +export default actions \ No newline at end of file diff --git a/packages/core/utils/ErrorList.js b/packages/core/utils/ErrorList.js new file mode 100644 index 000000000..cea8a642a --- /dev/null +++ b/packages/core/utils/ErrorList.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export * from '@chronobank/core-dependencies/ErrorList' diff --git a/packages/core/utils/IPFS.js b/packages/core/utils/IPFS.js new file mode 100644 index 000000000..e0ff35232 --- /dev/null +++ b/packages/core/utils/IPFS.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export { default } from '@chronobank/core-dependencies/IPFS' diff --git a/packages/core/utils/LocalStorage.js b/packages/core/utils/LocalStorage.js new file mode 100644 index 000000000..4d16e5ff1 --- /dev/null +++ b/packages/core/utils/LocalStorage.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export { default } from '@chronobank/core-dependencies/LocalStorage' diff --git a/packages/core/utils/SessionStorage.js b/packages/core/utils/SessionStorage.js new file mode 100644 index 000000000..e2f169391 --- /dev/null +++ b/packages/core/utils/SessionStorage.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export { default } from '@chronobank/core-dependencies/SessionStorage' diff --git a/packages/core/utils/i18n/index.js b/packages/core/utils/i18n/index.js new file mode 100644 index 000000000..f759165ec --- /dev/null +++ b/packages/core/utils/i18n/index.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export * from '@chronobank/core-dependencies/i18n' diff --git a/packages/core/utils/icons/index.js b/packages/core/utils/icons/index.js new file mode 100644 index 000000000..d5add95c5 --- /dev/null +++ b/packages/core/utils/icons/index.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export * from '@chronobank/core-dependencies/icons' diff --git a/packages/core/utils/imageValidator.js b/packages/core/utils/imageValidator.js new file mode 100644 index 000000000..a76dbfbce --- /dev/null +++ b/packages/core/utils/imageValidator.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export * from '@chronobank/core-dependencies/imageValidator' diff --git a/packages/core/utils/logger.js b/packages/core/utils/logger.js new file mode 100644 index 000000000..004a7d198 --- /dev/null +++ b/packages/core/utils/logger.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export * from '@chronobank/core-dependencies/logger' From 42a7bd8e56776572e66264e47c25d8544974aae1 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 13 Jun 2018 16:41:31 +0300 Subject: [PATCH 08/30] Use relative paths in Core --- packages/core/dao/AbstractContractDAO.js | 12 ++-- .../core/dao/AbstractMultisigContractDAO.js | 8 +-- packages/core/dao/AbstractTokenDAO.js | 8 +-- packages/core/dao/AssetHolderDAO.js | 4 +- packages/core/dao/AssetsManagerDAO.js | 12 ++-- packages/core/dao/BitcoinDAO.js | 10 +-- packages/core/dao/ContractsManagerDAO.js | 2 +- packages/core/dao/ERC20DAO.js | 8 +-- packages/core/dao/ERC20ManagerDAO.js | 4 +- packages/core/dao/EthereumDAO.js | 10 +-- packages/core/dao/ExchangeDAO.js | 8 +-- packages/core/dao/ExchangeManagerDAO.js | 6 +- packages/core/dao/LHTDAO.js | 4 +- packages/core/dao/LOCManagerDAO.js | 10 +-- packages/core/dao/MultisigWalletDAO.js | 18 +++--- .../core/dao/MultisigWalletsManagerDAO.js | 18 +++--- packages/core/dao/NemDAO.js | 14 ++--- packages/core/dao/PendingManagerDAO.js | 6 +- packages/core/dao/PollEmitterDAO.js | 4 +- packages/core/dao/PollInterfaceDAO.js | 4 +- packages/core/dao/RewardsDAO.js | 12 ++-- .../core/dao/TokenManagementExtensionDAO.js | 2 +- packages/core/dao/UserManagerDAO.js | 12 ++-- packages/core/dao/VotingManagerDAO.js | 20 +++--- {src => packages/core}/dao/WavesDAO.js | 14 ++--- packages/core/market/MarketSocket.js | 2 +- packages/core/models/CBEModel.js | 4 +- packages/core/models/LOCModel.js | 6 +- packages/core/models/LOCModel.spec.js | 2 +- packages/core/models/PollDetailsModel.js | 2 +- packages/core/models/TransferExecModel.js | 2 +- packages/core/models/TxExecModel.js | 2 +- packages/core/models/TxModel.js | 2 +- .../models/assetHolder/AssetHolderModel.js | 2 +- .../core/models/assetHolder/AssetModel.js | 2 +- .../core/models/exchange/ExchangeModel.js | 2 +- .../models/notices/AbstractNoticeModel.js | 4 +- .../models/notices/ApprovalNoticeModel.js | 4 +- .../models/notices/ArbitraryNoticeModel.js | 2 +- .../notices/AssetsManagerNoticeModel.js | 4 +- .../core/models/notices/CBENoticeModel.js | 4 +- .../core/models/notices/ErrorNoticeModel.js | 4 +- .../core/models/notices/LOCNoticeModel.js | 4 +- .../models/notices/OperationNoticeModel.js | 4 +- .../core/models/notices/PollNoticeModel.js | 6 +- .../core/models/notices/ProfileNoticeModel.js | 6 +- .../core/models/notices/TokenNoticeModel.js | 6 +- .../notices/TransactionErrorNoticeModel.js | 4 +- .../notices/TransferErrorNoticeModel.js | 4 +- .../models/notices/TransferNoticeModel.js | 4 +- .../core/models/notices/WalletNoticeModel.js | 4 +- .../core/models/rewards/RewardsCollection.js | 4 +- .../rewards/RewardsCurrentPeriodModel.js | 2 +- packages/core/models/rewards/RewardsModel.js | 4 +- .../core/models/rewards/RewardsPeriodModel.js | 2 +- packages/core/models/tokens/BalanceModel.js | 2 +- packages/core/models/tokens/TokenModel.js | 8 +-- .../core/models/voting/VotingCollection.js | 2 +- .../core/models/voting/VotingMainModel.js | 2 +- packages/core/models/wallet/AllowanceModel.js | 2 +- .../core/models/wallet/DerivedWalletModel.js | 4 +- .../core/models/wallet/MainWalletModel.js | 6 +- .../models/wallet/MultisigWalletCollection.js | 2 +- .../core/models/wallet/MultisigWalletModel.js | 10 +-- .../models/wallet/MultisigWalletModel.spec.js | 10 +-- .../wallet/MultisigWalletPendingTxModel.js | 2 +- .../models/wallet/TransactionsCollection.js | 2 +- packages/core/redux/assetsHolder/actions.js | 22 +++---- packages/core/redux/assetsHolder/reducer.js | 2 +- packages/core/redux/assetsManager/actions.js | 26 ++++---- .../core/redux/assetsManager/actions.spec.js | 20 +++--- packages/core/redux/assetsManager/reducer.js | 2 +- .../core/redux/assetsManager/selectors.js | 4 +- .../assetsManager/selectors/assetsManager.js | 6 +- .../redux/assetsManager/selectors/models.js | 2 +- packages/core/redux/exchange/actions.js | 20 +++--- packages/core/redux/exchange/actions.spec.js | 26 ++++---- packages/core/redux/exchange/reducer.js | 4 +- packages/core/redux/exchange/reducer.spec.js | 4 +- packages/core/redux/locs/actions.js | 16 ++--- packages/core/redux/locs/actions.spec.js | 4 +- packages/core/redux/locs/selectors.js | 2 +- packages/core/redux/mainWallet/actions.js | 62 +++++++++---------- packages/core/redux/mainWallet/reducer.js | 4 +- .../core/redux/mainWallet/reducer.spec.js | 8 +-- packages/core/redux/mainWallet/selectors.js | 26 ++++---- .../redux/mainWallet/selectors/balances.js | 4 +- .../redux/mainWallet/selectors/models.js | 8 +-- .../redux/mainWallet/selectors/tokens.js | 0 packages/core/redux/market/action.js | 14 ++--- .../core}/redux/market/selectors.js | 0 packages/core/redux/multisigWallet/actions.js | 48 +++++++------- .../core/redux/multisigWallet/actions.spec.js | 14 ++--- packages/core/redux/multisigWallet/reducer.js | 2 +- .../core/redux/multisigWallet/reducer.spec.js | 6 +- .../core/redux/multisigWallet/selectors.js | 24 +++---- .../multisigWallet/selectors/balances.js | 4 +- .../redux/multisigWallet/selectors/models.js | 4 +- .../redux/multisigWallet/selectors/tokens.js | 0 packages/core/redux/notifier/actions.js | 4 +- packages/core/redux/notifier/actions.spec.js | 4 +- packages/core/redux/notifier/reducer.spec.js | 4 +- packages/core/redux/operations/actions.js | 10 +-- .../core/redux/operations/actions.spec.js | 12 ++-- packages/core/redux/operations/reducer.js | 2 +- .../core/redux/operations/reducer.spec.js | 6 +- packages/core/redux/rewards/actions.js | 14 ++--- packages/core/redux/rewards/reducer.js | 2 +- packages/core/redux/session/actions.js | 14 ++--- packages/core/redux/session/actions.spec.js | 14 ++--- .../redux/session/saveAccountMiddleWare.js | 4 +- packages/core/redux/session/selectors.js | 12 ++-- .../core}/redux/session/selectors/models.js | 2 +- .../core}/redux/session/selectors/session.js | 8 +-- .../redux/settings/erc20/tokens/actions.js | 26 ++++---- .../settings/erc20/tokens/actions.spec.js | 12 ++-- .../redux/settings/erc20/tokens/reducer.js | 2 +- .../settings/erc20/tokens/reducer.spec.js | 2 +- .../redux/settings/erc20/tokens/selectors.js | 4 +- .../core/redux/settings/user/cbe/actions.js | 10 +-- .../redux/settings/user/cbe/actions.spec.js | 12 ++-- .../core/redux/settings/user/cbe/reducer.js | 2 +- .../redux/settings/user/cbe/reducer.spec.js | 2 +- packages/core/redux/tokens/actions.js | 33 +++++----- packages/core/redux/tokens/reducer.js | 2 +- packages/core/redux/tokens/selectors.js | 6 +- packages/core/redux/voting/actions.js | 20 +++--- packages/core/redux/voting/actions.spec.js | 22 +++---- packages/core/redux/voting/reducer.js | 2 +- packages/core/redux/voting/reducer.spec.js | 8 +-- packages/core/redux/wallet/actions.js | 6 +- packages/core/redux/wallet/selectors.js | 32 +++++----- .../core}/redux/wallet/selectors/models.js | 10 +-- {src => packages/core}/redux/wallet/types.js | 0 packages/core/redux/watcher/actions.js | 34 +++++----- packages/core/redux/watcher/reducer.js | 2 +- packages/core/redux/watcher/reducer.spec.js | 2 +- packages/core/services/ExchangeService.js | 12 ++-- .../core/services/MultisigWalletService.js | 10 +-- packages/core/services/TokenService.js | 4 +- packages/core/services/VotingService.js | 4 +- src/utils/CustomSerializer.js | 2 +- src/utils/IPFS.js | 4 +- 143 files changed, 585 insertions(+), 588 deletions(-) rename {src => packages/core}/dao/WavesDAO.js (94%) rename {src => packages/core}/redux/assetsManager/selectors/assetsManager.js (80%) rename {src => packages/core}/redux/assetsManager/selectors/models.js (85%) rename {src => packages/core}/redux/mainWallet/selectors/balances.js (96%) rename {src => packages/core}/redux/mainWallet/selectors/models.js (73%) rename {src => packages/core}/redux/mainWallet/selectors/tokens.js (100%) rename {src => packages/core}/redux/market/selectors.js (100%) rename {src => packages/core}/redux/multisigWallet/selectors/balances.js (97%) rename {src => packages/core}/redux/multisigWallet/selectors/models.js (73%) rename {src => packages/core}/redux/multisigWallet/selectors/tokens.js (100%) rename {src => packages/core}/redux/session/selectors/models.js (89%) rename {src => packages/core}/redux/session/selectors/session.js (79%) rename {src => packages/core}/redux/wallet/selectors/models.js (82%) rename {src => packages/core}/redux/wallet/types.js (100%) diff --git a/packages/core/dao/AbstractContractDAO.js b/packages/core/dao/AbstractContractDAO.js index 7beff1128..44be1cba8 100644 --- a/packages/core/dao/AbstractContractDAO.js +++ b/packages/core/dao/AbstractContractDAO.js @@ -5,14 +5,14 @@ import BigNumber from 'bignumber.js' import resultCodes from 'chronobank-smart-contracts/common/errors' -import validator from 'models/validator' +import validator from '../models/validator' import web3Provider from '@chronobank/login/network/Web3Provider' -import AbstractModel from 'models/AbstractModel' -import TxError from 'models/TxError' -import TxExecModel from 'models/TxExecModel' +import AbstractModel from '../models/AbstractModel' +import TxError from '../models/TxError' +import TxExecModel from '../models/TxExecModel' import truffleContract from 'truffle-contract' -import ipfs from 'utils/IPFS' -import web3Converter from 'utils/Web3Converter' +import ipfs from '../utils/IPFS' +import web3Converter from '../utils/Web3Converter' import EventEmitter from 'events' export const EVENT_NEW_BLOCK = 'TokenNewBlock' diff --git a/packages/core/dao/AbstractMultisigContractDAO.js b/packages/core/dao/AbstractMultisigContractDAO.js index dc30ab13c..e110c0c31 100644 --- a/packages/core/dao/AbstractMultisigContractDAO.js +++ b/packages/core/dao/AbstractMultisigContractDAO.js @@ -5,11 +5,11 @@ import BigNumber from 'bignumber.js' import resultCodes from 'chronobank-smart-contracts/common/errors' -import type PendingManagerDAO from 'dao/PendingManagerDAO' +import type PendingManagerDAO from './PendingManagerDAO' import ethABI from 'ethereumjs-abi' -import type AbstractModel from 'models/AbstractModel' -import TxError from 'models/TxError' -import TxExecModel from 'models/TxExecModel' +import type AbstractModel from '../models/AbstractModel' +import TxError from '../models/TxError' +import TxExecModel from '../models/TxExecModel' import AbstractContractDAO, { DEFAULT_TX_OPTIONS, TX_FRONTEND_ERROR_CODES } from './AbstractContractDAO' import contractsManagerDAO from './ContractsManagerDAO' diff --git a/packages/core/dao/AbstractTokenDAO.js b/packages/core/dao/AbstractTokenDAO.js index 248cdb058..6e199bb7b 100644 --- a/packages/core/dao/AbstractTokenDAO.js +++ b/packages/core/dao/AbstractTokenDAO.js @@ -3,10 +3,10 @@ * Licensed under the AGPL Version 3 license. */ -import type Amount from 'models/Amount' -import type TxModel from 'models/TxModel' -import { address } from 'models/validator' -import TokenModel from 'models/tokens/TokenModel' +import type Amount from '../models/Amount' +import type TxModel from '../models/TxModel' +import { address } from '../models/validator' +import TokenModel from '../models/tokens/TokenModel' import AbstractContractDAO from './AbstractContractDAO' export const EVENT_NEW_TRANSFER = 'TokenTxTransfer' diff --git a/packages/core/dao/AssetHolderDAO.js b/packages/core/dao/AssetHolderDAO.js index cab078d60..2c209a2ca 100644 --- a/packages/core/dao/AssetHolderDAO.js +++ b/packages/core/dao/AssetHolderDAO.js @@ -3,10 +3,10 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '../models/Amount' import BigNumber from 'bignumber.js' import resultCodes from 'chronobank-smart-contracts/common/errors' -import tokenService from 'services/TokenService' +import tokenService from '../services/TokenService' import { AssetHolderABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' import type ERC20DAO from './ERC20DAO' diff --git a/packages/core/dao/AssetsManagerDAO.js b/packages/core/dao/AssetsManagerDAO.js index 0966bc4f8..fedb4809f 100644 --- a/packages/core/dao/AssetsManagerDAO.js +++ b/packages/core/dao/AssetsManagerDAO.js @@ -4,16 +4,16 @@ */ import Immutable from 'immutable' -import web3Converter from 'utils/Web3Converter' +import web3Converter from '../utils/Web3Converter' import web3Provider from '@chronobank/login/network/Web3Provider' import { ethereumProvider } from '@chronobank/login/network/EthereumProvider' import BigNumber from 'bignumber.js' -import contractManager from 'dao/ContractsManagerDAO' -import TxModel from 'models/TxModel' +import contractManager from './ContractsManagerDAO' +import TxModel from '../models/TxModel' import { unionBy } from 'lodash' -import OwnerCollection from 'models/wallet/OwnerCollection' -import OwnerModel from 'models/wallet/OwnerModel' -import BlacklistModel from 'models/tokens/BlacklistModel' +import OwnerCollection from '../models/wallet/OwnerCollection' +import OwnerModel from '../models/wallet/OwnerModel' +import BlacklistModel from '../models/tokens/BlacklistModel' import { AssetsManagerABI, MultiEventsHistoryABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' import { TX_ISSUE, TX_OWNERSHIP_CHANGE, TX_REVOKE } from './ChronoBankPlatformDAO' diff --git a/packages/core/dao/BitcoinDAO.js b/packages/core/dao/BitcoinDAO.js index aa37315ba..5447d8b8d 100644 --- a/packages/core/dao/BitcoinDAO.js +++ b/packages/core/dao/BitcoinDAO.js @@ -15,11 +15,11 @@ import { } from '@chronobank/login/network/BitcoinProvider' import EventEmitter from 'events' import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' -import TokenModel from 'models/tokens/TokenModel' -import TxModel from 'models/TxModel' -import TransferExecModel from 'models/TransferExecModel' -import { bitcoinAddress } from 'models/validator' +import Amount from '../models/Amount' +import TokenModel from '../models/tokens/TokenModel' +import TxModel from '../models/TxModel' +import TransferExecModel from '../models/TransferExecModel' +import { bitcoinAddress } from '../models/validator' import { EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE, EVENT_UPDATE_LAST_BLOCK } from './AbstractTokenDAO' const EVENT_TX = 'tx' diff --git a/packages/core/dao/ContractsManagerDAO.js b/packages/core/dao/ContractsManagerDAO.js index 131821358..6b80e258e 100644 --- a/packages/core/dao/ContractsManagerDAO.js +++ b/packages/core/dao/ContractsManagerDAO.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as validator from 'models/validator' +import * as validator from '../models/validator' import { ContractsManagerABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' import AssetsManagerDAO from './AssetsManagerDAO' diff --git a/packages/core/dao/ERC20DAO.js b/packages/core/dao/ERC20DAO.js index ce09ef8a5..4746234f7 100644 --- a/packages/core/dao/ERC20DAO.js +++ b/packages/core/dao/ERC20DAO.js @@ -4,10 +4,10 @@ */ import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' -import TokenModel from 'models/tokens/TokenModel' -import TxModel from 'models/TxModel' -import { TXS_PER_PAGE } from 'models/wallet/TransactionsCollection' +import Amount from '../models/Amount' +import TokenModel from '../models/tokens/TokenModel' +import TxModel from '../models/TxModel' +import { TXS_PER_PAGE } from '../models/wallet/TransactionsCollection' import ERC20DAODefaultABI from './abi/ERC20DAODefaultABI' import AbstractTokenDAO, { EVENT_APPROVAL_TRANSFER, EVENT_NEW_TRANSFER } from './AbstractTokenDAO' import { BLOCKCHAIN_ETHEREUM } from './EthereumDAO' diff --git a/packages/core/dao/ERC20ManagerDAO.js b/packages/core/dao/ERC20ManagerDAO.js index cd7aa1fe4..2a6066e60 100644 --- a/packages/core/dao/ERC20ManagerDAO.js +++ b/packages/core/dao/ERC20ManagerDAO.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import TokenNoticeModel from 'models/notices/TokenNoticeModel' -import TokenModel from 'models/tokens/TokenModel' +import TokenNoticeModel from '../models/notices/TokenNoticeModel' +import TokenModel from '../models/tokens/TokenModel' import { ERC20ManagerABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' import ethereumDAO, { BLOCKCHAIN_ETHEREUM } from './EthereumDAO' diff --git a/packages/core/dao/EthereumDAO.js b/packages/core/dao/EthereumDAO.js index 556e629dd..c76202408 100644 --- a/packages/core/dao/EthereumDAO.js +++ b/packages/core/dao/EthereumDAO.js @@ -5,11 +5,11 @@ import { ethereumProvider } from '@chronobank/login/network/EthereumProvider' import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' -import TokenModel from 'models/tokens/TokenModel' -import TxError from 'models/TxError' -import TxExecModel from 'models/TxExecModel' -import TxModel from 'models/TxModel' +import Amount from '../models/Amount' +import TokenModel from '../models/tokens/TokenModel' +import TxError from '../models/TxError' +import TxExecModel from '../models/TxExecModel' +import TxModel from '../models/TxModel' import solidityEvent from 'web3/lib/web3/event' import AbstractContractDAO, { DEFAULT_GAS, EVENT_NEW_BLOCK, TX_FRONTEND_ERROR_CODES } from './AbstractContractDAO' import AbstractTokenDAO, { EVENT_NEW_TRANSFER, FETCH_NEW_BALANCE } from './AbstractTokenDAO' diff --git a/packages/core/dao/ExchangeDAO.js b/packages/core/dao/ExchangeDAO.js index 162fbcf2d..ea884f9c6 100644 --- a/packages/core/dao/ExchangeDAO.js +++ b/packages/core/dao/ExchangeDAO.js @@ -3,11 +3,11 @@ * Licensed under the AGPL Version 3 license. */ -import tokenService from 'services/TokenService' +import tokenService from '../services/TokenService' import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' -import AbstractContractDAO from 'dao/AbstractContractDAO' -import TokenModel from 'models/tokens/TokenModel' +import Amount from '../models/Amount' +import AbstractContractDAO from './AbstractContractDAO' +import TokenModel from '../models/tokens/TokenModel' import ExchangeOrderModel from '../models/exchange/ExchangeOrderModel' import { ExchangeABI, MultiEventsHistoryABI } from './abi' diff --git a/packages/core/dao/ExchangeManagerDAO.js b/packages/core/dao/ExchangeManagerDAO.js index f8294b04e..af515ffc6 100644 --- a/packages/core/dao/ExchangeManagerDAO.js +++ b/packages/core/dao/ExchangeManagerDAO.js @@ -4,10 +4,10 @@ */ import exchangeProvider from '@chronobank/login/network/ExchangeProvider' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import ExchangesCollection from 'models/exchange/ExchangesCollection' +import ExchangeOrderModel from '../models/exchange/ExchangeOrderModel' +import ExchangesCollection from '../models/exchange/ExchangesCollection' import BigNumber from 'bignumber.js' -import web3Converter from 'utils/Web3Converter' +import web3Converter from '../utils/Web3Converter' import { ExchangeManagerABI, MultiEventsHistoryABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' diff --git a/packages/core/dao/LHTDAO.js b/packages/core/dao/LHTDAO.js index b7a12f64b..34cbb87e2 100644 --- a/packages/core/dao/LHTDAO.js +++ b/packages/core/dao/LHTDAO.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '../models/tokens/TokenModel' import type BigNumber from 'bignumber.js' -import contractsManagerDAO from 'dao/ContractsManagerDAO' +import contractsManagerDAO from './ContractsManagerDAO' import ERC20DAO from './ERC20DAO' import { ChronoBankAssetWithFeeProxyABI } from './abi' diff --git a/packages/core/dao/LOCManagerDAO.js b/packages/core/dao/LOCManagerDAO.js index 90d041f58..3587afab1 100644 --- a/packages/core/dao/LOCManagerDAO.js +++ b/packages/core/dao/LOCManagerDAO.js @@ -4,12 +4,12 @@ */ import Immutable from 'immutable' -import LOCModel from 'models/LOCModel' -import LOCNoticeModel, { statuses } from 'models/notices/LOCNoticeModel' -import type TokenModel from 'models/tokens/TokenModel' -import tokenService from 'services/TokenService' +import LOCModel from '../models/LOCModel' +import LOCNoticeModel, { statuses } from '../models/notices/LOCNoticeModel' +import type TokenModel from '../models/tokens/TokenModel' +import tokenService from '../services/TokenService' import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' +import Amount from '../models/Amount' import { LOCManagerABI, MultiEventsHistoryABI } from './abi' import AbstractMultisigContractDAO from './AbstractMultisigContractDAO' import { LHT } from './LHTDAO' diff --git a/packages/core/dao/MultisigWalletDAO.js b/packages/core/dao/MultisigWalletDAO.js index 0ccbcafa9..c23f3c46a 100644 --- a/packages/core/dao/MultisigWalletDAO.js +++ b/packages/core/dao/MultisigWalletDAO.js @@ -5,16 +5,16 @@ import BigNumber from 'bignumber.js' import resultCodes from 'chronobank-smart-contracts/common/errors' -import AbstractMultisigContractDAO from 'dao/AbstractMultisigContractDAO' -import Amount from 'models/Amount' -import TokenModel from 'models/tokens/TokenModel' -import TxExecModel from 'models/TxExecModel' -import MultisigTransactionModel from 'models/wallet/MultisigTransactionModel' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import MultisigWalletPendingTxCollection from 'models/wallet/MultisigWalletPendingTxCollection' -import MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel' +import AbstractMultisigContractDAO from './AbstractMultisigContractDAO' +import Amount from '../models/Amount' +import TokenModel from '../models/tokens/TokenModel' +import TxExecModel from '../models/TxExecModel' +import MultisigTransactionModel from '../models/wallet/MultisigTransactionModel' +import MultisigWalletModel from '../models/wallet/MultisigWalletModel' +import MultisigWalletPendingTxCollection from '../models/wallet/MultisigWalletPendingTxCollection' +import MultisigWalletPendingTxModel from '../models/wallet/MultisigWalletPendingTxModel' import { ethereumProvider } from '@chronobank/login/network/EthereumProvider' -import OwnerModel from 'models/wallet/OwnerModel' +import OwnerModel from '../models/wallet/OwnerModel' import { MultiEventsHistoryABI, WalletABI } from './abi' export default class MultisigWalletDAO extends AbstractMultisigContractDAO { diff --git a/packages/core/dao/MultisigWalletsManagerDAO.js b/packages/core/dao/MultisigWalletsManagerDAO.js index 696025321..4a50feb3f 100644 --- a/packages/core/dao/MultisigWalletsManagerDAO.js +++ b/packages/core/dao/MultisigWalletsManagerDAO.js @@ -3,15 +3,15 @@ * Licensed under the AGPL Version 3 license. */ -import AbstractContractDAO from 'dao/AbstractContractDAO' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import type MultisigWalletDAO from 'dao/MultisigWalletDAO' -import AddressesCollection from 'models/wallet/AddressesCollection' -import AddressModel from 'models/wallet/AddressModel' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import OwnerCollection from 'models/wallet/OwnerCollection' -import OwnerModel from 'models/wallet/OwnerModel' -import multisigWalletService from 'services/MultisigWalletService' +import AbstractContractDAO from './AbstractContractDAO' +import { BLOCKCHAIN_ETHEREUM } from './EthereumDAO' +import type MultisigWalletDAO from './MultisigWalletDAO' +import AddressesCollection from '../models/wallet/AddressesCollection' +import AddressModel from '../models/wallet/AddressModel' +import MultisigWalletModel from '../models/wallet/MultisigWalletModel' +import OwnerCollection from '../models/wallet/OwnerCollection' +import OwnerModel from '../models/wallet/OwnerModel' +import multisigWalletService from '../services/MultisigWalletService' import { MultiEventsHistoryABI, WalletsManagerABI } from './abi' export const EE_MS_WALLET_ADDED = 'MSWalletAdded' diff --git a/packages/core/dao/NemDAO.js b/packages/core/dao/NemDAO.js index ffa47fe12..76c761dab 100644 --- a/packages/core/dao/NemDAO.js +++ b/packages/core/dao/NemDAO.js @@ -3,15 +3,15 @@ * Licensed under the AGPL Version 3 license. */ -import { TXS_PER_PAGE } from 'models/wallet/TransactionsCollection' +import { TXS_PER_PAGE } from '../models/wallet/TransactionsCollection' import BigNumber from 'bignumber.js' import EventEmitter from 'events' -import TokenModel from 'models/tokens/TokenModel' -import TxModel from 'models/TxModel' -import TransferExecModel from 'models/TransferExecModel' -import Amount from 'models/Amount' -import { nemAddress } from 'models/validator' -import { EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE } from 'dao/AbstractTokenDAO' +import TokenModel from '../models/tokens/TokenModel' +import TxModel from '../models/TxModel' +import TransferExecModel from '../models/TransferExecModel' +import Amount from '../models/Amount' +import { nemAddress } from '../models/validator' +import { EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE } from './AbstractTokenDAO' export const BLOCKCHAIN_NEM = 'NEM' export const NEM_XEM_SYMBOL = 'XEM' diff --git a/packages/core/dao/PendingManagerDAO.js b/packages/core/dao/PendingManagerDAO.js index d37e0d756..b2bd44526 100644 --- a/packages/core/dao/PendingManagerDAO.js +++ b/packages/core/dao/PendingManagerDAO.js @@ -4,9 +4,9 @@ */ import Immutable from 'immutable' -import OperationNoticeModel from 'models/notices/OperationNoticeModel' -import OperationModel from 'models/OperationModel' -import type TxExecModel from 'models/TxExecModel' +import OperationNoticeModel from '../models/notices/OperationNoticeModel' +import OperationModel from '../models/OperationModel' +import type TxExecModel from '../models/TxExecModel' import resultCodes from 'chronobank-smart-contracts/common/errors' import { MultiEventsHistoryABI, PendingManagerABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' diff --git a/packages/core/dao/PollEmitterDAO.js b/packages/core/dao/PollEmitterDAO.js index 1783cc7a0..cfb2647b8 100644 --- a/packages/core/dao/PollEmitterDAO.js +++ b/packages/core/dao/PollEmitterDAO.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import PollNoticeModel, { IS_VOTED, IS_ACTIVATED, IS_ENDED } from 'models/notices/PollNoticeModel' +import contractsManagerDAO from './ContractsManagerDAO' +import PollNoticeModel, { IS_VOTED, IS_ACTIVATED, IS_ENDED } from '../models/notices/PollNoticeModel' import { MultiEventsHistoryABI, PollEmitterABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' diff --git a/packages/core/dao/PollInterfaceDAO.js b/packages/core/dao/PollInterfaceDAO.js index 7f96d7140..b99fa76b9 100644 --- a/packages/core/dao/PollInterfaceDAO.js +++ b/packages/core/dao/PollInterfaceDAO.js @@ -5,8 +5,8 @@ import Immutable from 'immutable' import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' -import { TIME } from 'redux/mainWallet/actions' +import Amount from '../models/Amount' +import { TIME } from '../redux/mainWallet/actions' import { MultiEventsHistoryABI, PollInterfaceABI } from './abi' import AbstractMultisigContractDAO from './AbstractMultisigContractDAO' diff --git a/packages/core/dao/RewardsDAO.js b/packages/core/dao/RewardsDAO.js index 1979518c1..4f3ba8913 100644 --- a/packages/core/dao/RewardsDAO.js +++ b/packages/core/dao/RewardsDAO.js @@ -5,12 +5,12 @@ import BigNumber from 'bignumber.js' import resultCodes from 'chronobank-smart-contracts/common/errors' -import type ERC20DAO from 'dao/ERC20DAO' -import Amount from 'models/Amount' -import AssetModel from 'models/assetHolder/AssetModel' -import AssetsCollection from 'models/assetHolder/AssetsCollection' -import RewardsPeriodModel from 'models/rewards/RewardsPeriodModel' -import tokenService from 'services/TokenService' +import type ERC20DAO from './ERC20DAO' +import Amount from '../models/Amount' +import AssetModel from '../models/assetHolder/AssetModel' +import AssetsCollection from '../models/assetHolder/AssetsCollection' +import RewardsPeriodModel from '../models/rewards/RewardsPeriodModel' +import tokenService from '../services/TokenService' import { MultiEventsHistoryABI, RewardsABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' diff --git a/packages/core/dao/TokenManagementExtensionDAO.js b/packages/core/dao/TokenManagementExtensionDAO.js index 4cfc2283e..52a951a3c 100644 --- a/packages/core/dao/TokenManagementExtensionDAO.js +++ b/packages/core/dao/TokenManagementExtensionDAO.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '../models/tokens/TokenModel' import { MultiEventsHistoryABI, TokenManagementInterfaceABI } from './abi' import AbstractContractDAO from './AbstractContractDAO' diff --git a/packages/core/dao/UserManagerDAO.js b/packages/core/dao/UserManagerDAO.js index 63bd3fe12..5777a6e68 100644 --- a/packages/core/dao/UserManagerDAO.js +++ b/packages/core/dao/UserManagerDAO.js @@ -5,12 +5,12 @@ import BigNumber from 'bignumber.js' import Immutable from 'immutable' -import type AbstractModel from 'models/AbstractModel' -import CBEModel from 'models/CBEModel' -import CBENoticeModel from 'models/notices/CBENoticeModel' -import ProfileModel from 'models/ProfileModel' -import AdditionalActionModel from 'models/AdditionalActionModel' -import ProfileNoticeModel from 'models/notices/ProfileNoticeModel' +import type AbstractModel from '../models/AbstractModel' +import CBEModel from '../models/CBEModel' +import CBENoticeModel from '../models/notices/CBENoticeModel' +import ProfileModel from '../models/ProfileModel' +import AdditionalActionModel from '../models/AdditionalActionModel' +import ProfileNoticeModel from '../models/notices/ProfileNoticeModel' import { MultiEventsHistoryABI, UserManagerABI } from './abi' import AbstractMultisigContractDAO from './AbstractMultisigContractDAO' import { DEFAULT_TX_OPTIONS } from './AbstractContractDAO' diff --git a/packages/core/dao/VotingManagerDAO.js b/packages/core/dao/VotingManagerDAO.js index 28ab7b2d8..0abad9b14 100644 --- a/packages/core/dao/VotingManagerDAO.js +++ b/packages/core/dao/VotingManagerDAO.js @@ -3,18 +3,18 @@ * Licensed under the AGPL Version 3 license. */ -import votingService from 'services/VotingService' +import votingService from '../services/VotingService' import BigNumber from 'bignumber.js' import Immutable from 'immutable' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import PollNoticeModel, { IS_CREATED, IS_REMOVED, IS_UPDATED, } from 'models/notices/PollNoticeModel' -import PollModel from 'models/PollModel' -import ipfs from 'utils/IPFS' -import PollDetailsModel from 'models/PollDetailsModel' -import FileModel from 'models/FileSelect/FileModel' -import VotingCollection from 'models/voting/VotingCollection' -import Amount from 'models/Amount' -import { TIME } from 'redux/mainWallet/actions' +import contractsManagerDAO from './ContractsManagerDAO' +import PollNoticeModel, { IS_CREATED, IS_REMOVED, IS_UPDATED, } from '../models/notices/PollNoticeModel' +import PollModel from '../models/PollModel' +import ipfs from '../utils/IPFS' +import PollDetailsModel from '../models/PollDetailsModel' +import FileModel from '../models/FileSelect/FileModel' +import VotingCollection from '../models/voting/VotingCollection' +import Amount from '../models/Amount' +import { TIME } from '../redux/mainWallet/actions' import { MultiEventsHistoryABI, VotingManagerABI } from './abi' import AbstractMultisigContractDAO from './AbstractMultisigContractDAO' diff --git a/src/dao/WavesDAO.js b/packages/core/dao/WavesDAO.js similarity index 94% rename from src/dao/WavesDAO.js rename to packages/core/dao/WavesDAO.js index d459ee79a..78f3822bc 100644 --- a/src/dao/WavesDAO.js +++ b/packages/core/dao/WavesDAO.js @@ -3,15 +3,15 @@ * Licensed under the AGPL Version 3 license. */ -import { TXS_PER_PAGE } from 'models/wallet/TransactionsCollection' +import { TXS_PER_PAGE } from '../models/wallet/TransactionsCollection' import BigNumber from 'bignumber.js' import EventEmitter from 'events' -import TokenModel from 'models/tokens/TokenModel' -import TxModel from 'models/TxModel' -import TransferExecModel from 'models/TransferExecModel' -import Amount from 'models/Amount' -import { wavesAddress } from 'models/validator' -import { EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE } from 'dao/AbstractTokenDAO' +import TokenModel from '../models/tokens/TokenModel' +import TxModel from '../models/TxModel' +import TransferExecModel from '../models/TransferExecModel' +import Amount from '../models/Amount' +import { wavesAddress } from '../models/validator' +import { EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE } from './AbstractTokenDAO' export const BLOCKCHAIN_WAVES = 'WAVES' export const WAVES_WAVES_SYMBOL = 'WAVES' diff --git a/packages/core/market/MarketSocket.js b/packages/core/market/MarketSocket.js index bb0fb9ece..8149f1497 100644 --- a/packages/core/market/MarketSocket.js +++ b/packages/core/market/MarketSocket.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import CCC from 'market/ccc-streamer-utilities' +import CCC from './ccc-streamer-utilities' import EventEmitter from 'events' import openSocket from 'socket.io-client' diff --git a/packages/core/models/CBEModel.js b/packages/core/models/CBEModel.js index deab5fa5f..5e4d16f3a 100644 --- a/packages/core/models/CBEModel.js +++ b/packages/core/models/CBEModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import ErrorList from '../utils/ErrorList' +import validator from './validator' import { abstractFetchingModel } from './AbstractFetchingModel' import ProfileModel from './ProfileModel' diff --git a/packages/core/models/LOCModel.js b/packages/core/models/LOCModel.js index 0a872f4e3..219433f5f 100644 --- a/packages/core/models/LOCModel.js +++ b/packages/core/models/LOCModel.js @@ -5,9 +5,9 @@ import BigNumber from 'bignumber.js' import moment from 'moment' -import { I18n } from 'platform/i18n' -import Amount from 'models/Amount' -import TokenModel from 'models/tokens/TokenModel' +import { I18n } from '../utils/i18n' +import Amount from './Amount' +import TokenModel from './tokens/TokenModel' import { abstractFetchingModel } from './AbstractFetchingModel' import { dateFormatOptions } from './constants' diff --git a/packages/core/models/LOCModel.spec.js b/packages/core/models/LOCModel.spec.js index b191b571b..9ed2ee6e8 100644 --- a/packages/core/models/LOCModel.spec.js +++ b/packages/core/models/LOCModel.spec.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from './tokens/TokenModel' import LOCModel from './LOCModel' describe('LOC model', () => { diff --git a/packages/core/models/PollDetailsModel.js b/packages/core/models/PollDetailsModel.js index 922ca4bb4..8a61b39ea 100644 --- a/packages/core/models/PollDetailsModel.js +++ b/packages/core/models/PollDetailsModel.js @@ -6,7 +6,7 @@ import BigNumber from 'bignumber.js' import Immutable from 'immutable' import moment from 'moment' -import { TIME } from 'redux/mainWallet/actions' +import { TIME } from '../redux/mainWallet/actions' import { abstractFetchingModel } from './AbstractFetchingModel' import PollModel from './PollModel' import Amount from './Amount' diff --git a/packages/core/models/TransferExecModel.js b/packages/core/models/TransferExecModel.js index 9b36d38dc..5400d257c 100644 --- a/packages/core/models/TransferExecModel.js +++ b/packages/core/models/TransferExecModel.js @@ -6,7 +6,7 @@ import moment from 'moment' import uniqid from 'uniqid' import BigNumber from 'bignumber.js' -import { I18n } from 'platform/i18n' +import { I18n } from '../utils/i18n' import { abstractModel } from './AbstractModel' import TokenModel from './tokens/TokenModel' diff --git a/packages/core/models/TxExecModel.js b/packages/core/models/TxExecModel.js index ebdb27e32..efc6bff17 100644 --- a/packages/core/models/TxExecModel.js +++ b/packages/core/models/TxExecModel.js @@ -4,7 +4,7 @@ */ import BigNumber from 'bignumber.js' -import { I18n } from 'platform/i18n' +import { I18n } from '../utils/i18n' import Immutable from 'immutable' import moment from 'moment' import uniqid from 'uniqid' diff --git a/packages/core/models/TxModel.js b/packages/core/models/TxModel.js index e07bc0386..770d8a6a7 100644 --- a/packages/core/models/TxModel.js +++ b/packages/core/models/TxModel.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import { FULL_DATE } from 'models/constants' +import { FULL_DATE } from './constants' import BigNumber from 'bignumber.js' import moment from 'moment' import { abstractModel } from './AbstractModel' diff --git a/packages/core/models/assetHolder/AssetHolderModel.js b/packages/core/models/assetHolder/AssetHolderModel.js index 6a7d6064b..d495745ca 100644 --- a/packages/core/models/assetHolder/AssetHolderModel.js +++ b/packages/core/models/assetHolder/AssetHolderModel.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '../Amount' import { abstractFetchingModel } from '../AbstractFetchingModel' import AssetsCollection from './AssetsCollection' diff --git a/packages/core/models/assetHolder/AssetModel.js b/packages/core/models/assetHolder/AssetModel.js index d5a6d326c..5c3cc4287 100644 --- a/packages/core/models/assetHolder/AssetModel.js +++ b/packages/core/models/assetHolder/AssetModel.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '../Amount' import { abstractFetchingModel } from '../AbstractFetchingModel' export default class AssetModel extends abstractFetchingModel({ diff --git a/packages/core/models/exchange/ExchangeModel.js b/packages/core/models/exchange/ExchangeModel.js index bcdafb828..0a63a32f1 100644 --- a/packages/core/models/exchange/ExchangeModel.js +++ b/packages/core/models/exchange/ExchangeModel.js @@ -4,7 +4,7 @@ */ import Immutable from 'immutable' -import { abstractFetchingModel } from 'models/AbstractFetchingModel' +import { abstractFetchingModel } from '../AbstractFetchingModel' import ExchangesCollection from './ExchangesCollection' export default class ExchangeModel extends abstractFetchingModel({ diff --git a/packages/core/models/notices/AbstractNoticeModel.js b/packages/core/models/notices/AbstractNoticeModel.js index 6e34abe25..d6b1f8296 100644 --- a/packages/core/models/notices/AbstractNoticeModel.js +++ b/packages/core/models/notices/AbstractNoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import moment from 'moment' import uniqid from 'uniqid' import { abstractModel } from '../AbstractModel' diff --git a/packages/core/models/notices/ApprovalNoticeModel.js b/packages/core/models/notices/ApprovalNoticeModel.js index c0477e27a..73c0adac2 100644 --- a/packages/core/models/notices/ApprovalNoticeModel.js +++ b/packages/core/models/notices/ApprovalNoticeModel.js @@ -4,8 +4,8 @@ */ import BigNumber from 'bignumber.js' -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import { abstractNoticeModel } from './AbstractNoticeModel' export default class ApprovalNoticeModel extends abstractNoticeModel({ diff --git a/packages/core/models/notices/ArbitraryNoticeModel.js b/packages/core/models/notices/ArbitraryNoticeModel.js index 320485f10..70affc73d 100644 --- a/packages/core/models/notices/ArbitraryNoticeModel.js +++ b/packages/core/models/notices/ArbitraryNoticeModel.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' +import { I18n } from '../../utils/i18n' import { abstractNoticeModel } from './AbstractNoticeModel' export default class ArbitraryNoticeModel extends abstractNoticeModel({ diff --git a/packages/core/models/notices/AssetsManagerNoticeModel.js b/packages/core/models/notices/AssetsManagerNoticeModel.js index 281eb3728..7d06071cb 100644 --- a/packages/core/models/notices/AssetsManagerNoticeModel.js +++ b/packages/core/models/notices/AssetsManagerNoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import { abstractNoticeModel } from './AbstractNoticeModel' export const MANAGER_ADDED = 'managerAdded' diff --git a/packages/core/models/notices/CBENoticeModel.js b/packages/core/models/notices/CBENoticeModel.js index 43ed3a1f2..5aa219cb0 100644 --- a/packages/core/models/notices/CBENoticeModel.js +++ b/packages/core/models/notices/CBENoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import { abstractNoticeModel } from './AbstractNoticeModel' import type CBEModel from '../CBEModel' diff --git a/packages/core/models/notices/ErrorNoticeModel.js b/packages/core/models/notices/ErrorNoticeModel.js index d08677ab9..d0b0a7431 100644 --- a/packages/core/models/notices/ErrorNoticeModel.js +++ b/packages/core/models/notices/ErrorNoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import { abstractNoticeModel } from './AbstractNoticeModel' export default class ErrorNoticeModel extends abstractNoticeModel({ diff --git a/packages/core/models/notices/LOCNoticeModel.js b/packages/core/models/notices/LOCNoticeModel.js index 613143ad0..e9c29bec4 100644 --- a/packages/core/models/notices/LOCNoticeModel.js +++ b/packages/core/models/notices/LOCNoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import { abstractNoticeModel } from './AbstractNoticeModel' const ADDED = 'notices.locs.added' diff --git a/packages/core/models/notices/OperationNoticeModel.js b/packages/core/models/notices/OperationNoticeModel.js index 0bc9abdb4..c79a8397f 100644 --- a/packages/core/models/notices/OperationNoticeModel.js +++ b/packages/core/models/notices/OperationNoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import { abstractNoticeModel } from './AbstractNoticeModel' import type OperationModel from '../OperationModel' import type TxExecModel from '../TxExecModel' diff --git a/packages/core/models/notices/PollNoticeModel.js b/packages/core/models/notices/PollNoticeModel.js index 80b4df34c..eada11218 100644 --- a/packages/core/models/notices/PollNoticeModel.js +++ b/packages/core/models/notices/PollNoticeModel.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' -import type PollDetailsModel from 'models/PollDetailsModel' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' +import type PollDetailsModel from '../PollDetailsModel' import { abstractNoticeModel } from './AbstractNoticeModel' export const IS_CREATED = 'isCreated' diff --git a/packages/core/models/notices/ProfileNoticeModel.js b/packages/core/models/notices/ProfileNoticeModel.js index 5999071a8..4296e423e 100644 --- a/packages/core/models/notices/ProfileNoticeModel.js +++ b/packages/core/models/notices/ProfileNoticeModel.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' -import ProfileModel from 'models/ProfileModel' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' +import ProfileModel from '../ProfileModel' import { abstractNoticeModel } from './AbstractNoticeModel' export default class ProfileNoticeModel extends abstractNoticeModel({ diff --git a/packages/core/models/notices/TokenNoticeModel.js b/packages/core/models/notices/TokenNoticeModel.js index ff5f8c5b9..b2026a5bf 100644 --- a/packages/core/models/notices/TokenNoticeModel.js +++ b/packages/core/models/notices/TokenNoticeModel.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' -import type TokenModel from 'models/tokens/TokenModel' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' +import type TokenModel from '../tokens/TokenModel' import { abstractNoticeModel } from './AbstractNoticeModel' export const IS_ADDED = 'isAdded' diff --git a/packages/core/models/notices/TransactionErrorNoticeModel.js b/packages/core/models/notices/TransactionErrorNoticeModel.js index 913c1dc3e..5c174ff37 100644 --- a/packages/core/models/notices/TransactionErrorNoticeModel.js +++ b/packages/core/models/notices/TransactionErrorNoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import TxError from 'models/TxError' +import { I18n } from '../../utils/i18n' +import TxError from '../TxError' import { abstractNoticeModel } from './AbstractNoticeModel' import type TxExecModel from '../TxExecModel' diff --git a/packages/core/models/notices/TransferErrorNoticeModel.js b/packages/core/models/notices/TransferErrorNoticeModel.js index 1603aed2d..34cab9e05 100644 --- a/packages/core/models/notices/TransferErrorNoticeModel.js +++ b/packages/core/models/notices/TransferErrorNoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import TransferError from 'models/TransferError' +import { I18n } from '../../utils/i18n' +import TransferError from '../TransferError' import { abstractNoticeModel } from './AbstractNoticeModel' import type TransferExecModel from '../TransferExecModel' diff --git a/packages/core/models/notices/TransferNoticeModel.js b/packages/core/models/notices/TransferNoticeModel.js index fb102cdbf..0caf2d3ae 100644 --- a/packages/core/models/notices/TransferNoticeModel.js +++ b/packages/core/models/notices/TransferNoticeModel.js @@ -4,8 +4,8 @@ */ import BigNumber from 'bignumber.js' -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import { abstractNoticeModel } from './AbstractNoticeModel' import type TxModel from '../TxModel' diff --git a/packages/core/models/notices/WalletNoticeModel.js b/packages/core/models/notices/WalletNoticeModel.js index f35f1d0b3..95da8add8 100644 --- a/packages/core/models/notices/WalletNoticeModel.js +++ b/packages/core/models/notices/WalletNoticeModel.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { I18n } from 'platform/i18n' -import { Icons } from 'platform/icons' +import { I18n } from '../../utils/i18n' +import { Icons } from '../../utils/icons' import { abstractNoticeModel } from './AbstractNoticeModel' const CREATED = 'notices.wallet.created' diff --git a/packages/core/models/rewards/RewardsCollection.js b/packages/core/models/rewards/RewardsCollection.js index 8a60c0de8..c3a8c60ac 100644 --- a/packages/core/models/rewards/RewardsCollection.js +++ b/packages/core/models/rewards/RewardsCollection.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import RewardsCurrentPeriodModel from 'models/rewards/RewardsCurrentPeriodModel' -import AssetsCollection from 'models/assetHolder/AssetsCollection' +import RewardsCurrentPeriodModel from './RewardsCurrentPeriodModel' +import AssetsCollection from '../assetHolder/AssetsCollection' import { abstractFetchingCollection } from '../AbstractFetchingCollection' import RewardsPeriodModel from './RewardsPeriodModel' diff --git a/packages/core/models/rewards/RewardsCurrentPeriodModel.js b/packages/core/models/rewards/RewardsCurrentPeriodModel.js index b64b69dd3..50030d3cb 100644 --- a/packages/core/models/rewards/RewardsCurrentPeriodModel.js +++ b/packages/core/models/rewards/RewardsCurrentPeriodModel.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '../Amount' import { abstractFetchingModel } from '../AbstractFetchingModel' export default class RewardsCurrentPeriodModel extends abstractFetchingModel({ diff --git a/packages/core/models/rewards/RewardsModel.js b/packages/core/models/rewards/RewardsModel.js index f3c8bd860..d2d80cbe6 100644 --- a/packages/core/models/rewards/RewardsModel.js +++ b/packages/core/models/rewards/RewardsModel.js @@ -4,8 +4,8 @@ */ import Immutable from 'immutable' -import Amount from 'models/Amount' -import AssetsCollection from 'models/assetHolder/AssetsCollection' +import Amount from '../Amount' +import AssetsCollection from '../assetHolder/AssetsCollection' import { abstractFetchingModel } from '../AbstractFetchingModel' export default class RewardsModel extends abstractFetchingModel({ diff --git a/packages/core/models/rewards/RewardsPeriodModel.js b/packages/core/models/rewards/RewardsPeriodModel.js index ac6269742..9600bc4fa 100644 --- a/packages/core/models/rewards/RewardsPeriodModel.js +++ b/packages/core/models/rewards/RewardsPeriodModel.js @@ -4,7 +4,7 @@ */ import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' +import Amount from '../Amount' import moment from 'moment' import { abstractFetchingModel } from '../AbstractFetchingModel' diff --git a/packages/core/models/tokens/BalanceModel.js b/packages/core/models/tokens/BalanceModel.js index dd5e984a8..3f0d9fde7 100644 --- a/packages/core/models/tokens/BalanceModel.js +++ b/packages/core/models/tokens/BalanceModel.js @@ -4,7 +4,7 @@ */ import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' +import Amount from '../Amount' import { abstractFetchingModel } from '../AbstractFetchingModel' export default class BalanceModel extends abstractFetchingModel({ diff --git a/packages/core/models/tokens/TokenModel.js b/packages/core/models/tokens/TokenModel.js index 1673a665b..b7981963f 100644 --- a/packages/core/models/tokens/TokenModel.js +++ b/packages/core/models/tokens/TokenModel.js @@ -3,11 +3,11 @@ * Licensed under the AGPL Version 3 license. */ -import OwnerCollection from 'models/wallet/OwnerCollection' +import OwnerCollection from '../wallet/OwnerCollection' import BigNumber from 'bignumber.js' -import type AbstractTokenDAO from 'dao/AbstractTokenDAO' -import type ERC20DAO from 'dao/ERC20DAO' -import Amount from 'models/Amount' +import type AbstractTokenDAO from '../../dao/AbstractTokenDAO' +import type ERC20DAO from '../../dao/ERC20DAO' +import Amount from '../Amount' import { abstractFetchingModel } from '../AbstractFetchingModel' import FeeModel from './FeeModel' import ReissuableModel from './ReissuableModel' diff --git a/packages/core/models/voting/VotingCollection.js b/packages/core/models/voting/VotingCollection.js index 0edd61350..7979d4e8e 100644 --- a/packages/core/models/voting/VotingCollection.js +++ b/packages/core/models/voting/VotingCollection.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import { abstractFetchingCollection } from 'models/AbstractFetchingCollection' +import { abstractFetchingCollection } from '../AbstractFetchingCollection' export default class VotingCollection extends abstractFetchingCollection({}) { } diff --git a/packages/core/models/voting/VotingMainModel.js b/packages/core/models/voting/VotingMainModel.js index 6aaedaaa4..fc8fdb65a 100644 --- a/packages/core/models/voting/VotingMainModel.js +++ b/packages/core/models/voting/VotingMainModel.js @@ -4,7 +4,7 @@ */ import Immutable from 'immutable' -import { abstractFetchingModel } from 'models/AbstractFetchingModel' +import { abstractFetchingModel } from '../AbstractFetchingModel' import BigNumber from 'bignumber.js' import VotingCollection from './VotingCollection' diff --git a/packages/core/models/wallet/AllowanceModel.js b/packages/core/models/wallet/AllowanceModel.js index 143cdc3e0..c0496db39 100644 --- a/packages/core/models/wallet/AllowanceModel.js +++ b/packages/core/models/wallet/AllowanceModel.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '../Amount' import { abstractFetchingModel } from '../AbstractFetchingModel' export default class AllowanceModel extends abstractFetchingModel({ diff --git a/packages/core/models/wallet/DerivedWalletModel.js b/packages/core/models/wallet/DerivedWalletModel.js index 12f6b1a50..cafc1079d 100644 --- a/packages/core/models/wallet/DerivedWalletModel.js +++ b/packages/core/models/wallet/DerivedWalletModel.js @@ -4,8 +4,8 @@ */ import Immutable from 'immutable' -import BalancesCollection from 'models/tokens/BalancesCollection' -import TransactionsCollection from 'models/wallet/TransactionsCollection' +import BalancesCollection from '../tokens/BalancesCollection' +import TransactionsCollection from './TransactionsCollection' import { abstractFetchingModel } from '../AbstractFetchingModel' import OwnerCollection from './OwnerCollection' import AddressesCollection from './AddressesCollection' diff --git a/packages/core/models/wallet/MainWalletModel.js b/packages/core/models/wallet/MainWalletModel.js index e7d5573e2..505c6c2d8 100644 --- a/packages/core/models/wallet/MainWalletModel.js +++ b/packages/core/models/wallet/MainWalletModel.js @@ -4,9 +4,9 @@ */ import Immutable from 'immutable' -import BalanceModel from 'models/tokens/BalanceModel' -import BalancesCollection from 'models/tokens/BalancesCollection' -import ls from 'utils/LocalStorage' +import BalanceModel from '../tokens/BalanceModel' +import BalancesCollection from '../tokens/BalancesCollection' +import ls from '../../utils/LocalStorage' import { abstractFetchingModel } from '../AbstractFetchingModel' import AllowanceCollection from './AllowanceCollection' import TransactionsCollection from './TransactionsCollection' diff --git a/packages/core/models/wallet/MultisigWalletCollection.js b/packages/core/models/wallet/MultisigWalletCollection.js index 4ec4fecc9..e11c5af76 100644 --- a/packages/core/models/wallet/MultisigWalletCollection.js +++ b/packages/core/models/wallet/MultisigWalletCollection.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import BalanceModel from 'models/tokens/BalanceModel' +import BalanceModel from '../tokens/BalanceModel' import { abstractFetchingCollection } from '../AbstractFetchingCollection' import MultisigWalletModel from './MultisigWalletModel' import type MultisigWalletPendingTxModel from './MultisigWalletPendingTxModel' diff --git a/packages/core/models/wallet/MultisigWalletModel.js b/packages/core/models/wallet/MultisigWalletModel.js index 09bd74f2d..3511e7db5 100644 --- a/packages/core/models/wallet/MultisigWalletModel.js +++ b/packages/core/models/wallet/MultisigWalletModel.js @@ -4,11 +4,11 @@ */ import Immutable from 'immutable' -import BalancesCollection from 'models/tokens/BalancesCollection' -import AddressesCollection from 'models/wallet/AddressesCollection' -import MultisigWalletPendingTxCollection from 'models/wallet/MultisigWalletPendingTxCollection' -import TransactionsCollection from 'models/wallet/TransactionsCollection' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import BalancesCollection from '../tokens/BalancesCollection' +import AddressesCollection from './AddressesCollection' +import MultisigWalletPendingTxCollection from './MultisigWalletPendingTxCollection' +import TransactionsCollection from './TransactionsCollection' +import { BLOCKCHAIN_ETHEREUM } from '../../dao/EthereumDAO' import { abstractFetchingModel } from '../AbstractFetchingModel' import OwnerCollection from './OwnerCollection' diff --git a/packages/core/models/wallet/MultisigWalletModel.spec.js b/packages/core/models/wallet/MultisigWalletModel.spec.js index bed6988f2..8bb0bc373 100644 --- a/packages/core/models/wallet/MultisigWalletModel.spec.js +++ b/packages/core/models/wallet/MultisigWalletModel.spec.js @@ -4,11 +4,11 @@ */ import Immutable from 'immutable' -import TokenModel from 'models/tokens/TokenModel' -import TxModel from 'models/TxModel' -import MultisigWalletPendingTxCollection from 'models/wallet/MultisigWalletPendingTxCollection' -import MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel' -import TransactionsCollection from 'models/wallet/TransactionsCollection' +import TokenModel from '../tokens/TokenModel' +import TxModel from '../TxModel' +import MultisigWalletPendingTxCollection from './MultisigWalletPendingTxCollection' +import MultisigWalletPendingTxModel from './MultisigWalletPendingTxModel' +import TransactionsCollection from './TransactionsCollection' import MultisigWalletModel from './MultisigWalletModel' const multisigWalletModel = new MultisigWalletModel({ diff --git a/packages/core/models/wallet/MultisigWalletPendingTxModel.js b/packages/core/models/wallet/MultisigWalletPendingTxModel.js index f01cf8041..1fdf6b127 100644 --- a/packages/core/models/wallet/MultisigWalletPendingTxModel.js +++ b/packages/core/models/wallet/MultisigWalletPendingTxModel.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import TxExecModel from 'models/TxExecModel' +import TxExecModel from '../TxExecModel' import BigNumber from 'bignumber.js' import { abstractFetchingModel } from '../AbstractFetchingModel' diff --git a/packages/core/models/wallet/TransactionsCollection.js b/packages/core/models/wallet/TransactionsCollection.js index cb022cfdf..24a06693a 100644 --- a/packages/core/models/wallet/TransactionsCollection.js +++ b/packages/core/models/wallet/TransactionsCollection.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import TxModel from 'models/TxModel' +import TxModel from '../TxModel' import { abstractFetchingCollection } from '../AbstractFetchingCollection' export const TXS_PER_PAGE = 20 diff --git a/packages/core/redux/assetsHolder/actions.js b/packages/core/redux/assetsHolder/actions.js index df3c9eb9c..dcefff0dc 100644 --- a/packages/core/redux/assetsHolder/actions.js +++ b/packages/core/redux/assetsHolder/actions.js @@ -3,17 +3,17 @@ * Licensed under the AGPL Version 3 license. */ -import { EVENT_APPROVAL_TRANSFER, EVENT_NEW_TRANSFER } from 'dao/AbstractTokenDAO' -import AssetHolderDAO from 'dao/AssetHolderDAO' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import Amount from 'models/Amount' -import AssetModel from 'models/assetHolder/AssetModel' -import TokenModel from 'models/tokens/TokenModel' -import AllowanceModel from 'models/wallet/AllowanceModel' -import { WALLET_ALLOWANCE } from 'redux/mainWallet/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { subscribeOnTokens } from 'redux/tokens/actions' -import tokenService from 'services/TokenService' +import { EVENT_APPROVAL_TRANSFER, EVENT_NEW_TRANSFER } from '../../dao/AbstractTokenDAO' +import AssetHolderDAO from '../../dao/AssetHolderDAO' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import Amount from '../../models/Amount' +import AssetModel from '../../models/assetHolder/AssetModel' +import TokenModel from '../../models/tokens/TokenModel' +import AllowanceModel from '../../models/wallet/AllowanceModel' +import { WALLET_ALLOWANCE } from '../mainWallet/actions' +import { DUCK_SESSION } from '../session/actions' +import { subscribeOnTokens } from '../tokens/actions' +import tokenService from '../../services/TokenService' export const DUCK_ASSETS_HOLDER = 'assetsHolder' diff --git a/packages/core/redux/assetsHolder/reducer.js b/packages/core/redux/assetsHolder/reducer.js index 380f2d172..75d381707 100644 --- a/packages/core/redux/assetsHolder/reducer.js +++ b/packages/core/redux/assetsHolder/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import AssetHolderModel from 'models/assetHolder/AssetHolderModel' +import AssetHolderModel from '../../models/assetHolder/AssetHolderModel' import * as a from './actions' const initialState = new AssetHolderModel() diff --git a/packages/core/redux/assetsManager/actions.js b/packages/core/redux/assetsManager/actions.js index 17fd8f6d6..7b4b2a27b 100644 --- a/packages/core/redux/assetsManager/actions.js +++ b/packages/core/redux/assetsManager/actions.js @@ -4,13 +4,13 @@ */ import Immutable from 'immutable' -import { notify } from 'redux/notifier/actions' -import web3Converter from 'utils/Web3Converter' -import contractManager from 'dao/ContractsManagerDAO' -import ReissuableModel from 'models/tokens/ReissuableModel' -import TokenModel from 'models/tokens/TokenModel' -import OwnerCollection from 'models/wallet/OwnerCollection' -import OwnerModel from 'models/wallet/OwnerModel' +import { notify } from '../notifier/actions' +import web3Converter from '../../utils/Web3Converter' +import contractManager from '../../dao/ContractsManagerDAO' +import ReissuableModel from '../../models/tokens/ReissuableModel' +import TokenModel from '../../models/tokens/TokenModel' +import OwnerCollection from '../../models/wallet/OwnerCollection' +import OwnerModel from '../../models/wallet/OwnerModel' import { MIDDLEWARE_EVENT_ISSUE, MIDDLEWARE_EVENT_PLATFORM_REQUESTED, @@ -19,9 +19,9 @@ import { MIDDLEWARE_EVENT_UNRESTRICTED, MIDDLEWARE_EVENT_PAUSED, MIDDLEWARE_EVENT_UNPAUSED, -} from 'dao/AssetsManagerDAO' -import { DUCK_SESSION } from 'redux/session/actions' -import { DUCK_TOKENS, TOKENS_FETCHED, TOKENS_UPDATE } from 'redux/tokens/actions' +} from '../../dao/AssetsManagerDAO' +import { DUCK_SESSION } from '../session/actions' +import { DUCK_TOKENS, TOKENS_FETCHED, TOKENS_UPDATE } from '../tokens/actions' import AssetsManagerNoticeModel, { ASSET_PAUSED, ASSET_UNPAUSED, @@ -29,9 +29,9 @@ import AssetsManagerNoticeModel, { MANAGER_REMOVED, USER_ADDED_TO_BLACKLIST, USER_DELETED_FROM_BLACKLIST, -} from 'models/notices/AssetsManagerNoticeModel' -import PausedModel from 'models/tokens/PausedModel' -import BlacklistModel from 'models/tokens/BlacklistModel' +} from '../../models/notices/AssetsManagerNoticeModel' +import PausedModel from '../../models/tokens/PausedModel' +import BlacklistModel from '../../models/tokens/BlacklistModel' export const DUCK_ASSETS_MANAGER = 'assetsManager' diff --git a/packages/core/redux/assetsManager/actions.spec.js b/packages/core/redux/assetsManager/actions.spec.js index 13183e622..f45ed7e1d 100644 --- a/packages/core/redux/assetsManager/actions.spec.js +++ b/packages/core/redux/assetsManager/actions.spec.js @@ -3,19 +3,19 @@ * Licensed under the AGPL Version 3 license. */ -import contractsManagerDAO from 'dao/ContractsManagerDAO' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' import Immutable from 'immutable' import networkService from '@chronobank/login/network/NetworkService' -import TokenModel from 'models/tokens/TokenModel' -import { DUCK_SESSION } from 'redux/session/actions' +import TokenModel from '../../models/tokens/TokenModel' +import { DUCK_SESSION } from '../session/actions' import { accounts, mockStore } from 'specsInit' -import FeeModel from 'models/tokens/FeeModel' -import Amount from 'models/Amount' -import ReissuableModel from 'models/tokens/ReissuableModel' -import OwnerCollection from 'models/wallet/OwnerCollection' -import { DUCK_TOKENS, TOKENS_FETCHED } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' -import OwnerModel from 'models/wallet/OwnerModel' +import FeeModel from '../../models/tokens/FeeModel' +import Amount from '../../models/Amount' +import ReissuableModel from '../../models/tokens/ReissuableModel' +import OwnerCollection from '../../models/wallet/OwnerCollection' +import { DUCK_TOKENS, TOKENS_FETCHED } from '../tokens/actions' +import TokensCollection from '../../models/tokens/TokensCollection' +import OwnerModel from '../../models/wallet/OwnerModel' import * as a from './actions' let store diff --git a/packages/core/redux/assetsManager/reducer.js b/packages/core/redux/assetsManager/reducer.js index 77e6dd063..59eb27586 100644 --- a/packages/core/redux/assetsManager/reducer.js +++ b/packages/core/redux/assetsManager/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import MainAssetsManagerModel from 'models/assetsManager/MainAssetsManagerModel' +import MainAssetsManagerModel from '../../models/assetsManager/MainAssetsManagerModel' import { GET_ASSETS_MANAGER_COUNTS, GET_ASSETS_MANAGER_COUNTS_START, diff --git a/packages/core/redux/assetsManager/selectors.js b/packages/core/redux/assetsManager/selectors.js index e6e6e59ba..dc47ff4e7 100644 --- a/packages/core/redux/assetsManager/selectors.js +++ b/packages/core/redux/assetsManager/selectors.js @@ -3,5 +3,5 @@ * Licensed under the AGPL Version 3 license. */ -export { getSelectedTokenId, getAssets, getPlatforms } from 'redux/assetsManager/selectors/models' -export { getSelectedToken, getUserTokens } from 'redux/assetsManager/selectors/assetsManager' +export { getSelectedTokenId, getAssets, getPlatforms } from './selectors/models' +export { getSelectedToken, getUserTokens } from './selectors/assetsManager' diff --git a/src/redux/assetsManager/selectors/assetsManager.js b/packages/core/redux/assetsManager/selectors/assetsManager.js similarity index 80% rename from src/redux/assetsManager/selectors/assetsManager.js rename to packages/core/redux/assetsManager/selectors/assetsManager.js index 4d831af24..0c1829313 100644 --- a/src/redux/assetsManager/selectors/assetsManager.js +++ b/packages/core/redux/assetsManager/selectors/assetsManager.js @@ -4,9 +4,9 @@ */ import { createSelector } from 'reselect' -import TokensCollection from 'models/tokens/TokensCollection' -import { getTokens } from 'redux/tokens/selectors' -import { getSelectedTokenId, getPlatforms, getAssets } from 'redux/assetsManager/selectors/models' +import TokensCollection from '../../../models/tokens/TokensCollection' +import { getTokens } from '../../tokens/selectors' +import { getSelectedTokenId, getPlatforms, getAssets } from './models' export const getSelectedToken = () => createSelector( [getTokens, getSelectedTokenId], diff --git a/src/redux/assetsManager/selectors/models.js b/packages/core/redux/assetsManager/selectors/models.js similarity index 85% rename from src/redux/assetsManager/selectors/models.js rename to packages/core/redux/assetsManager/selectors/models.js index 6dc3ac920..fae230189 100644 --- a/src/redux/assetsManager/selectors/models.js +++ b/packages/core/redux/assetsManager/selectors/models.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import { DUCK_ASSETS_MANAGER } from 'redux/assetsManager/actions' +import { DUCK_ASSETS_MANAGER } from '../actions' export const getSelectedTokenId = (state) => { return state.get(DUCK_ASSETS_MANAGER).selectedToken() diff --git a/packages/core/redux/exchange/actions.js b/packages/core/redux/exchange/actions.js index c86de9a6a..add476890 100644 --- a/packages/core/redux/exchange/actions.js +++ b/packages/core/redux/exchange/actions.js @@ -3,18 +3,18 @@ * Licensed under the AGPL Version 3 license. */ -import tokenService from 'services/TokenService' +import tokenService from '../../services/TokenService' import BigNumber from 'bignumber.js' -import contractsManagerDAO from 'dao/ContractsManagerDAO' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' import Immutable from 'immutable' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import { DUCK_SESSION } from 'redux/session/actions' -import exchangeService from 'services/ExchangeService' -import { fetchTokenBalance, WALLET_ALLOWANCE } from 'redux/mainWallet/actions' -import TokenModel from 'models/tokens/TokenModel' -import { DUCK_TOKENS, subscribeOnTokens } from 'redux/tokens/actions' -import AllowanceModel from 'models/wallet/AllowanceModel' -import Amount from 'models/Amount' +import ExchangeOrderModel from '../../models/exchange/ExchangeOrderModel' +import { DUCK_SESSION } from '../session/actions' +import exchangeService from '../../services/ExchangeService' +import { fetchTokenBalance, WALLET_ALLOWANCE } from '../mainWallet/actions' +import TokenModel from '../../models/tokens/TokenModel' +import { DUCK_TOKENS, subscribeOnTokens } from '../tokens/actions' +import AllowanceModel from '../../models/wallet/AllowanceModel' +import Amount from '../../models/Amount' export const DUCK_EXCHANGE = 'exchange' diff --git a/packages/core/redux/exchange/actions.spec.js b/packages/core/redux/exchange/actions.spec.js index 76c6447d4..b8aa61e77 100644 --- a/packages/core/redux/exchange/actions.spec.js +++ b/packages/core/redux/exchange/actions.spec.js @@ -3,23 +3,23 @@ * Licensed under the AGPL Version 3 license. */ -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import tokenService from 'services/TokenService' -import MainWalletModel from 'models/wallet/MainWalletModel' -import ExchangesCollection from 'models/exchange/ExchangesCollection' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import tokenService from '../../services/TokenService' +import MainWalletModel from '../../models/wallet/MainWalletModel' +import ExchangesCollection from '../../models/exchange/ExchangesCollection' import BigNumber from 'bignumber.js' -import { mainTransfer, WALLET_ALLOWANCE } from 'redux/mainWallet/actions' +import { mainTransfer, WALLET_ALLOWANCE } from '../mainWallet/actions' import Immutable from 'immutable' import networkService from '@chronobank/login/network/NetworkService' -import exchangeService from 'services/ExchangeService' -import { DUCK_SESSION } from 'redux/session/actions' +import exchangeService from '../../services/ExchangeService' +import { DUCK_SESSION } from '../session/actions' import { accounts, mockStore } from 'specsInit' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import ExchangeModel from 'models/exchange/ExchangeModel' -import TokensCollection from 'models/tokens/TokensCollection' -import TokenModel from 'models/tokens/TokenModel' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import ERC20ManagerDAO, { EVENT_NEW_ERC20_TOKEN } from 'dao/ERC20ManagerDAO' +import ExchangeOrderModel from '../../models/exchange/ExchangeOrderModel' +import ExchangeModel from '../../models/exchange/ExchangeModel' +import TokensCollection from '../../models/tokens/TokensCollection' +import TokenModel from '../../models/tokens/TokenModel' +import { DUCK_TOKENS } from '../tokens/actions' +import ERC20ManagerDAO, { EVENT_NEW_ERC20_TOKEN } from '../../dao/ERC20ManagerDAO' import * as a from './actions' let store diff --git a/packages/core/redux/exchange/reducer.js b/packages/core/redux/exchange/reducer.js index 74766950b..bf8697023 100644 --- a/packages/core/redux/exchange/reducer.js +++ b/packages/core/redux/exchange/reducer.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import ExchangeModel from 'models/exchange/ExchangeModel' -import ExchangesCollection from 'models/exchange/ExchangesCollection' +import ExchangeModel from '../../models/exchange/ExchangeModel' +import ExchangesCollection from '../../models/exchange/ExchangesCollection' import * as a from './actions' export const initialState = new ExchangeModel() diff --git a/packages/core/redux/exchange/reducer.spec.js b/packages/core/redux/exchange/reducer.spec.js index 9285cfeeb..baac94d32 100644 --- a/packages/core/redux/exchange/reducer.spec.js +++ b/packages/core/redux/exchange/reducer.spec.js @@ -4,8 +4,8 @@ */ import Immutable from 'immutable' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import ExchangesCollection from 'models/exchange/ExchangesCollection' +import ExchangeOrderModel from '../../models/exchange/ExchangeOrderModel' +import ExchangesCollection from '../../models/exchange/ExchangesCollection' import * as a from './actions' import reducer, { initialState } from './reducer' diff --git a/packages/core/redux/locs/actions.js b/packages/core/redux/locs/actions.js index 28794ac78..19c6f37b5 100644 --- a/packages/core/redux/locs/actions.js +++ b/packages/core/redux/locs/actions.js @@ -3,14 +3,14 @@ * Licensed under the AGPL Version 3 license. */ -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import type LOCManagerDAO from 'dao/LOCManagerDAO' -import { TX_FRONTEND_ERROR_CODES } from 'dao/AbstractContractDAO' -import LOCModel from 'models/LOCModel' -import LOCNoticeModel from 'models/notices/LOCNoticeModel' -import type TokenModel from 'models/tokens/TokenModel' -import { notify } from 'redux/notifier/actions' -import Amount from 'models/Amount' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import type LOCManagerDAO from '../../dao/LOCManagerDAO' +import { TX_FRONTEND_ERROR_CODES } from '../../dao/AbstractContractDAO' +import LOCModel from '../../models/LOCModel' +import LOCNoticeModel from '../../models/notices/LOCNoticeModel' +import type TokenModel from '../../models/tokens/TokenModel' +import { notify } from '../notifier/actions' +import Amount from '../../models/Amount' export const LOCS_LIST_FETCH = 'locs/LIST_FETCH' export const LOCS_LIST = 'locs/LIST' diff --git a/packages/core/redux/locs/actions.spec.js b/packages/core/redux/locs/actions.spec.js index 41c667b3c..88bbd9d9a 100644 --- a/packages/core/redux/locs/actions.spec.js +++ b/packages/core/redux/locs/actions.spec.js @@ -4,8 +4,8 @@ */ import { store } from 'specsInit' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import LOCModel from 'models/LOCModel' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import LOCModel from '../../models/LOCModel' import * as a from './actions' const loc1 = new LOCModel({ diff --git a/packages/core/redux/locs/selectors.js b/packages/core/redux/locs/selectors.js index 458cd39c6..e1b33de1d 100644 --- a/packages/core/redux/locs/selectors.js +++ b/packages/core/redux/locs/selectors.js @@ -4,7 +4,7 @@ */ import { createSelector } from 'reselect' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '../../models/tokens/TokenModel' import { getTokens } from '../tokens/selectors' export const getToken = (tokenId: string) => createSelector( diff --git a/packages/core/redux/mainWallet/actions.js b/packages/core/redux/mainWallet/actions.js index b2d40d3d7..5cdcda353 100644 --- a/packages/core/redux/mainWallet/actions.js +++ b/packages/core/redux/mainWallet/actions.js @@ -15,42 +15,40 @@ import { } from '@chronobank/login/network/BitcoinProvider' import { ethereumProvider } from '@chronobank/login/network/EthereumProvider' import { change, formValueSelector } from 'redux-form/immutable' -import { history } from 'redux/configureStore' +import { history } from '../configureStore' // @TODO: core import { nemProvider } from '@chronobank/login/network/NemProvider' import { wavesProvider } from '@chronobank/login/network/WavesProvider' import { DUCK_NETWORK } from '@chronobank/login/redux/network/actions' import { push } from 'react-router-redux' -import { EVENT_APPROVAL_TRANSFER, EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE, FETCH_NEW_BALANCE } from 'dao/AbstractTokenDAO' -import assetDonatorDAO from 'dao/AssetDonatorDAO' -import ethereumDAO, { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import Amount from 'models/Amount' -import ApprovalNoticeModel from 'models/notices/ApprovalNoticeModel' -import TransferNoticeModel from 'models/notices/TransferNoticeModel' -import BalanceModel from 'models/tokens/BalanceModel' -import TokenModel from 'models/tokens/TokenModel' -import validator from 'models/validator' -import AddressModel from 'models/wallet/AddressModel' -import AllowanceModel from 'models/wallet/AllowanceModel' -import TransactionsCollection, { TXS_PER_PAGE } from 'models/wallet/TransactionsCollection' -import { addMarketToken } from 'redux/market/action' -import { notify, notifyError } from 'redux/notifier/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { DUCK_TOKENS, subscribeOnTokens } from 'redux/tokens/actions' -import tokenService from 'services/TokenService' -import type TxModel from 'models/TxModel' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import { TX_DEPOSIT, TX_WITHDRAW_SHARES } from 'dao/AssetHolderDAO' -import { TX_APPROVE } from 'dao/ERC20DAO' -import OwnerCollection from 'models/wallet/OwnerCollection' -import OwnerModel from 'models/wallet/OwnerModel' -import { DUCK_MULTISIG_WALLET, MULTISIG_BALANCE, MULTISIG_FETCHED, MULTISIG_UPDATE } from 'redux/multisigWallet/actions' -import DerivedWalletModel from 'models/wallet/DerivedWalletModel' -import AddressesCollection from 'models/wallet/AddressesCollection' -import { getDeriveWalletsAddresses } from 'redux/wallet/selectors' -import MainWalletModel from 'models/wallet/MainWalletModel' -import { BLOCKCHAIN_NEM } from 'dao/NemDAO' -import { BLOCKCHAIN_WAVES } from 'dao/WavesDAO' -import { getMainWallet, getMultisigWallets } from 'redux/wallet/selectors/models' +import { EVENT_APPROVAL_TRANSFER, EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE, FETCH_NEW_BALANCE } from '../../dao/AbstractTokenDAO' +import assetDonatorDAO from '../../dao/AssetDonatorDAO' +import ethereumDAO, { BLOCKCHAIN_ETHEREUM } from '../../dao/EthereumDAO' +import Amount from '../../models/Amount' +import ApprovalNoticeModel from '../../models/notices/ApprovalNoticeModel' +import TransferNoticeModel from '../../models/notices/TransferNoticeModel' +import BalanceModel from '../../models/tokens/BalanceModel' +import TokenModel from '../../models/tokens/TokenModel' +import validator from '../../models/validator' +import AddressModel from '../../models/wallet/AddressModel' +import AllowanceModel from '../../models/wallet/AllowanceModel' +import TransactionsCollection, { TXS_PER_PAGE } from '../../models/wallet/TransactionsCollection' +import { addMarketToken } from '../market/action' +import { notify, notifyError } from '../notifier/actions' +import { DUCK_SESSION } from '../session/actions' +import { DUCK_TOKENS, subscribeOnTokens } from '../tokens/actions' +import tokenService from '../../services/TokenService' +import type TxModel from '../../models/TxModel' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import { TX_DEPOSIT, TX_WITHDRAW_SHARES } from '../../dao/AssetHolderDAO' +import { TX_APPROVE } from '../../dao/ERC20DAO' +import OwnerCollection from '../../models/wallet/OwnerCollection' +import OwnerModel from '../../models/wallet/OwnerModel' +import { DUCK_MULTISIG_WALLET, MULTISIG_BALANCE, MULTISIG_FETCHED, MULTISIG_UPDATE } from '../multisigWallet/actions' +import DerivedWalletModel from '../../models/wallet/DerivedWalletModel' +import AddressesCollection from '../../models/wallet/AddressesCollection' +import { getDeriveWalletsAddresses } from '../wallet/selectors' +import MainWalletModel from '../../models/wallet/MainWalletModel' +import { BLOCKCHAIN_NEM } from '../../dao/NemDAO' export const DUCK_MAIN_WALLET = 'mainWallet' export const FORM_ADD_NEW_WALLET = 'FormAddNewWallet' diff --git a/packages/core/redux/mainWallet/reducer.js b/packages/core/redux/mainWallet/reducer.js index c8af0bd48..23e459b26 100644 --- a/packages/core/redux/mainWallet/reducer.js +++ b/packages/core/redux/mainWallet/reducer.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import MainWalletModel from 'models/wallet/MainWalletModel' +import MainWalletModel from '../../models/wallet/MainWalletModel' import { REHYDRATE } from 'redux-persist' -import TransactionsCollection from 'models/wallet/TransactionsCollection' +import TransactionsCollection from '../../models/wallet/TransactionsCollection' import * as a from './actions' const initialState = new MainWalletModel() diff --git a/packages/core/redux/mainWallet/reducer.spec.js b/packages/core/redux/mainWallet/reducer.spec.js index c8ca2615a..77ababf90 100644 --- a/packages/core/redux/mainWallet/reducer.spec.js +++ b/packages/core/redux/mainWallet/reducer.spec.js @@ -6,10 +6,10 @@ import BigNumber from 'bignumber.js' import Immutable from 'immutable' import { accounts } from 'specsInit' -import MainWallet from 'models/wallet/MainWalletModel' -import TransactionsCollection from 'models/wallet/TransactionsCollection' -import TokenModel from 'models/tokens/TokenModel' -import TxModel from 'models/TxModel' +import MainWallet from '../../models/wallet/MainWalletModel' +import TransactionsCollection from '../../models/wallet/TransactionsCollection' +import TokenModel from '../../models/tokens/TokenModel' +import TxModel from '../../models/TxModel' import * as a from './actions' import reducer from './reducer' diff --git a/packages/core/redux/mainWallet/selectors.js b/packages/core/redux/mainWallet/selectors.js index 13804fdf8..e14b22928 100644 --- a/packages/core/redux/mainWallet/selectors.js +++ b/packages/core/redux/mainWallet/selectors.js @@ -3,16 +3,16 @@ * Licensed under the AGPL Version 3 license. */ -export { getWallet } from 'redux/mainWallet/selectors/models' -export { getWalletAddress } from 'redux/mainWallet/selectors/models' -export { getDeposit } from 'redux/mainWallet/selectors/models' -export { filteredBalances } from 'redux/mainWallet/selectors/balances' -export { filteredBalancesAndTokens } from 'redux/mainWallet/selectors/balances' -export { tokensAndAmountsSelector } from 'redux/mainWallet/selectors/tokens' -export { balanceSelector } from 'redux/mainWallet/selectors/balances' -export { tokensCountBalanceSelector } from 'redux/mainWallet/selectors/tokens' -export { tokensCountSelector } from 'redux/mainWallet/selectors/tokens' -export { mainWalletBalanceSelector } from 'redux/mainWallet/selectors/balances' -export { mainWalletTokenBalanceSelector } from 'redux/mainWallet/selectors/balances' -export { tokensCountBalanceAndPriceSelector } from 'redux/mainWallet/selectors/balances' -export { mainWalletTokenBalanceWithPriceSelector } from 'redux/mainWallet/selectors/balances' +export { getWallet } from './selectors/models' +export { getWalletAddress } from './selectors/models' +export { getDeposit } from './selectors/models' +export { filteredBalances } from './selectors/balances' +export { filteredBalancesAndTokens } from './selectors/balances' +export { tokensAndAmountsSelector } from './selectors/tokens' +export { balanceSelector } from './selectors/balances' +export { tokensCountBalanceSelector } from './selectors/tokens' +export { tokensCountSelector } from './selectors/tokens' +export { mainWalletBalanceSelector } from './selectors/balances' +export { mainWalletTokenBalanceSelector } from './selectors/balances' +export { tokensCountBalanceAndPriceSelector } from './selectors/balances' +export { mainWalletTokenBalanceWithPriceSelector } from './selectors/balances' diff --git a/src/redux/mainWallet/selectors/balances.js b/packages/core/redux/mainWallet/selectors/balances.js similarity index 96% rename from src/redux/mainWallet/selectors/balances.js rename to packages/core/redux/mainWallet/selectors/balances.js index 0f0547fc5..3cd7028ea 100644 --- a/src/redux/mainWallet/selectors/balances.js +++ b/packages/core/redux/mainWallet/selectors/balances.js @@ -4,8 +4,8 @@ */ import { createSelector } from 'reselect' -import { getTokens } from 'redux/tokens/selectors' -import { selectMainWalletBalancesListStore, selectMarketPricesListStore, selectMarketPricesSelectedCurrencyStore } from 'redux/wallet/selectors' +import { getTokens } from '../../tokens/selectors' +import { selectMainWalletBalancesListStore, selectMarketPricesListStore, selectMarketPricesSelectedCurrencyStore } from '../../wallet/selectors' import { tokensAndAmountsSelector, tokensCountBalanceSelector } from './tokens' export const filteredBalances = (blockchain: string, filterSymbol) => createSelector( diff --git a/src/redux/mainWallet/selectors/models.js b/packages/core/redux/mainWallet/selectors/models.js similarity index 73% rename from src/redux/mainWallet/selectors/models.js rename to packages/core/redux/mainWallet/selectors/models.js index f89b08d2f..3aac85427 100644 --- a/src/redux/mainWallet/selectors/models.js +++ b/packages/core/redux/mainWallet/selectors/models.js @@ -4,10 +4,10 @@ */ import { createSelector } from 'reselect' -import AddressModel from 'models/wallet/AddressModel' -import { getAssetsFromAssetHolder } from 'redux/assetsHolder/selectors' -import { getTokens } from 'redux/tokens/selectors' -import { DUCK_MAIN_WALLET } from 'redux/mainWallet/actions' +import AddressModel from '../../../models/wallet/AddressModel' +import { getAssetsFromAssetHolder } from '../../assetsHolder/selectors' +import { getTokens } from '../../tokens/selectors' +import { DUCK_MAIN_WALLET } from '../actions' export const getWallet = (state) => { return state.get(DUCK_MAIN_WALLET).addresses() diff --git a/src/redux/mainWallet/selectors/tokens.js b/packages/core/redux/mainWallet/selectors/tokens.js similarity index 100% rename from src/redux/mainWallet/selectors/tokens.js rename to packages/core/redux/mainWallet/selectors/tokens.js diff --git a/packages/core/redux/market/action.js b/packages/core/redux/market/action.js index e52702efd..b9fabf250 100644 --- a/packages/core/redux/market/action.js +++ b/packages/core/redux/market/action.js @@ -3,18 +3,18 @@ * Licensed under the AGPL Version 3 license. */ -import MarketSocket from 'market/MarketSocket' +import MarketSocket from '../../market/MarketSocket' import get from 'lodash/get' import axios from 'axios' export const DUCK_MARKET = 'market' -export const MARKET_INIT = 'market/INIT' -export const MARKET_ADD_TOKEN = 'market/ADD_TOKEN' -export const MARKET_UPDATE_PRICES = 'market/UPDATE_PRICES' -export const MARKET_UPDATE_RATES = 'market/UPDATE_RATES' -export const LAST_MARKET_UPDATE = 'market/UPDATE_LAST_MARKET' -export const SET_SELECTED_COIN = 'market/SET_SELECTED_COIN' +export const MARKET_INIT = '../../market/INIT' +export const MARKET_ADD_TOKEN = '../../market/ADD_TOKEN' +export const MARKET_UPDATE_PRICES = '../../market/UPDATE_PRICES' +export const MARKET_UPDATE_RATES = '../../market/UPDATE_RATES' +export const LAST_MARKET_UPDATE = '../../market/UPDATE_LAST_MARKET' +export const SET_SELECTED_COIN = '../../market/SET_SELECTED_COIN' const MARKET_REQUEST_DELAY = 30000 export let timerId diff --git a/src/redux/market/selectors.js b/packages/core/redux/market/selectors.js similarity index 100% rename from src/redux/market/selectors.js rename to packages/core/redux/market/selectors.js diff --git a/packages/core/redux/multisigWallet/actions.js b/packages/core/redux/multisigWallet/actions.js index 072f9bd5b..fbe2d5403 100644 --- a/packages/core/redux/multisigWallet/actions.js +++ b/packages/core/redux/multisigWallet/actions.js @@ -3,33 +3,33 @@ * Licensed under the AGPL Version 3 license. */ -import { EVENT_NEW_TRANSFER, FETCH_NEW_BALANCE } from 'dao/AbstractTokenDAO' -import contractsManagerDAO from 'dao/ContractsManagerDAO' +import { EVENT_NEW_TRANSFER, FETCH_NEW_BALANCE } from '../../dao/AbstractTokenDAO' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' import BigNumber from 'bignumber.js' import { ethereumProvider } from '@chronobank/login/network/EthereumProvider' -import type MultisigWalletDAO from 'dao/MultisigWalletDAO' -import { EE_MS_WALLET_ADDED, EE_MS_WALLET_REMOVED, EE_MS_WALLETS_COUNT } from 'dao/MultisigWalletsManagerDAO' +import type MultisigWalletDAO from '../../dao/MultisigWalletDAO' +import { EE_MS_WALLET_ADDED, EE_MS_WALLET_REMOVED, EE_MS_WALLETS_COUNT } from '../../dao/MultisigWalletsManagerDAO' import { change } from 'redux-form/immutable' -import Amount from 'models/Amount' -import WalletNoticeModel, { statuses } from 'models/notices/WalletNoticeModel' -import BalanceModel from 'models/tokens/BalanceModel' -import TokenModel from 'models/tokens/TokenModel' -import TxExecModel from 'models/TxExecModel' -import type TxModel from 'models/TxModel' -import type MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import type MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel' -import OwnerModel from 'models/wallet/OwnerModel' -import { notify, notifyError } from 'redux/notifier/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { DUCK_TOKENS, subscribeOnTokens } from 'redux/tokens/actions' +import Amount from '../../models/Amount' +import WalletNoticeModel, { statuses } from '../../models/notices/WalletNoticeModel' +import BalanceModel from '../../models/tokens/BalanceModel' +import TokenModel from '../../models/tokens/TokenModel' +import TxExecModel from '../../models/TxExecModel' +import type TxModel from '../../models/TxModel' +import type MultisigWalletModel from '../../models/wallet/MultisigWalletModel' +import type MultisigWalletPendingTxModel from '../../models/wallet/MultisigWalletPendingTxModel' +import OwnerModel from '../../models/wallet/OwnerModel' +import { notify, notifyError } from '../notifier/actions' +import { DUCK_SESSION } from '../session/actions' +import { DUCK_TOKENS, subscribeOnTokens } from '../tokens/actions' import { bccProvider, BLOCKCHAIN_BITCOIN, - BLOCKCHAIN_BITCOIN_CASH, BLOCKCHAIN_BITCOIN_GOLD, + BLOCKCHAIN_BITCOIN_CASH, BLOCKCHAIN_LITECOIN, - btcProvider, btgProvider, + btcProvider, ltcProvider, } from '@chronobank/login/network/BitcoinProvider' import multisigWalletService, { @@ -42,12 +42,12 @@ import multisigWalletService, { EE_REQUIREMENT_CHANGED, EE_REVOKE, EE_SINGLE_TRANSACTION, -} from 'services/MultisigWalletService' -import tokenService from 'services/TokenService' -import { ETH, getTokensBalancesAndWatch, getTransactionsForWallet } from 'redux/mainWallet/actions' -import { getTokens } from 'redux/tokens/selectors' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import { getMultisigWallets } from 'redux/wallet/selectors/models' +} from '../../services/MultisigWalletService' +import tokenService from '../../services/TokenService' +import { ETH, getTokensBalancesAndWatch, getTransactionsForWallet } from '../mainWallet/actions' +import { getTokens } from '../tokens/selectors' +import { BLOCKCHAIN_ETHEREUM } from '../../dao/EthereumDAO' +import { getMultisigWallets } from '../wallet/selectors/models' export const FORM_2FA_WALLET = 'Form2FAWallet' export const FORM_2FA_STEPS = [ diff --git a/packages/core/redux/multisigWallet/actions.spec.js b/packages/core/redux/multisigWallet/actions.spec.js index 4183779b3..a950492e5 100644 --- a/packages/core/redux/multisigWallet/actions.spec.js +++ b/packages/core/redux/multisigWallet/actions.spec.js @@ -4,14 +4,14 @@ */ import BigNumber from 'bignumber.js' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import ethereumDAO from 'dao/EthereumDAO' -import type MultisigWalletDAO from 'dao/MultisigWalletDAO' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import ethereumDAO from '../../dao/EthereumDAO' +import type MultisigWalletDAO from '../../dao/MultisigWalletDAO' import Immutable from 'immutable' -import MultisigTransactionModel from 'models/wallet/MultisigTransactionModel' -import MultisigWalletCollection from 'models/wallet/MultisigWalletCollection' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import multisigWalletService from 'services/MultisigWalletService' +import MultisigTransactionModel from '../../models/wallet/MultisigTransactionModel' +import MultisigWalletCollection from '../../models/wallet/MultisigWalletCollection' +import MultisigWalletModel from '../../models/wallet/MultisigWalletModel' +import multisigWalletService from '../../services/MultisigWalletService' import { accounts, mockStore } from 'specsInit' import * as a from './actions' diff --git a/packages/core/redux/multisigWallet/reducer.js b/packages/core/redux/multisigWallet/reducer.js index 6ada88f8c..5be07ce7b 100644 --- a/packages/core/redux/multisigWallet/reducer.js +++ b/packages/core/redux/multisigWallet/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import MultisigWalletCollection from 'models/wallet/MultisigWalletCollection' +import MultisigWalletCollection from '../../models/wallet/MultisigWalletCollection' import { REHYDRATE } from 'redux-persist' import * as a from './actions' diff --git a/packages/core/redux/multisigWallet/reducer.spec.js b/packages/core/redux/multisigWallet/reducer.spec.js index a2e239f64..de2c4fc0d 100644 --- a/packages/core/redux/multisigWallet/reducer.spec.js +++ b/packages/core/redux/multisigWallet/reducer.spec.js @@ -4,9 +4,9 @@ */ import Immutable from 'immutable' -import TokenModel from 'models/tokens/TokenModel' -import MultisigWalletCollection from 'models/wallet/MultisigWalletCollection' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' +import TokenModel from '../../models/tokens/TokenModel' +import MultisigWalletCollection from '../../models/wallet/MultisigWalletCollection' +import MultisigWalletModel from '../../models/wallet/MultisigWalletModel' import * as a from './actions' import reducer from './reducer' diff --git a/packages/core/redux/multisigWallet/selectors.js b/packages/core/redux/multisigWallet/selectors.js index 1a6f48afa..65888483d 100644 --- a/packages/core/redux/multisigWallet/selectors.js +++ b/packages/core/redux/multisigWallet/selectors.js @@ -3,15 +3,15 @@ * Licensed under the AGPL Version 3 license. */ -export { getWallets } from 'redux/multisigWallet/selectors/models' -export { getWallet } from 'redux/multisigWallet/selectors/models' -export { filteredBalancesAndTokens } from 'redux/multisigWallet/selectors/balances' -export { multisigTokensAndAmountsSelector } from 'redux/multisigWallet/selectors/tokens' -export { balanceCalculator } from 'redux/multisigWallet/selectors/balances' -export { multisigBalanceSelector } from 'redux/multisigWallet/selectors/balances' -export { tokensCountBalanceSelector } from 'redux/multisigWallet/selectors/balances' -export { multisigTokensCountSelector } from 'redux/multisigWallet/selectors/tokens' -export { multisigWalletBalanceSelector } from 'redux/multisigWallet/selectors/balances' -export { multisigWalletTokenBalanceSelector } from 'redux/multisigWallet/selectors/balances' -export { tokensCountBalanceAndPriceSelector } from 'redux/multisigWallet/selectors/balances' -export { multisigWalletTokenBalanceWithPriceSelector } from 'redux/multisigWallet/selectors/balances' +export { getWallets } from './selectors/models' +export { getWallet } from './selectors/models' +export { filteredBalancesAndTokens } from './selectors/balances' +export { multisigTokensAndAmountsSelector } from './selectors/tokens' +export { balanceCalculator } from './selectors/balances' +export { multisigBalanceSelector } from './selectors/balances' +export { tokensCountBalanceSelector } from './selectors/balances' +export { multisigTokensCountSelector } from './selectors/tokens' +export { multisigWalletBalanceSelector } from './selectors/balances' +export { multisigWalletTokenBalanceSelector } from './selectors/balances' +export { tokensCountBalanceAndPriceSelector } from './selectors/balances' +export { multisigWalletTokenBalanceWithPriceSelector } from './selectors/balances' diff --git a/src/redux/multisigWallet/selectors/balances.js b/packages/core/redux/multisigWallet/selectors/balances.js similarity index 97% rename from src/redux/multisigWallet/selectors/balances.js rename to packages/core/redux/multisigWallet/selectors/balances.js index 01a192b13..68b564090 100644 --- a/src/redux/multisigWallet/selectors/balances.js +++ b/packages/core/redux/multisigWallet/selectors/balances.js @@ -4,8 +4,8 @@ */ import { createSelector } from 'reselect' -import { getTokens } from 'redux/tokens/selectors' -import { selectMarketPricesListStore, selectMarketPricesSelectedCurrencyStore } from 'redux/wallet/selectors' +import { getTokens } from '../../tokens/selectors' +import { selectMarketPricesListStore, selectMarketPricesSelectedCurrencyStore } from '../../wallet/selectors' import { multisigTokensAndAmountsSelector } from './tokens' import { getWallet } from './models' diff --git a/src/redux/multisigWallet/selectors/models.js b/packages/core/redux/multisigWallet/selectors/models.js similarity index 73% rename from src/redux/multisigWallet/selectors/models.js rename to packages/core/redux/multisigWallet/selectors/models.js index 7c9a22332..e276563fb 100644 --- a/src/redux/multisigWallet/selectors/models.js +++ b/packages/core/redux/multisigWallet/selectors/models.js @@ -4,8 +4,8 @@ */ import { createSelector } from 'reselect' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import { DUCK_MULTISIG_WALLET } from 'redux/multisigWallet/actions' +import MultisigWalletModel from '../../../models/wallet/MultisigWalletModel' +import { DUCK_MULTISIG_WALLET } from '../actions' export const getWallets = (state) => { return state.get(DUCK_MULTISIG_WALLET) diff --git a/src/redux/multisigWallet/selectors/tokens.js b/packages/core/redux/multisigWallet/selectors/tokens.js similarity index 100% rename from src/redux/multisigWallet/selectors/tokens.js rename to packages/core/redux/multisigWallet/selectors/tokens.js diff --git a/packages/core/redux/notifier/actions.js b/packages/core/redux/notifier/actions.js index 47f2393ad..f6feffd5e 100644 --- a/packages/core/redux/notifier/actions.js +++ b/packages/core/redux/notifier/actions.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import type AbstractNoticeModel from 'models/notices/AbstractNoticeModel' -import ErrorNoticeModel from 'models/notices/ErrorNoticeModel' +import type AbstractNoticeModel from '../../models/notices/AbstractNoticeModel' +import ErrorNoticeModel from '../../models/notices/ErrorNoticeModel' export const NOTIFIER_MESSAGE = 'notifier/MESSAGE' export const NOTIFIER_READ = 'notifier/READ' diff --git a/packages/core/redux/notifier/actions.spec.js b/packages/core/redux/notifier/actions.spec.js index 140699519..164df51c7 100644 --- a/packages/core/redux/notifier/actions.spec.js +++ b/packages/core/redux/notifier/actions.spec.js @@ -4,8 +4,8 @@ */ import { store, accounts } from 'specsInit' -import CBEModel from 'models/CBEModel' -import CBENoticeModel from 'models/notices/CBENoticeModel' +import CBEModel from '../../models/CBEModel' +import CBENoticeModel from '../../models/notices/CBENoticeModel' import * as a from './actions' const cbe = new CBEModel({ address: accounts[1] }) diff --git a/packages/core/redux/notifier/reducer.spec.js b/packages/core/redux/notifier/reducer.spec.js index 1e0194a55..3d5d89ded 100644 --- a/packages/core/redux/notifier/reducer.spec.js +++ b/packages/core/redux/notifier/reducer.spec.js @@ -5,8 +5,8 @@ import Immutable from 'immutable' import { accounts } from 'specsInit' -import CBEModel from 'models/CBEModel' -import CBENoticeModel from 'models/notices/CBENoticeModel' +import CBEModel from '../../models/CBEModel' +import CBENoticeModel from '../../models/notices/CBENoticeModel' import * as a from './actions' import reducer from './reducer' diff --git a/packages/core/redux/operations/actions.js b/packages/core/redux/operations/actions.js index 4d7ce657e..64a0f0434 100644 --- a/packages/core/redux/operations/actions.js +++ b/packages/core/redux/operations/actions.js @@ -4,11 +4,11 @@ */ import Immutable from 'immutable' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import type AbstractFetchingModel from 'models/AbstractFetchingModel' -import OperationModel from 'models/OperationModel' -import OperationNoticeModel from 'models/notices/OperationNoticeModel' -import { notify } from 'redux/notifier/actions' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import type AbstractFetchingModel from '../../models/AbstractFetchingModel' +import OperationModel from '../../models/OperationModel' +import OperationNoticeModel from '../../models/notices/OperationNoticeModel' +import { notify } from '../notifier/actions' export const OPERATIONS_FETCH = 'operations/FETCH' export const OPERATIONS_LIST = 'operations/LIST' diff --git a/packages/core/redux/operations/actions.spec.js b/packages/core/redux/operations/actions.spec.js index ca58f8823..29f77b6b8 100644 --- a/packages/core/redux/operations/actions.spec.js +++ b/packages/core/redux/operations/actions.spec.js @@ -4,12 +4,12 @@ */ import { store, accounts } from 'specsInit' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import { TX_SET_REQUIRED_SIGNS } from 'dao/UserManagerDAO' -import type AbstractFetchingModel from 'models/AbstractFetchingModel' -import CBEModel from 'models/CBEModel' -import type OperationModel from 'models/OperationModel' -import type OperationNoticeModel from 'models/notices/OperationNoticeModel' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import { TX_SET_REQUIRED_SIGNS } from '../../dao/UserManagerDAO' +import type AbstractFetchingModel from '../../models/AbstractFetchingModel' +import CBEModel from '../../models/CBEModel' +import type OperationModel from '../../models/OperationModel' +import type OperationNoticeModel from '../../models/notices/OperationNoticeModel' import * as a from './actions' const cbe = new CBEModel({ address: accounts[ 1 ], name: 'Jacob' }) diff --git a/packages/core/redux/operations/reducer.js b/packages/core/redux/operations/reducer.js index 40fb76a65..f4e18707b 100644 --- a/packages/core/redux/operations/reducer.js +++ b/packages/core/redux/operations/reducer.js @@ -4,7 +4,7 @@ */ import Immutable from 'immutable' -import { OPERATIONS_PER_PAGE } from 'dao/PendingManagerDAO' +import { OPERATIONS_PER_PAGE } from '../../dao/PendingManagerDAO' import * as a from './actions' const initialState = { diff --git a/packages/core/redux/operations/reducer.spec.js b/packages/core/redux/operations/reducer.spec.js index 39cc93eee..bab868051 100644 --- a/packages/core/redux/operations/reducer.spec.js +++ b/packages/core/redux/operations/reducer.spec.js @@ -4,9 +4,9 @@ */ import Immutable from 'immutable' -import OperationModel from 'models/OperationModel' -import * as a from 'redux/operations/actions' -import reducer from 'redux/operations/reducer' +import OperationModel from '../../models/OperationModel' +import * as a from './actions' +import reducer from './reducer' let list = new Immutable.Map() const operation = new OperationModel({ id: 'hash', isConfirmed: true, remained: 1 }) diff --git a/packages/core/redux/rewards/actions.js b/packages/core/redux/rewards/actions.js index a290537f1..b25edfc14 100644 --- a/packages/core/redux/rewards/actions.js +++ b/packages/core/redux/rewards/actions.js @@ -3,13 +3,13 @@ * Licensed under the AGPL Version 3 license. */ -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import { EE_REWARDS_ERROR, EE_REWARDS_PERIOD, EE_REWARDS_PERIOD_CLOSED } from 'dao/RewardsDAO' -import AssetModel from 'models/assetHolder/AssetModel' -import RewardsPeriodModel from 'models/rewards/RewardsPeriodModel' -import TokenModel from 'models/tokens/TokenModel' -import { DUCK_SESSION } from 'redux/session/actions' -import { subscribeOnTokens } from 'redux/tokens/actions' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import { EE_REWARDS_ERROR, EE_REWARDS_PERIOD, EE_REWARDS_PERIOD_CLOSED } from '../../dao/RewardsDAO' +import AssetModel from '../../models/assetHolder/AssetModel' +import RewardsPeriodModel from '../../models/rewards/RewardsPeriodModel' +import TokenModel from '../../models/tokens/TokenModel' +import { DUCK_SESSION } from '../session/actions' +import { subscribeOnTokens } from '../tokens/actions' export const DUCK_REWARDS = 'rewards' diff --git a/packages/core/redux/rewards/reducer.js b/packages/core/redux/rewards/reducer.js index 54a908857..5c4ecfa6a 100644 --- a/packages/core/redux/rewards/reducer.js +++ b/packages/core/redux/rewards/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import RewardsCollection from 'models/rewards/RewardsCollection' +import RewardsCollection from '../../models/rewards/RewardsCollection' import * as a from './actions' const initialState = new RewardsCollection() diff --git a/packages/core/redux/session/actions.js b/packages/core/redux/session/actions.js index 5dbfb8870..dc1378af1 100644 --- a/packages/core/redux/session/actions.js +++ b/packages/core/redux/session/actions.js @@ -6,14 +6,14 @@ import networkService from '@chronobank/login/network/NetworkService' import { LOCAL_ID, LOCAL_PROVIDER_ID, NETWORK_MAIN_ID } from '@chronobank/login/network/settings' import { DUCK_NETWORK } from '@chronobank/login/redux/network/actions' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import ProfileModel from 'models/ProfileModel' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import ProfileModel from '../../models/ProfileModel' import { push, replace } from 'react-router-redux' -import { watchStopMarket } from 'redux/market/action' -import { removeWatchersUserMonitor } from 'redux/ui/actions' -import { cbeWatcher, watcher } from 'redux/watcher/actions' -import ls from 'utils/LocalStorage' -import { notify } from 'redux/notifier/actions' +import ls from '../../utils/LocalStorage' +import { cbeWatcher, watcher } from '../watcher/actions' +import { removeWatchersUserMonitor } from '../ui/actions' +import { watchStopMarket } from '../market/action' +import { notify } from '../notifier/actions' export const DUCK_SESSION = 'session' diff --git a/packages/core/redux/session/actions.spec.js b/packages/core/redux/session/actions.spec.js index bd1105315..85c534fc1 100644 --- a/packages/core/redux/session/actions.spec.js +++ b/packages/core/redux/session/actions.spec.js @@ -6,15 +6,15 @@ import Immutable from 'immutable' import { LOCAL_ID } from '@chronobank/login/network/settings' import networkService from '@chronobank/login/network/NetworkService' -import VotingCollection from 'models/voting/VotingCollection' -import { DUCK_VOTING } from 'redux/voting/actions' +import VotingCollection from '../../models/voting/VotingCollection' +import { DUCK_VOTING } from '../voting/actions' import { DUCK_NETWORK } from '@chronobank/login/redux/network/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' -import ProfileModel from 'models/ProfileModel' -import MainWalletModel from 'models/wallet/MainWalletModel' +import { DUCK_TOKENS } from '../tokens/actions' +import TokensCollection from '../../models/tokens/TokensCollection' +import ProfileModel from '../../models/ProfileModel' +import MainWalletModel from '../../models/wallet/MainWalletModel' import { accounts, mockStore } from 'specsInit' -import ls from 'utils/LocalStorage' +import ls from '../../utils/LocalStorage' import * as a from './actions' let store diff --git a/packages/core/redux/session/saveAccountMiddleWare.js b/packages/core/redux/session/saveAccountMiddleWare.js index c9e8c8df6..ab551e31d 100644 --- a/packages/core/redux/session/saveAccountMiddleWare.js +++ b/packages/core/redux/session/saveAccountMiddleWare.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import { SESSION_CREATE } from 'redux/session/actions' -import SessionStorage from 'utils/SessionStorage' +import { SESSION_CREATE } from './actions' +import SessionStorage from '../../utils/SessionStorage' const saveAccountMiddleWare = (/*store*/) => (next) => (action) => { if (SESSION_CREATE === action.type && action.account) { diff --git a/packages/core/redux/session/selectors.js b/packages/core/redux/session/selectors.js index 11a0ff02c..75bf44f67 100644 --- a/packages/core/redux/session/selectors.js +++ b/packages/core/redux/session/selectors.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -export { getAccount } from 'redux/session/selectors/models' -export { getProfile } from 'redux/session/selectors/models' -export { getGasSliderCollection } from 'redux/session/selectors/models' -export { getGasPriceMultiplier } from 'redux/session/selectors/session' -export { getAddressesList }from 'redux/session/selectors/session' -export { getBlockchainAddressesList } from 'redux/session/selectors/session' +export { getAccount } from './selectors/models' +export { getProfile } from './selectors/models' +export { getGasSliderCollection } from './selectors/models' +export { getGasPriceMultiplier } from './selectors/session' +export { getAddressesList }from './selectors/session' +export { getBlockchainAddressesList } from './selectors/session' diff --git a/src/redux/session/selectors/models.js b/packages/core/redux/session/selectors/models.js similarity index 89% rename from src/redux/session/selectors/models.js rename to packages/core/redux/session/selectors/models.js index 6792fcf62..781efccb6 100644 --- a/src/redux/session/selectors/models.js +++ b/packages/core/redux/session/selectors/models.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_SESSION } from '../actions' export const getAccount = (state) => { const { account } = state.get(DUCK_SESSION) diff --git a/src/redux/session/selectors/session.js b/packages/core/redux/session/selectors/session.js similarity index 79% rename from src/redux/session/selectors/session.js rename to packages/core/redux/session/selectors/session.js index ad6ac9867..44d15c343 100644 --- a/src/redux/session/selectors/session.js +++ b/packages/core/redux/session/selectors/session.js @@ -4,10 +4,10 @@ */ import { createSelector } from 'reselect' -import { PROFILE_PANEL_TOKENS } from 'redux/session/actions' -import { selectMainWalletAddressesListStore } from 'redux/wallet/selectors' -import { getGasSliderCollection } from 'redux/session/selectors/models' -import AddressModel from 'models/wallet/AddressModel' +import { PROFILE_PANEL_TOKENS } from '../actions' +import { selectMainWalletAddressesListStore } from '../../wallet/selectors' +import { getGasSliderCollection } from './models' +import AddressModel from '../../../models/wallet/AddressModel' export const getGasPriceMultiplier = (blockchain) => createSelector([getGasSliderCollection], (gasSliderCollection) => { diff --git a/packages/core/redux/settings/erc20/tokens/actions.js b/packages/core/redux/settings/erc20/tokens/actions.js index 5ee435b12..f9801a586 100644 --- a/packages/core/redux/settings/erc20/tokens/actions.js +++ b/packages/core/redux/settings/erc20/tokens/actions.js @@ -3,21 +3,21 @@ * Licensed under the AGPL Version 3 license. */ -import contractsManagerDAO from 'dao/ContractsManagerDAO' +import contractsManagerDAO from '../../../../dao/ContractsManagerDAO' import { change } from 'redux-form/immutable' import BigNumber from 'bignumber.js' -import { address } from 'models/validator' -import type AbstractFetchingModel from 'models/AbstractFetchingModel' -import type TokenNoticeModel from 'models/notices/TokenNoticeModel' -import type TokenModel from 'models/tokens/TokenModel' -import { I18n } from 'platform/i18n' -import { notify } from 'redux/notifier/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { TOKENS_FETCHED, TOKENS_REMOVE, TOKENS_UPDATE } from 'redux/tokens/actions' -import tokenService from 'services/TokenService' -import Amount from 'models/Amount' -import ERC20DAO from 'dao/ERC20DAO' -import { FORM_CBE_TOKEN } from 'components/dialogs/CBETokenDialog/CBETokenDialog' +import { address } from '../../../../models/validator' +import type AbstractFetchingModel from '../../../../models/AbstractFetchingModel' +import type TokenNoticeModel from '../../../../models/notices/TokenNoticeModel' +import type TokenModel from '../../../../models/tokens/TokenModel' +import { I18n } from '../../../../utils/i18n' +import { notify } from '../../../notifier/actions' +import { DUCK_SESSION } from '../../../session/actions' +import { TOKENS_FETCHED, TOKENS_REMOVE, TOKENS_UPDATE } from '../../../tokens/actions' +import tokenService from '../../../../services/TokenService' +import Amount from '../../../../models/Amount' +import ERC20DAO from '../../../../dao/ERC20DAO' +import { FORM_CBE_TOKEN } from '../../../../components/dialogs/CBETokenDialog/CBETokenDialog' export const DUCK_SETTINGS_ERC20_TOKENS = 'settingsERC20Tokens' diff --git a/packages/core/redux/settings/erc20/tokens/actions.spec.js b/packages/core/redux/settings/erc20/tokens/actions.spec.js index a769b1ee3..dc1f74f5a 100644 --- a/packages/core/redux/settings/erc20/tokens/actions.spec.js +++ b/packages/core/redux/settings/erc20/tokens/actions.spec.js @@ -4,12 +4,12 @@ */ import { store } from 'specsInit' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import fakeCoinDAO from 'dao/FakeCoinDAO' -import type AbstractFetchingModel from 'models/AbstractFetchingModel' -import TokenModel from 'models/tokens/TokenModel' -import type TokenNoticeModel from 'models/notices/TokenNoticeModel' -import { TIME } from 'redux/mainWallet/actions' +import contractsManagerDAO from '../../../../dao/ContractsManagerDAO' +import fakeCoinDAO from '../../../../dao/FakeCoinDAO' +import type AbstractFetchingModel from '../../../../models/AbstractFetchingModel' +import TokenModel from '../../../../models/tokens/TokenModel' +import type TokenNoticeModel from '../../../../models/notices/TokenNoticeModel' +import { TIME } from '../../../mainWallet/actions' import * as a from './actions' let token: TokenModel | AbstractFetchingModel diff --git a/packages/core/redux/settings/erc20/tokens/reducer.js b/packages/core/redux/settings/erc20/tokens/reducer.js index b3bca89c5..dd381ac47 100644 --- a/packages/core/redux/settings/erc20/tokens/reducer.js +++ b/packages/core/redux/settings/erc20/tokens/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '../../../../models/tokens/TokenModel' import * as a from './actions' const initialState = { diff --git a/packages/core/redux/settings/erc20/tokens/reducer.spec.js b/packages/core/redux/settings/erc20/tokens/reducer.spec.js index fef010fa9..7c36d97da 100644 --- a/packages/core/redux/settings/erc20/tokens/reducer.spec.js +++ b/packages/core/redux/settings/erc20/tokens/reducer.spec.js @@ -4,7 +4,7 @@ */ import Immutable from 'immutable' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '../../../../models/tokens/TokenModel' import * as a from './actions' import reducer from './reducer' diff --git a/packages/core/redux/settings/erc20/tokens/selectors.js b/packages/core/redux/settings/erc20/tokens/selectors.js index 914a71ff5..08cb2a3b1 100644 --- a/packages/core/redux/settings/erc20/tokens/selectors.js +++ b/packages/core/redux/settings/erc20/tokens/selectors.js @@ -4,8 +4,8 @@ */ import { createSelector } from 'reselect' -import { getTokens } from 'redux/tokens/selectors' -import TokenModel from 'models/tokens/TokenModel' +import { getTokens } from '../../../tokens/selectors' +import TokenModel from '../../../../models/tokens/TokenModel' export const getChronobankTokens = () => createSelector([ getTokens ], (tokens) => { diff --git a/packages/core/redux/settings/user/cbe/actions.js b/packages/core/redux/settings/user/cbe/actions.js index 8a0dec1de..4ed9e7eb0 100644 --- a/packages/core/redux/settings/user/cbe/actions.js +++ b/packages/core/redux/settings/user/cbe/actions.js @@ -4,11 +4,11 @@ */ import { change } from 'redux-form/immutable' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import type AbstractFetchingModel from 'models/AbstractFetchingModel' -import type CBEModel from 'models/CBEModel' -import type CBENoticeModel from 'models/notices/CBENoticeModel' -import { notify } from 'redux/notifier/actions' +import contractsManagerDAO from '../../../../dao/ContractsManagerDAO' +import type AbstractFetchingModel from '../../../../models/AbstractFetchingModel' +import type CBEModel from '../../../../models/CBEModel' +import type CBENoticeModel from '../../../../models/notices/CBENoticeModel' +import { notify } from '../../../notifier/actions' export const CBE_LIST = 'settings/CBE_LIST' export const CBE_FORM = 'settings/CBE_FORM' diff --git a/packages/core/redux/settings/user/cbe/actions.spec.js b/packages/core/redux/settings/user/cbe/actions.spec.js index fedeaa836..751aa372c 100644 --- a/packages/core/redux/settings/user/cbe/actions.spec.js +++ b/packages/core/redux/settings/user/cbe/actions.spec.js @@ -5,12 +5,12 @@ import Immutable from 'immutable' import { store, accounts } from 'specsInit' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import CBEModel from 'models/CBEModel' -import CBENoticeModel from 'models/notices/CBENoticeModel' -import ProfileModel from 'models/ProfileModel' -import * as notifier from 'redux/notifier/actions' -import * as validator from 'models/validator' +import contractsManagerDAO from '../../../../dao/ContractsManagerDAO' +import CBEModel from '../../../../models/CBEModel' +import CBENoticeModel from '../../../../models/notices/CBENoticeModel' +import ProfileModel from '../../../../models/ProfileModel' +import * as notifier from '../../../notifier/actions' +import * as validator from '../../../../models/validator' import * as a from './actions' const user = new ProfileModel({ name: 'testUser' }) diff --git a/packages/core/redux/settings/user/cbe/reducer.js b/packages/core/redux/settings/user/cbe/reducer.js index 22caac45f..0b13fcc67 100644 --- a/packages/core/redux/settings/user/cbe/reducer.js +++ b/packages/core/redux/settings/user/cbe/reducer.js @@ -4,7 +4,7 @@ */ import Immutable from 'immutable' -import CBEModel from 'models/CBEModel' +import CBEModel from '../../../../models/CBEModel' import * as a from './actions' const initialState = { diff --git a/packages/core/redux/settings/user/cbe/reducer.spec.js b/packages/core/redux/settings/user/cbe/reducer.spec.js index 81e454e2f..e0a5f7856 100644 --- a/packages/core/redux/settings/user/cbe/reducer.spec.js +++ b/packages/core/redux/settings/user/cbe/reducer.spec.js @@ -4,7 +4,7 @@ */ import Immutable from 'immutable' -import CBEModel from 'models/CBEModel' +import CBEModel from '../../../../models/CBEModel' import * as a from './actions' import reducer from './reducer' diff --git a/packages/core/redux/tokens/actions.js b/packages/core/redux/tokens/actions.js index dd522779d..21a21db49 100644 --- a/packages/core/redux/tokens/actions.js +++ b/packages/core/redux/tokens/actions.js @@ -16,23 +16,22 @@ import { import { nemProvider } from '@chronobank/login/network/NemProvider' import { wavesProvider } from '@chronobank/login/network/WavesProvider' import BigNumber from 'bignumber.js' -import { bccDAO, btcDAO, btgDAO, ltcDAO } from 'dao/BitcoinDAO' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import ERC20ManagerDAO, { EVENT_ERC20_TOKENS_COUNT, EVENT_NEW_ERC20_TOKEN } from 'dao/ERC20ManagerDAO' -import ethereumDAO, { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import NemDAO, { NEM_DECIMALS, NEM_XEM_NAME, NEM_XEM_SYMBOL } from 'dao/NemDAO' -import WavesDAO, { WAVES_DECIMALS, WAVES_WAVES_NAME, WAVES_WAVES_SYMBOL } from 'dao/WavesDAO' -import TokenModel from 'models/tokens/TokenModel' -import TransferErrorNoticeModel from 'models/notices/TransferErrorNoticeModel' -import type TransferExecModel from 'models/TransferExecModel' -import TransferError, { TRANSFER_CANCELLED, TRANSFER_UNKNOWN } from 'models/TransferError' -import tokenService, { EVENT_NEW_TOKEN } from 'services/TokenService' -import { notify } from 'redux/notifier/actions' -import { showConfirmTransferModal } from 'redux/ui/actions' -import { EVENT_NEW_BLOCK } from 'dao/AbstractContractDAO' -import Amount from 'models/Amount' -import { ETH } from 'redux/mainWallet/actions' -import { EVENT_UPDATE_LAST_BLOCK } from 'dao/AbstractTokenDAO' +import { bccDAO, btcDAO, btgDAO, ltcDAO } from '../../dao/BitcoinDAO' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import ERC20ManagerDAO, { EVENT_ERC20_TOKENS_COUNT, EVENT_NEW_ERC20_TOKEN } from '../../dao/ERC20ManagerDAO' +import ethereumDAO, { BLOCKCHAIN_ETHEREUM } from '../../dao/EthereumDAO' +import NemDAO, { NEM_DECIMALS, NEM_XEM_NAME, NEM_XEM_SYMBOL } from '../../dao/NemDAO' +import TokenModel from '../../models/tokens/TokenModel' +import TransferErrorNoticeModel from '../../models/notices/TransferErrorNoticeModel' +import type TransferExecModel from '../../models/TransferExecModel' +import TransferError, { TRANSFER_CANCELLED, TRANSFER_UNKNOWN } from '../../models/TransferError' +import tokenService, { EVENT_NEW_TOKEN } from '../../services/TokenService' +import { notify } from '../notifier/actions' +import { showConfirmTransferModal } from '../ui/actions' +import { EVENT_NEW_BLOCK } from '../../dao/AbstractContractDAO' +import Amount from '../../models/Amount' +import { ETH } from '../mainWallet/actions' +import { EVENT_UPDATE_LAST_BLOCK } from '../../dao/AbstractTokenDAO' export const DUCK_TOKENS = 'tokens' export const TOKENS_UPDATE = 'tokens/update' diff --git a/packages/core/redux/tokens/reducer.js b/packages/core/redux/tokens/reducer.js index cb9ca7bed..ced051f01 100644 --- a/packages/core/redux/tokens/reducer.js +++ b/packages/core/redux/tokens/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import TokensCollection from 'models/tokens/TokensCollection' +import TokensCollection from '../../models/tokens/TokensCollection' import * as a from './actions' const initialState = new TokensCollection() diff --git a/packages/core/redux/tokens/selectors.js b/packages/core/redux/tokens/selectors.js index b4176add7..1d4a7520f 100644 --- a/packages/core/redux/tokens/selectors.js +++ b/packages/core/redux/tokens/selectors.js @@ -5,9 +5,9 @@ import { createSelector } from 'reselect' import { BLOCKCHAIN_BITCOIN, BLOCKCHAIN_BITCOIN_CASH, BLOCKCHAIN_BITCOIN_GOLD, BLOCKCHAIN_LITECOIN } from '@chronobank/login/network/BitcoinProvider' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import { BLOCKCHAIN_NEM } from 'dao/NemDAO' -import { BLOCKCHAIN_WAVES } from 'dao/WavesDAO' +import { BLOCKCHAIN_ETHEREUM } from '../../dao/EthereumDAO' +import { BLOCKCHAIN_NEM } from '../../dao/NemDAO' +import { BLOCKCHAIN_WAVES } from '../../dao/WavesDAO' import { DUCK_TOKENS } from './actions' import { BCC, BTC, BTG, ETH, LTC, XEM, WAVES } from '../mainWallet/actions' diff --git a/packages/core/redux/voting/actions.js b/packages/core/redux/voting/actions.js index aef602733..4653d1fb3 100644 --- a/packages/core/redux/voting/actions.js +++ b/packages/core/redux/voting/actions.js @@ -3,16 +3,16 @@ * Licensed under the AGPL Version 3 license. */ -import { DUCK_SESSION } from 'redux/session/actions' -import votingService from 'services/VotingService' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import { EVENT_POLL_ACTIVATED, EVENT_POLL_ENDED, EVENT_POLL_VOTED } from 'dao/PollEmitterDAO' -import type PollNoticeModel from 'models/notices/PollNoticeModel' -import { IS_ACTIVATED, IS_CREATED, IS_ENDED, IS_REMOVED, IS_UPDATED, IS_VOTED } from 'models/notices/PollNoticeModel' -import PollDetailsModel from 'models/PollDetailsModel' -import PollModel from 'models/PollModel' -import { notify } from 'redux/notifier/actions' -import { EVENT_POLL_CREATED, EVENT_POLL_REMOVED } from 'dao/VotingManagerDAO' +import { DUCK_SESSION } from '../session/actions' +import votingService from '../../services/VotingService' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import { EVENT_POLL_ACTIVATED, EVENT_POLL_ENDED, EVENT_POLL_VOTED } from '../../dao/PollEmitterDAO' +import type PollNoticeModel from '../../models/notices/PollNoticeModel' +import { IS_ACTIVATED, IS_CREATED, IS_ENDED, IS_REMOVED, IS_UPDATED, IS_VOTED } from '../../models/notices/PollNoticeModel' +import PollDetailsModel from '../../models/PollDetailsModel' +import PollModel from '../../models/PollModel' +import { notify } from '../notifier/actions' +import { EVENT_POLL_CREATED, EVENT_POLL_REMOVED } from '../../dao/VotingManagerDAO' export const POLLS_VOTE_LIMIT = 'voting/POLLS_LIMIT' export const POLLS_LOAD = 'voting/POLLS_LOAD' diff --git a/packages/core/redux/voting/actions.spec.js b/packages/core/redux/voting/actions.spec.js index bd12ab85c..fb812feec 100644 --- a/packages/core/redux/voting/actions.spec.js +++ b/packages/core/redux/voting/actions.spec.js @@ -3,21 +3,21 @@ * Licensed under the AGPL Version 3 license. */ -import PollEmitter from 'dao/PollEmitterDAO' -import tokenService from 'services/TokenService' +import PollEmitter from '../../dao/PollEmitterDAO' +import tokenService from '../../services/TokenService' import BigNumber from 'bignumber.js' import moment from 'moment' import Immutable from 'immutable' import { accounts, mockStore } from 'specsInit' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import PollModel from 'models/PollModel' -import PollNoticeModel, { IS_ACTIVATED, IS_CREATED, IS_ENDED, IS_REMOVED, IS_VOTED, } from 'models/notices/PollNoticeModel' -import ERC20ManagerDAO, { EVENT_NEW_ERC20_TOKEN } from 'dao/ERC20ManagerDAO' -import TokenModel from 'models/tokens/TokenModel' -import TokensCollection from 'models/tokens/TokensCollection' -import { DUCK_SESSION } from 'redux/session/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import VotingMainModel from 'models/voting/VotingMainModel' +import contractsManagerDAO from '../../dao/ContractsManagerDAO' +import PollModel from '../../models/PollModel' +import PollNoticeModel, { IS_ACTIVATED, IS_CREATED, IS_ENDED, IS_REMOVED, IS_VOTED, } from '../../models/notices/PollNoticeModel' +import ERC20ManagerDAO, { EVENT_NEW_ERC20_TOKEN } from '../../dao/ERC20ManagerDAO' +import TokenModel from '../../models/tokens/TokenModel' +import TokensCollection from '../../models/tokens/TokensCollection' +import { DUCK_SESSION } from '../session/actions' +import { DUCK_TOKENS } from '../tokens/actions' +import VotingMainModel from '../../models/voting/VotingMainModel' import { activatePoll, createPoll, diff --git a/packages/core/redux/voting/reducer.js b/packages/core/redux/voting/reducer.js index 5e8cf5111..d54ce89a5 100644 --- a/packages/core/redux/voting/reducer.js +++ b/packages/core/redux/voting/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import VotingMainModel from 'models/voting/VotingMainModel' +import VotingMainModel from '../../models/voting/VotingMainModel' import { POLLS_CREATE, POLLS_LIST, POLLS_LOAD, POLLS_REMOVE, POLLS_UPDATE, POLLS_VOTE_LIMIT, } from './actions' diff --git a/packages/core/redux/voting/reducer.spec.js b/packages/core/redux/voting/reducer.spec.js index 5483fba51..5337fe2ca 100644 --- a/packages/core/redux/voting/reducer.spec.js +++ b/packages/core/redux/voting/reducer.spec.js @@ -4,10 +4,10 @@ */ import BigNumber from 'bignumber.js' -import VotingCollection from 'models/voting/VotingCollection' -import PollModel from 'models/PollModel' -import PollDetailsModel from 'models/PollDetailsModel' -import VotingMainModel from 'models/voting/VotingMainModel' +import VotingCollection from '../../models/voting/VotingCollection' +import PollModel from '../../models/PollModel' +import PollDetailsModel from '../../models/PollDetailsModel' +import VotingMainModel from '../../models/voting/VotingMainModel' import * as a from './actions' import reducer from './reducer' diff --git a/packages/core/redux/wallet/actions.js b/packages/core/redux/wallet/actions.js index c1a2d58a3..0826c70b6 100644 --- a/packages/core/redux/wallet/actions.js +++ b/packages/core/redux/wallet/actions.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import { DUCK_MAIN_WALLET } from 'redux/mainWallet/actions' -import { DUCK_MULTISIG_WALLET, selectMultisigWallet } from 'redux/multisigWallet/actions' -import { modalsOpen } from 'redux/modals/actions' +import { DUCK_MAIN_WALLET } from '../mainWallet/actions' +import { DUCK_MULTISIG_WALLET, selectMultisigWallet } from '../multisigWallet/actions' +import { modalsOpen } from '@chronobank/core-dependencies/redux/modals/actions' import { getMainWallet, getMultisigWallets } from './selectors/models' export const DUCK_WALLET = 'wallet' diff --git a/packages/core/redux/wallet/selectors.js b/packages/core/redux/wallet/selectors.js index 84d5e369c..a573d3fe0 100644 --- a/packages/core/redux/wallet/selectors.js +++ b/packages/core/redux/wallet/selectors.js @@ -4,13 +4,13 @@ */ import { createSelector } from 'reselect' -import { ETH } from 'redux/mainWallet/actions' -import { DUCK_MULTISIG_WALLET } from 'redux/multisigWallet/actions' -import MainWalletModel from 'models/wallet/MainWalletModel' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import { getAccount } from 'redux/session/selectors' -import DerivedWalletModel from 'models/wallet/DerivedWalletModel' -import Amount from 'models/Amount' +import { ETH } from '../mainWallet/actions' +import { DUCK_MULTISIG_WALLET } from '../multisigWallet/actions' +import MainWalletModel from '../../models/wallet/MainWalletModel' +import MultisigWalletModel from '../../models/wallet/MultisigWalletModel' +import { getAccount } from '../session/selectors' +import DerivedWalletModel from '../../models/wallet/DerivedWalletModel' +import Amount from '../../models/Amount' import { getMainWallet, getMultisigWallets, @@ -21,15 +21,15 @@ import { selectTokensStore, } from './selectors/models' -export { getMainWallet } from 'redux/wallet/selectors/models' -export { getMultisigWallets } from 'redux/wallet/selectors/models' -export { getMainWalletBalance } from 'redux/wallet/selectors/models' -export { getCurrentWalletBalance } from 'redux/wallet/selectors/models' -export { selectMainWalletBalancesListStore } from 'redux/wallet/selectors/models' -export { selectTokensStore } from 'redux/wallet/selectors/models' -export { selectMainWalletAddressesListStore } from 'redux/wallet/selectors/models' -export { selectMarketPricesListStore } from 'redux/wallet/selectors/models' -export { selectMarketPricesSelectedCurrencyStore } from 'redux/wallet/selectors/models' +export { getMainWallet } from './selectors/models' +export { getMultisigWallets } from './selectors/models' +export { getMainWalletBalance } from './selectors/models' +export { getCurrentWalletBalance } from './selectors/models' +export { selectMainWalletBalancesListStore } from './selectors/models' +export { selectTokensStore } from './selectors/models' +export { selectMainWalletAddressesListStore } from './selectors/models' +export { selectMarketPricesListStore } from './selectors/models' +export { selectMarketPricesSelectedCurrencyStore } from './selectors/models' /** * WALLET SECTIONS diff --git a/src/redux/wallet/selectors/models.js b/packages/core/redux/wallet/selectors/models.js similarity index 82% rename from src/redux/wallet/selectors/models.js rename to packages/core/redux/wallet/selectors/models.js index 1c179493c..883cb0456 100644 --- a/src/redux/wallet/selectors/models.js +++ b/packages/core/redux/wallet/selectors/models.js @@ -4,11 +4,11 @@ */ import { createSelector } from 'reselect' -import { DUCK_MAIN_WALLET } from 'redux/mainWallet/actions' -import { DUCK_MULTISIG_WALLET } from 'redux/multisigWallet/actions' -import { DUCK_MARKET } from 'redux/market/action' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import { getCurrentWallet } from 'redux/wallet/actions' +import { DUCK_MAIN_WALLET } from '../../mainWallet/actions' +import { DUCK_MULTISIG_WALLET } from '../../multisigWallet/actions' +import { DUCK_MARKET } from '../../market/action' +import { DUCK_TOKENS } from '../../tokens/actions' +import { getCurrentWallet } from '../actions' /** * SIMPLE SELECTORS diff --git a/src/redux/wallet/types.js b/packages/core/redux/wallet/types.js similarity index 100% rename from src/redux/wallet/types.js rename to packages/core/redux/wallet/types.js diff --git a/packages/core/redux/watcher/actions.js b/packages/core/redux/watcher/actions.js index 1d42bf50c..192482a82 100644 --- a/packages/core/redux/watcher/actions.js +++ b/packages/core/redux/watcher/actions.js @@ -4,23 +4,23 @@ */ import { watchInitMonitor } from '@chronobank/login/redux/monitor/actions' -import AbstractContractDAO, { TX_FRONTEND_ERROR_CODES } from 'dao/AbstractContractDAO' -import TransactionErrorNoticeModel from 'models/notices/TransactionErrorNoticeModel' -import TxError from 'models/TxError' -import type TxExecModel from 'models/TxExecModel' -import { watchInitTokens, watchPlatformManager } from 'redux/assetsManager/actions' -import { watchInitLOC } from 'redux/locs/actions' -import { initMainWallet } from 'redux/mainWallet/actions' -import { watchInitMarket } from 'redux/market/action' -import { notify } from 'redux/notifier/actions' -import { watchInitOperations } from 'redux/operations/actions' -import { watchInitERC20Tokens } from 'redux/settings/erc20/tokens/actions' -import { watchInitCBE } from 'redux/settings/user/cbe/actions' -import { initTokens } from 'redux/tokens/actions' -import { showConfirmTxModal, watchInitUserMonitor } from 'redux/ui/actions' -import { watchInitPolls } from 'redux/voting/actions' -import { watchInitProfile } from 'redux/session/actions' -import { initMultisigWalletManager } from 'redux/multisigWallet/actions' +import AbstractContractDAO, { TX_FRONTEND_ERROR_CODES } from '../../dao/AbstractContractDAO' +import TransactionErrorNoticeModel from '../../models/notices/TransactionErrorNoticeModel' +import TxError from '../../models/TxError' +import type TxExecModel from '../../models/TxExecModel' +import { watchInitTokens, watchPlatformManager } from '../assetsManager/actions' +import { watchInitLOC } from '../locs/actions' +import { initMainWallet } from '../mainWallet/actions' +import { watchInitMarket } from '../market/action' +import { notify } from '../notifier/actions' +import { watchInitOperations } from '../operations/actions' +import { watchInitERC20Tokens } from '../settings/erc20/tokens/actions' +import { watchInitCBE } from '../settings/user/cbe/actions' +import { initTokens } from '../tokens/actions' +import { showConfirmTxModal, watchInitUserMonitor } from '../ui/actions' +import { watchInitPolls } from '../voting/actions' +import { watchInitProfile } from '../session/actions' +import { initMultisigWalletManager } from '../multisigWallet/actions' export const DUCK_WATCHER = 'watcher' diff --git a/packages/core/redux/watcher/reducer.js b/packages/core/redux/watcher/reducer.js index 956697849..04e170a90 100644 --- a/packages/core/redux/watcher/reducer.js +++ b/packages/core/redux/watcher/reducer.js @@ -4,7 +4,7 @@ */ import Immutable from 'immutable' -import TxExecModel from 'models/TxExecModel' +import TxExecModel from '../../models/TxExecModel' import * as a from './actions' export const initialState = { diff --git a/packages/core/redux/watcher/reducer.spec.js b/packages/core/redux/watcher/reducer.spec.js index 8b77b31ef..be9edbbf4 100644 --- a/packages/core/redux/watcher/reducer.spec.js +++ b/packages/core/redux/watcher/reducer.spec.js @@ -4,7 +4,7 @@ */ import Immutable from 'immutable' -import TxExecModel from 'models/TxExecModel' +import TxExecModel from '../../models/TxExecModel' import * as a from './actions' import reducer, { initialState } from './reducer' diff --git a/packages/core/services/ExchangeService.js b/packages/core/services/ExchangeService.js index 7ecd461a4..9d3c1cde9 100644 --- a/packages/core/services/ExchangeService.js +++ b/packages/core/services/ExchangeService.js @@ -3,13 +3,13 @@ * Licensed under the AGPL Version 3 license. */ -import tokenService from 'services/TokenService' -import TokenModel from 'models/tokens/TokenModel' -import ExchangeManagerDAO from 'dao/ExchangeManagerDAO' -import { ExchangeDAO } from 'dao/ExchangeDAO' +import tokenService from './TokenService' +import TokenModel from '../models/tokens/TokenModel' +import ExchangeManagerDAO from '../dao/ExchangeManagerDAO' +import { ExchangeDAO } from '../dao/ExchangeDAO' import EventEmitter from 'events' -import { EVENT_NEW_TRANSFER } from 'dao/AbstractTokenDAO' -import TxModel from 'models/TxModel' +import { EVENT_NEW_TRANSFER } from '../dao/AbstractTokenDAO' +import TxModel from '../models/TxModel' class ExchangeService extends EventEmitter { diff --git a/packages/core/services/MultisigWalletService.js b/packages/core/services/MultisigWalletService.js index b51af1d08..3bcb87272 100644 --- a/packages/core/services/MultisigWalletService.js +++ b/packages/core/services/MultisigWalletService.js @@ -3,13 +3,13 @@ * Licensed under the AGPL Version 3 license. */ -import OwnerModel from 'models/wallet/OwnerModel' -import MultisigWalletDAO from 'dao/MultisigWalletDAO' +import OwnerModel from '../models/wallet/OwnerModel' +import MultisigWalletDAO from '../dao/MultisigWalletDAO' import EventEmitter from 'events' -import type MultisigTransactionModel from 'models/wallet/MultisigTransactionModel' -import type MultisigWalletModel from 'models/wallet/MultisigWalletModel' +import type MultisigTransactionModel from '../models/wallet/MultisigTransactionModel' +import type MultisigWalletModel from '../models/wallet/MultisigWalletModel' import resultCodes from 'chronobank-smart-contracts/common/errors' -import MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel' +import MultisigWalletPendingTxModel from '../models/wallet/MultisigWalletPendingTxModel' export const EE_CONFIRMATION = 'Confirmation' export const EE_REVOKE = 'Revoke' diff --git a/packages/core/services/TokenService.js b/packages/core/services/TokenService.js index a2be0a317..1307170ee 100644 --- a/packages/core/services/TokenService.js +++ b/packages/core/services/TokenService.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import ERC20DAO from 'dao/ERC20DAO' +import ERC20DAO from '../dao/ERC20DAO' import EventEmitter from 'events' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '../models/tokens/TokenModel' export const EVENT_NEW_TOKEN = 'newToken' export const EVENT_TOKENS_FETCHED = 'tokensFetched' diff --git a/packages/core/services/VotingService.js b/packages/core/services/VotingService.js index 945d8f549..26338796c 100644 --- a/packages/core/services/VotingService.js +++ b/packages/core/services/VotingService.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import PollEmitter, { EVENT_POLL_ACTIVATED, EVENT_POLL_ENDED, EVENT_POLL_VOTED } from 'dao/PollEmitterDAO' +import PollEmitter, { EVENT_POLL_ACTIVATED, EVENT_POLL_ENDED, EVENT_POLL_VOTED } from '../dao/PollEmitterDAO' import EventEmitter from 'events' -import VotingManagerDAO, { EVENT_POLL_CREATED, EVENT_POLL_REMOVED } from 'dao/VotingManagerDAO' +import VotingManagerDAO, { EVENT_POLL_CREATED, EVENT_POLL_REMOVED } from '../dao/VotingManagerDAO' class VotingService extends EventEmitter { diff --git a/src/utils/CustomSerializer.js b/src/utils/CustomSerializer.js index d5e6a060d..93e42ee4a 100644 --- a/src/utils/CustomSerializer.js +++ b/src/utils/CustomSerializer.js @@ -4,7 +4,7 @@ */ import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' class CustomSerializer { test (val) { diff --git a/src/utils/IPFS.js b/src/utils/IPFS.js index c7fc3b552..b259272f3 100644 --- a/src/utils/IPFS.js +++ b/src/utils/IPFS.js @@ -5,8 +5,8 @@ import ipfsAPI from 'ipfs-api' import promisify from 'promisify-node-callback' -import FileCollection from 'models/FileSelect/FileCollection' -import FileModel, { fileConfig } from 'models/FileSelect/FileModel' +import FileCollection from '@chronobank/core/models/FileSelect/FileCollection' +import FileModel, { fileConfig } from '@chronobank/core/models/FileSelect/FileModel' import { imageValidator, FileReader } from 'platform/imageValidator' const DEFAULT_CONFIG = { From b6b0cb7883754ec3c63b7000ae6905111e17ca76 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 7 Jun 2018 13:08:42 +0300 Subject: [PATCH 09/30] Use Core in @chronobank/login --- packages/login/network/NetworkService.js | 4 ++-- packages/login/redux/network/actions.spec.js | 4 ++-- packages/login/settings.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/login/network/NetworkService.js b/packages/login/network/NetworkService.js index 88eff5627..4233eeb65 100644 --- a/packages/login/network/NetworkService.js +++ b/packages/login/network/NetworkService.js @@ -3,8 +3,8 @@ * Licensed under the AGPL Version 3 license. */ -import AbstractContractDAO from 'dao/AbstractContractDAO' -import contractsManagerDAO from 'dao/ContractsManagerDAO' +import AbstractContractDAO from '@chronobank/core/dao/AbstractContractDAO' +import contractsManagerDAO from '@chronobank/core/dao/ContractsManagerDAO' import EventEmitter from 'events' import Web3 from 'web3' import { diff --git a/packages/login/redux/network/actions.spec.js b/packages/login/redux/network/actions.spec.js index f233a356b..353c5ca4e 100644 --- a/packages/login/redux/network/actions.spec.js +++ b/packages/login/redux/network/actions.spec.js @@ -3,9 +3,9 @@ * Licensed under the AGPL Version 3 license. */ -import AbstractContractDAO from 'dao/AbstractContractDAO' +import AbstractContractDAO from '@chronobank/core/dao/AbstractContractDAO' import Immutable from 'immutable' -import { createSession, destroySession, SESSION_CREATE, SESSION_DESTROY } from 'redux/session/actions' +import { createSession, destroySession, SESSION_CREATE, SESSION_DESTROY } from '@chronobank/core/redux/session/actions' import { accounts, mockStore, store } from 'specsInit' import Web3 from 'web3' import metaMaskResolver from '../../network/metaMaskResolver' diff --git a/packages/login/settings.js b/packages/login/settings.js index 63fa7c5b4..03c17912c 100644 --- a/packages/login/settings.js +++ b/packages/login/settings.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import web3Converter from 'utils/Web3Converter' +import web3Converter from '@chronobank/core/utils/Web3Converter' export const utils = { web3Converter, From 34263e11bd4822cd58e90b0731cfab68e88d72cb Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 7 Jun 2018 13:07:49 +0300 Subject: [PATCH 10/30] Use utils/router instead of react-router-redux Refers to: CM-58 --- packages/core/redux/mainWallet/actions.js | 2 +- packages/core/redux/session/actions.js | 2 +- packages/core/utils/router.js | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 packages/core/utils/router.js diff --git a/packages/core/redux/mainWallet/actions.js b/packages/core/redux/mainWallet/actions.js index 5cdcda353..66fbd900a 100644 --- a/packages/core/redux/mainWallet/actions.js +++ b/packages/core/redux/mainWallet/actions.js @@ -17,9 +17,9 @@ import { ethereumProvider } from '@chronobank/login/network/EthereumProvider' import { change, formValueSelector } from 'redux-form/immutable' import { history } from '../configureStore' // @TODO: core import { nemProvider } from '@chronobank/login/network/NemProvider' +import { push } from '../../utils/router' import { wavesProvider } from '@chronobank/login/network/WavesProvider' import { DUCK_NETWORK } from '@chronobank/login/redux/network/actions' -import { push } from 'react-router-redux' import { EVENT_APPROVAL_TRANSFER, EVENT_NEW_TRANSFER, EVENT_UPDATE_BALANCE, FETCH_NEW_BALANCE } from '../../dao/AbstractTokenDAO' import assetDonatorDAO from '../../dao/AssetDonatorDAO' import ethereumDAO, { BLOCKCHAIN_ETHEREUM } from '../../dao/EthereumDAO' diff --git a/packages/core/redux/session/actions.js b/packages/core/redux/session/actions.js index dc1378af1..96d9f301f 100644 --- a/packages/core/redux/session/actions.js +++ b/packages/core/redux/session/actions.js @@ -8,7 +8,7 @@ import { LOCAL_ID, LOCAL_PROVIDER_ID, NETWORK_MAIN_ID } from '@chronobank/login/ import { DUCK_NETWORK } from '@chronobank/login/redux/network/actions' import contractsManagerDAO from '../../dao/ContractsManagerDAO' import ProfileModel from '../../models/ProfileModel' -import { push, replace } from 'react-router-redux' +import { push, replace } from '../../utils/router' import ls from '../../utils/LocalStorage' import { cbeWatcher, watcher } from '../watcher/actions' import { removeWatchersUserMonitor } from '../ui/actions' diff --git a/packages/core/utils/router.js b/packages/core/utils/router.js new file mode 100644 index 000000000..e7731c652 --- /dev/null +++ b/packages/core/utils/router.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export * from '@chronobank/core-dependencies/router' \ No newline at end of file From 5f4c318fcf4ba93f6d799ecfa47fd4bfb09fffff Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 7 Jun 2018 13:18:38 +0300 Subject: [PATCH 11/30] Use utils/router instead of history Refets to: CM-58 --- packages/core/redux/mainWallet/actions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/redux/mainWallet/actions.js b/packages/core/redux/mainWallet/actions.js index 66fbd900a..ab8990ab4 100644 --- a/packages/core/redux/mainWallet/actions.js +++ b/packages/core/redux/mainWallet/actions.js @@ -15,7 +15,7 @@ import { } from '@chronobank/login/network/BitcoinProvider' import { ethereumProvider } from '@chronobank/login/network/EthereumProvider' import { change, formValueSelector } from 'redux-form/immutable' -import { history } from '../configureStore' // @TODO: core +import { pop } from '../../utils/router' // @TODO: core import { nemProvider } from '@chronobank/login/network/NemProvider' import { push } from '../../utils/router' import { wavesProvider } from '@chronobank/login/network/WavesProvider' @@ -98,7 +98,7 @@ export const goBackForAddWalletsForm = () => (dispatch, getState) => { dispatch(change(FORM_ADD_NEW_WALLET, 'blockchain', null)) return } - history.goBack() + pop() } const handleToken = (token: TokenModel) => async (dispatch, getState) => { From 9d425af5ec95755a271b0e9d0e409b5e4e8bdf9c Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 7 Jun 2018 13:28:07 +0300 Subject: [PATCH 12/30] Add dependencies Refers to: CM-52 --- packages/core/package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/core/package.json b/packages/core/package.json index 47f94511a..fd0e6399c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,10 @@ { "name": "@chronobank/core", "version": "0.8.1", + "dependencies": { + "chronobank-smart-contracts": "1.1.47", + "eth-crypto": "^1.2.0" + }, "peerDependencies": { "@chronobank/core-dependencies": "*" } From e878e6ca03a7efad6a36eafd4f462a1e1a95e2ba Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 7 Jun 2018 13:33:15 +0300 Subject: [PATCH 13/30] Rename action.js to actions.js --- packages/core/redux/mainWallet/actions.js | 2 +- packages/core/redux/market/action.spec.js | 2 +- packages/core/redux/market/{action.js => actions.js} | 0 packages/core/redux/market/reducer.js | 2 +- packages/core/redux/market/reducer.spec.js | 2 +- packages/core/redux/market/selectors.js | 2 +- packages/core/redux/session/actions.js | 2 +- packages/core/redux/wallet/selectors/models.js | 2 +- packages/core/redux/watcher/actions.js | 2 +- src/components/common/TokenValue/TokenValue.js | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename packages/core/redux/market/{action.js => actions.js} (100%) diff --git a/packages/core/redux/mainWallet/actions.js b/packages/core/redux/mainWallet/actions.js index ab8990ab4..d7f6d855e 100644 --- a/packages/core/redux/mainWallet/actions.js +++ b/packages/core/redux/mainWallet/actions.js @@ -32,7 +32,7 @@ import validator from '../../models/validator' import AddressModel from '../../models/wallet/AddressModel' import AllowanceModel from '../../models/wallet/AllowanceModel' import TransactionsCollection, { TXS_PER_PAGE } from '../../models/wallet/TransactionsCollection' -import { addMarketToken } from '../market/action' +import { addMarketToken } from '../market/actions' import { notify, notifyError } from '../notifier/actions' import { DUCK_SESSION } from '../session/actions' import { DUCK_TOKENS, subscribeOnTokens } from '../tokens/actions' diff --git a/packages/core/redux/market/action.spec.js b/packages/core/redux/market/action.spec.js index 0cb71d287..898d26c9e 100644 --- a/packages/core/redux/market/action.spec.js +++ b/packages/core/redux/market/action.spec.js @@ -5,7 +5,7 @@ import Immutable from 'immutable' import { mockStore } from 'specsInit' -import * as a from './action' +import * as a from './actions' let store diff --git a/packages/core/redux/market/action.js b/packages/core/redux/market/actions.js similarity index 100% rename from packages/core/redux/market/action.js rename to packages/core/redux/market/actions.js diff --git a/packages/core/redux/market/reducer.js b/packages/core/redux/market/reducer.js index f37deceb9..b7ebd2606 100644 --- a/packages/core/redux/market/reducer.js +++ b/packages/core/redux/market/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as actions from './action' +import * as actions from './actions' export const initialState = { isInited: false, diff --git a/packages/core/redux/market/reducer.spec.js b/packages/core/redux/market/reducer.spec.js index e16f1b781..84455795e 100644 --- a/packages/core/redux/market/reducer.spec.js +++ b/packages/core/redux/market/reducer.spec.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as a from './action' +import * as a from './actions' import reducer from './reducer' describe('Market reducer', () => { diff --git a/packages/core/redux/market/selectors.js b/packages/core/redux/market/selectors.js index 2a54f3cb5..5668ff614 100644 --- a/packages/core/redux/market/selectors.js +++ b/packages/core/redux/market/selectors.js @@ -2,7 +2,7 @@ * Copyright 2017–2018, LaborX PTY * Licensed under the AGPL Version 3 license. */ -import { DUCK_MARKET } from './action' +import { DUCK_MARKET } from './actions' export const getMarket = (state) => { return state.get(DUCK_MARKET) diff --git a/packages/core/redux/session/actions.js b/packages/core/redux/session/actions.js index 96d9f301f..2b05aa3c0 100644 --- a/packages/core/redux/session/actions.js +++ b/packages/core/redux/session/actions.js @@ -12,7 +12,7 @@ import { push, replace } from '../../utils/router' import ls from '../../utils/LocalStorage' import { cbeWatcher, watcher } from '../watcher/actions' import { removeWatchersUserMonitor } from '../ui/actions' -import { watchStopMarket } from '../market/action' +import { watchStopMarket } from '../market/actions' import { notify } from '../notifier/actions' export const DUCK_SESSION = 'session' diff --git a/packages/core/redux/wallet/selectors/models.js b/packages/core/redux/wallet/selectors/models.js index 883cb0456..aaa26d4e1 100644 --- a/packages/core/redux/wallet/selectors/models.js +++ b/packages/core/redux/wallet/selectors/models.js @@ -6,7 +6,7 @@ import { createSelector } from 'reselect' import { DUCK_MAIN_WALLET } from '../../mainWallet/actions' import { DUCK_MULTISIG_WALLET } from '../../multisigWallet/actions' -import { DUCK_MARKET } from '../../market/action' +import { DUCK_MARKET } from '../../market/actions' import { DUCK_TOKENS } from '../../tokens/actions' import { getCurrentWallet } from '../actions' diff --git a/packages/core/redux/watcher/actions.js b/packages/core/redux/watcher/actions.js index 192482a82..fb61d0c55 100644 --- a/packages/core/redux/watcher/actions.js +++ b/packages/core/redux/watcher/actions.js @@ -11,7 +11,7 @@ import type TxExecModel from '../../models/TxExecModel' import { watchInitTokens, watchPlatformManager } from '../assetsManager/actions' import { watchInitLOC } from '../locs/actions' import { initMainWallet } from '../mainWallet/actions' -import { watchInitMarket } from '../market/action' +import { watchInitMarket } from '../market/actions' import { notify } from '../notifier/actions' import { watchInitOperations } from '../operations/actions' import { watchInitERC20Tokens } from '../settings/erc20/tokens/actions' diff --git a/src/components/common/TokenValue/TokenValue.js b/src/components/common/TokenValue/TokenValue.js index 07b0e641d..1726baa73 100644 --- a/src/components/common/TokenValue/TokenValue.js +++ b/src/components/common/TokenValue/TokenValue.js @@ -11,7 +11,7 @@ import TokensCollection from 'models/tokens/TokensCollection' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { DUCK_MARKET } from 'redux/market/action' +import { DUCK_MARKET } from 'redux/market/actions' import { DUCK_TOKENS } from 'redux/tokens/actions' import { integerWithDelimiter } from 'utils/formatter' From 40b28fd33a9f9347d82a25e8312a8790a14a2b00 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 7 Jun 2018 13:57:36 +0300 Subject: [PATCH 14/30] Fix FORM_CBE_TOKEN import --- packages/core/redux/settings/erc20/tokens/actions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/redux/settings/erc20/tokens/actions.js b/packages/core/redux/settings/erc20/tokens/actions.js index f9801a586..5c10dfee8 100644 --- a/packages/core/redux/settings/erc20/tokens/actions.js +++ b/packages/core/redux/settings/erc20/tokens/actions.js @@ -17,7 +17,7 @@ import { TOKENS_FETCHED, TOKENS_REMOVE, TOKENS_UPDATE } from '../../../tokens/ac import tokenService from '../../../../services/TokenService' import Amount from '../../../../models/Amount' import ERC20DAO from '../../../../dao/ERC20DAO' -import { FORM_CBE_TOKEN } from '../../../../components/dialogs/CBETokenDialog/CBETokenDialog' +import { FORM_CBE_TOKEN } from '@chronobank/core-dependencies/constants' export const DUCK_SETTINGS_ERC20_TOKENS = 'settingsERC20Tokens' From 21fc5577b1b1a50d760479a53a3f52fcb68e9424 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Fri, 8 Jun 2018 15:55:55 +0300 Subject: [PATCH 15/30] Use Core in ChronoMint --- package.json | 1 + src/app.js | 2 +- src/components/Deposits/Deposit/Deposit.jsx | 20 +- .../Deposits/DepositsList/DepositsList.jsx | 10 +- .../AddPlatformDialog/AddPlatformForm.jsx | 2 +- .../AddPlatformDialog/validate.js | 2 +- .../AddTokenDialog/AddTokenForm.jsx | 14 +- .../assetsManager/AddTokenDialog/validate.js | 2 +- .../AssetManager/AssetManager.jsx | 2 +- .../AssetManagerDialog/AssetManagerForm.jsx | 6 +- .../AssetManagerDialog/validate.js | 2 +- .../BlacklistDialog/BlacklistDialog.jsx | 4 +- .../BlacklistForm/BlacklistForm.jsx | 6 +- .../assetsManager/BlacklistForm/validate.js | 2 +- .../BlockAssetDialog/BlockAssetDialog.jsx | 4 +- .../HistoryTable/HistoryTable.jsx | 16 +- .../PlatformInfo/PlatformInfo.jsx | 8 +- .../assetsManager/PlatformInfo/validate.js | 2 +- .../PlatformsList/PlatformsList.jsx | 10 +- .../ReissueAssetForm/ReissueAssetForm.jsx | 6 +- .../ReissueAssetForm/validate.js | 2 +- .../assetsManager/RevokeDialog/RevokeForm.jsx | 6 +- .../assetsManager/RevokeDialog/validate.js | 2 +- .../common/DocumentsList/DocumentsList.jsx | 4 +- src/components/common/FileSelect/FileItem.js | 6 +- .../common/FileSelect/FileSelect.js | 8 +- src/components/common/GasSlider/GasSlider.jsx | 10 +- src/components/common/IPFSImage/IPFSImage.jsx | 2 +- src/components/common/Moment/index.js | 2 +- .../common/TokenPrice/TokenPrice.jsx | 4 +- .../common/TokenValue/TokenValue.js | 10 +- .../TokenValueSimple/TokenValueSimple.jsx | 6 +- src/components/common/TopButtons/buttons.js | 2 +- .../common/Transactions/Transactions.js | 8 +- .../TxConfirmations/TxConfirmations.jsx | 6 +- src/components/common/Value/Value.jsx | 2 +- .../dashboard/DepositTokens/DepositTokens.jsx | 6 +- .../DepositTokens/DepositTokensForm.jsx | 30 +-- .../DepositTokens/DepositTokensModal.jsx | 6 +- .../dashboard/DepositTokens/validate.js | 2 +- .../dashboard/MicroIcon/CopyIcon.jsx | 4 +- src/components/dashboard/MicroIcon/PKIcon.jsx | 4 +- src/components/dashboard/Poll/Poll.jsx | 14 +- .../ReceiveTokenModal/ReceiveTokenModal.jsx | 10 +- src/components/dashboard/Rewards/Rewards.jsx | 2 +- .../dashboard/RewardsPeriod/RewardsPeriod.jsx | 16 +- .../dashboard/SendTokens/SendTokens.jsx | 20 +- .../dashboard/SendTokens/SendTokensForm.jsx | 32 +-- .../dashboard/SendTokens/validate.js | 4 +- .../TransactionsTable/TransactionsTable.jsx | 10 +- src/components/dashboard/Voting/Voting.jsx | 4 +- .../dialogs/AddTokenDialog/AddTokenDialog.jsx | 12 +- .../dialogs/AddTokenDialog/validate.js | 2 +- src/components/dialogs/CBEAddressDialog.jsx | 6 +- .../dialogs/CBETokenDialog/CBETokenDialog.jsx | 10 +- .../dialogs/CBETokenDialog/validate.js | 4 +- .../ConfirmTransferDialog.js | 14 +- .../ConfirmTxDialog/ConfirmTxDialog.js | 12 +- .../dialogs/LOC/LOCDialog/LOCDialog.js | 10 +- .../dialogs/LOC/LOCDialog/LOCForm.js | 12 +- .../dialogs/LOC/LOCDialog/validate.js | 2 +- .../LOC/LOCIssueDialog/LOCIssueDialog.js | 12 +- .../LOC/LOCIssueDialog/LOCIssueForm.js | 2 +- .../dialogs/LOC/LOCIssueDialog/validate.js | 2 +- .../LOC/LOCRedeemDialog/LOCRedeemDialog.js | 12 +- .../LOC/LOCRedeemDialog/LOCRedeemForm.js | 2 +- .../dialogs/LOC/LOCRedeemDialog/validate.js | 2 +- .../SendToExchangeDialog.js | 12 +- .../SendToExchangeForm.js | 2 +- .../LOC/LOCSendToExchangeDialog/validate.js | 2 +- .../LOC/LOCStatusDialog/LOCStatusDialog.js | 2 +- .../dialogs/OperationsSettingsDialog.jsx | 4 +- src/components/dialogs/PollDetailsDialog.jsx | 4 +- src/components/dialogs/PollDialog.jsx | 6 +- src/components/dialogs/PollDialogValidate.js | 2 +- .../UpdateProfileDialog.jsx | 6 +- .../dialogs/UpdateProvideDialog/validate.js | 2 +- .../UserActiveDialog/UserActiveDialog.jsx | 2 +- src/components/dialogs/VoteDialog.jsx | 6 +- .../poll/PollEditDialog/PollEditForm.jsx | 20 +- .../dialogs/poll/PollEditDialog/validate.js | 2 +- .../dialogs/tokens/AddCurrencyDialog.jsx | 16 +- src/components/dialogs/tokens/TokenRow.jsx | 8 +- .../EditOwnersDialog/EditOwnersDialog.js | 4 +- .../EditSignaturesDialog.js | 4 +- .../wallet/EditSignaturesDialog/validate.js | 2 +- .../AddExchangeDialog/AddExchangeDialog.jsx | 4 +- .../AddExchangeDialog/AddExchangeForm.jsx | 12 +- .../AddExchangeDialog/TokenListSelector.jsx | 4 +- .../exchange/AddExchangeDialog/validate.js | 2 +- .../BuyTokensDialog/BuyTokensDialog.jsx | 16 +- .../BuyTokensDialog/BuyTokensForm.jsx | 16 +- .../exchange/BuyTokensDialog/validate.js | 2 +- .../ExchangeDepositForm.jsx | 4 +- .../ExchangeTransferDialog.jsx | 16 +- .../ExchangeTransferDialog/validate.js | 2 +- .../ExchangeWidget/ExchangeWidget.jsx | 2 +- .../exchange/ExchangeWidget/validate.js | 2 +- .../ExchangesTable/ExchangesTable.jsx | 12 +- .../EditManagersBaseForm.js | 4 +- .../forms/EditManagersBaseForm/ManagerItem.js | 2 +- .../forms/EditManagersBaseForm/validate.js | 2 +- src/components/locs/LOCItem/LOCItemButtons.js | 4 +- src/components/locs/PageTitle.js | 6 +- src/components/locs/Search.js | 2 +- src/components/operations/Operations.jsx | 4 +- src/components/settings/CBEAddresses.jsx | 4 +- src/components/settings/Tokens.jsx | 6 +- .../AddWalletWidget/AddWalletWidget.jsx | 8 +- .../CustomWalletForm/CustomWalletForm.jsx | 8 +- .../CustomWalletForm/TokensList.jsx | 4 +- .../MultisigWalletForm/MultisigWalletForm.jsx | 12 +- .../MultisigWalletForm/validate.js | 2 +- .../SelectEthWallet/SelectEthWallet.jsx | 4 +- .../SelectWalletType/SelectWalletType.jsx | 8 +- .../TimeLockedWalletForm.jsx | 12 +- .../WalletSettingsForm/WalletSettingsForm.jsx | 6 +- .../wallet/LockedWallet/LockedWallet.jsx | 136 +++++++++++++ .../wallet/OwnersList/OwnersList.jsx | 2 +- src/components/wallet/OwnersList/validate.js | 2 +- .../OwnersListWidget/OwnersListWidget.jsx | 4 +- .../PendingTxWidget/PendingTxWidget.jsx | 18 +- .../SubIconForWallet/SubIconForWallet.jsx | 2 +- .../TokensListWidget/TokensListWidget.jsx | 10 +- .../TransactionsListWidget.jsx | 10 +- .../TwoFaConfirmModal/TwoFaConfirmModal.jsx | 6 +- .../wallet/TwoFaConfirmModal/validate.js | 2 +- .../TwoFaEnableForm/TwoFaEnableForm.jsx | 6 +- .../wallet/TwoFaEnableForm/validate.js | 2 +- .../TwoFaWalletForm/TwoFaWalletForm.jsx | 20 +- .../wallet/WalletName/WalletName.jsx | 2 +- .../wallet/WalletPendingTransfers.jsx | 12 +- .../WalletWidget/WalletMainCoinBalance.jsx | 10 +- .../wallet/WalletWidget/WalletTokensList.jsx | 14 +- .../wallet/WalletWidget/WalletWidget.jsx | 16 +- .../WalletWidgetDetail/WalletWidgetDetail.jsx | 10 +- .../WalletWidgetMini/WalletTokensCount.jsx | 6 +- .../WalletWidgetMini/WalletWidgetMini.jsx | 10 +- .../WalletWidgetMiniUsdAmount.jsx | 10 +- .../wallet/WalletWidgetMini/selectors.js | 12 +- src/i18n/en-notices.js | 2 +- src/i18n/en.js | 28 +-- src/layouts/Markup.jsx | 4 +- .../DepositContent/DepositContent.jsx | 8 +- .../DepositsContent/DepositsContent.jsx | 8 +- .../DrawerMainMenu/DrawerMainMenu.jsx | 6 +- .../MenuAssetsManagerMoreInfo.jsx | 4 +- .../MenuTokenMoreInfo/MenuTokenMoreInfo.jsx | 18 +- .../MenuTokensList/MenuTokensList.jsx | 4 +- .../partials/DrawerPartial/DrawerPartial.jsx | 2 +- .../ExchangeContent/ExchangeContent.jsx | 2 +- .../partials/LOCContent/LOCContent.jsx | 4 +- .../NotificationContent.jsx | 8 +- .../ProfileContent/ProfileContent.jsx | 6 +- .../RewardsContent/RewardsContent.jsx | 10 +- .../partials/VotingContent/VotingContent.jsx | 16 +- .../partials/WalletContent/WalletContent.jsx | 6 +- .../WalletsContent/WalletsContent.jsx | 10 +- .../partials/WalletsContent/selectors.js | 10 +- src/platform/IPFS.js | 8 + src/platform/LocalStorage.js | 8 + src/platform/SessionStorage.js | 7 + src/platform/constants.js | 9 + src/platform/imageValidator.js | 5 +- src/platform/logger.js | 29 +++ src/platform/redux/ui/actions.js | 8 + src/platform/router.js | 8 + src/redux/configureStore.js | 14 +- src/redux/ducks.js | 32 +-- src/redux/i18n/reducer.js | 2 +- src/redux/serialize.js | 36 ++-- src/redux/ui/actions.js | 6 +- src/specsInit.js | 4 +- yarn.lock | 188 +++++++++++++++++- 174 files changed, 1009 insertions(+), 612 deletions(-) create mode 100644 src/components/wallet/LockedWallet/LockedWallet.jsx create mode 100644 src/platform/IPFS.js create mode 100644 src/platform/LocalStorage.js create mode 100644 src/platform/SessionStorage.js create mode 100644 src/platform/constants.js create mode 100644 src/platform/logger.js create mode 100644 src/platform/redux/ui/actions.js create mode 100644 src/platform/router.js diff --git a/package.json b/package.json index adc07658a..ad6e62e52 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "license": "AGPL-3.0", "devDependencies": { "@chronobank/chronomint-presentation": "github:chronobank/ChronoMintPresentation", + "@chronobank/core": "*", "@chronobank/login": "*", "@chronobank/login-ui": "*", "archiver": "^2.0.0", diff --git a/src/app.js b/src/app.js index 1c95dd96f..3f9f04e8d 100644 --- a/src/app.js +++ b/src/app.js @@ -9,7 +9,7 @@ import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider' import React from 'react' import { render } from 'react-dom' import injectTapEventPlugin from 'react-tap-event-plugin' -import { bootstrap } from './redux/session/actions' +import { bootstrap } from '@chronobank/core/redux/session/actions' import { store } from './redux/configureStore' import router from './router' import themeDefault from './themeDefault' diff --git a/src/components/Deposits/Deposit/Deposit.jsx b/src/components/Deposits/Deposit/Deposit.jsx index aea782210..c9ce7d8fc 100644 --- a/src/components/Deposits/Deposit/Deposit.jsx +++ b/src/components/Deposits/Deposit/Deposit.jsx @@ -5,23 +5,23 @@ import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { DUCK_MAIN_WALLET, getTransactionsForWallet, TIME } from 'redux/mainWallet/actions' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import MainWalletModel from 'models/wallet/MainWalletModel' -import { DUCK_SESSION } from 'redux/session/actions' -import { getDeposit } from 'redux/mainWallet/selectors' +import { DUCK_MAIN_WALLET, getTransactionsForWallet, TIME } from '@chronobank/core/redux/mainWallet/actions' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' +import { getDeposit } from '@chronobank/core/redux/mainWallet/selectors' import { Button, IPFSImage, TokenValue } from 'components' import { modalsOpen } from 'redux/modals/actions' import DepositTokensModal from 'components/dashboard/DepositTokens/DepositTokensModal' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokenModel from 'models/tokens/TokenModel' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { TOKEN_ICONS } from 'assets' -import { DUCK_ASSETS_HOLDER } from 'redux/assetsHolder/actions' +import { DUCK_ASSETS_HOLDER } from '@chronobank/core/redux/assetsHolder/actions' import TransactionsTable from 'components/dashboard/TransactionsTable/TransactionsTable' -import TransactionsCollection from 'models/wallet/TransactionsCollection' +import TransactionsCollection from '@chronobank/core/models/wallet/TransactionsCollection' import { prefix } from './lang' import './Deposit.scss' diff --git a/src/components/Deposits/DepositsList/DepositsList.jsx b/src/components/Deposits/DepositsList/DepositsList.jsx index 78542eb51..3aafa5104 100644 --- a/src/components/Deposits/DepositsList/DepositsList.jsx +++ b/src/components/Deposits/DepositsList/DepositsList.jsx @@ -5,15 +5,15 @@ import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import { Link } from 'react-router' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { TIME } from 'redux/mainWallet/actions' -import { getDeposit } from 'redux/mainWallet/selectors' +import { TIME } from '@chronobank/core/redux/mainWallet/actions' +import { getDeposit } from '@chronobank/core/redux/mainWallet/selectors' import { Button, IPFSImage, TokenValue } from 'components' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokenModel from 'models/tokens/TokenModel' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { TOKEN_ICONS } from 'assets' import { prefix } from './lang' import './DepositsList.scss' diff --git a/src/components/assetsManager/AddPlatformDialog/AddPlatformForm.jsx b/src/components/assetsManager/AddPlatformDialog/AddPlatformForm.jsx index 3acc30065..4e40a910f 100644 --- a/src/components/assetsManager/AddPlatformDialog/AddPlatformForm.jsx +++ b/src/components/assetsManager/AddPlatformDialog/AddPlatformForm.jsx @@ -10,7 +10,7 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { Checkbox, TextField } from 'redux-form-material-ui' import { Field, reduxForm } from 'redux-form/immutable' -import { createPlatform } from 'redux/assetsManager/actions' +import { createPlatform } from '@chronobank/core/redux/assetsManager/actions' import './AddPlatformForm.scss' import validate from './validate' diff --git a/src/components/assetsManager/AddPlatformDialog/validate.js b/src/components/assetsManager/AddPlatformDialog/validate.js index 4db2fa6ef..208cb1f67 100644 --- a/src/components/assetsManager/AddPlatformDialog/validate.js +++ b/src/components/assetsManager/AddPlatformDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' export default function validate (values) { let result = {} diff --git a/src/components/assetsManager/AddTokenDialog/AddTokenForm.jsx b/src/components/assetsManager/AddTokenDialog/AddTokenForm.jsx index a41b3a14c..4658f09dd 100644 --- a/src/components/assetsManager/AddTokenDialog/AddTokenForm.jsx +++ b/src/components/assetsManager/AddTokenDialog/AddTokenForm.jsx @@ -18,16 +18,16 @@ import { connect } from 'react-redux' import icnPlus from 'assets/img/icn-plus.svg' import platformIcon from 'assets/img/folder-multiple.svg' import platformIconInCircle from 'assets/img/assets1.svg' -import { ACCEPT_ALL } from 'models/FileSelect/FileExtension' -import FileModel from 'models/FileSelect/FileModel' -import TokenModel from 'models/tokens/TokenModel' -import { createAsset, DUCK_ASSETS_MANAGER } from 'redux/assetsManager/actions' +import { ACCEPT_ALL } from '@chronobank/core/models/FileSelect/FileExtension' +import FileModel from '@chronobank/core/models/FileSelect/FileModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { createAsset, DUCK_ASSETS_MANAGER } from '@chronobank/core/redux/assetsManager/actions' import { modalsOpen } from 'redux/modals/actions' import AddPlatformDialog from 'components/assetsManager/AddPlatformDialog/AddPlatformDialog' import IPFSImage from 'components/common/IPFSImage/IPFSImage' -import ipfs from 'utils/IPFS' -import FeeModel from 'models/tokens/FeeModel' -import ReissuableModel from 'models/tokens/ReissuableModel' +import ipfs from '@chronobank/core/utils/IPFS' +import FeeModel from '@chronobank/core/models/tokens/FeeModel' +import ReissuableModel from '@chronobank/core/models/tokens/ReissuableModel' import validate, { normalizeSmallestUnit } from './validate' import './AddTokenForm.scss' diff --git a/src/components/assetsManager/AddTokenDialog/validate.js b/src/components/assetsManager/AddTokenDialog/validate.js index 643e8fcde..6239afdec 100644 --- a/src/components/assetsManager/AddTokenDialog/validate.js +++ b/src/components/assetsManager/AddTokenDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' const validateSmallestUnit = (value) => validator.between(value, 0, 20, true) diff --git a/src/components/assetsManager/AssetManager/AssetManager.jsx b/src/components/assetsManager/AssetManager/AssetManager.jsx index 8d07a3333..c041f0256 100644 --- a/src/components/assetsManager/AssetManager/AssetManager.jsx +++ b/src/components/assetsManager/AssetManager/AssetManager.jsx @@ -9,7 +9,7 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import { createPlatform, DUCK_ASSETS_MANAGER } from 'redux/assetsManager/actions' +import { createPlatform, DUCK_ASSETS_MANAGER } from '@chronobank/core/redux/assetsManager/actions' import { modalsOpen } from 'redux/modals/actions' import AddPlatformDialog from 'components/assetsManager/AddPlatformDialog/AddPlatformDialog' import AddTokenDialog from 'components/assetsManager/AddTokenDialog/AddTokenDialog' diff --git a/src/components/assetsManager/AssetManagerDialog/AssetManagerForm.jsx b/src/components/assetsManager/AssetManagerDialog/AssetManagerForm.jsx index ab7873c91..6a2804a52 100644 --- a/src/components/assetsManager/AssetManagerDialog/AssetManagerForm.jsx +++ b/src/components/assetsManager/AssetManagerDialog/AssetManagerForm.jsx @@ -4,13 +4,13 @@ */ import EditManagersBaseForm from 'components/forms/EditManagersBaseForm/EditManagersBaseForm' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { addManager, removeManager } from 'redux/assetsManager/actions' +import { addManager, removeManager } from '@chronobank/core/redux/assetsManager/actions' import { modalsClose } from 'redux/modals/actions' -import { getSelectedToken } from 'redux/assetsManager/selectors' +import { getSelectedToken } from '@chronobank/core/redux/assetsManager/selectors' import './AssetManagerForm.scss' function mapStateToProps (state) { diff --git a/src/components/assetsManager/AssetManagerDialog/validate.js b/src/components/assetsManager/AssetManagerDialog/validate.js index 15dfea184..b14c21fcd 100644 --- a/src/components/assetsManager/AssetManagerDialog/validate.js +++ b/src/components/assetsManager/AssetManagerDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' export default function (values) { let managerAddressErrors = new ErrorList() diff --git a/src/components/assetsManager/BlacklistDialog/BlacklistDialog.jsx b/src/components/assetsManager/BlacklistDialog/BlacklistDialog.jsx index 4a9eb7385..69cb913e5 100644 --- a/src/components/assetsManager/BlacklistDialog/BlacklistDialog.jsx +++ b/src/components/assetsManager/BlacklistDialog/BlacklistDialog.jsx @@ -10,8 +10,8 @@ import ModalDialog from 'components/dialogs/ModalDialog' import { modalsClose } from 'redux/modals/actions' import { Translate } from 'react-redux-i18n' import BlacklistForm from 'components/assetsManager/BlacklistForm/BlacklistForm' -import { restrictUser, unrestrictUser } from 'redux/assetsManager/actions' -import TokenModel from 'models/tokens/TokenModel' +import { restrictUser, unrestrictUser } from '@chronobank/core/redux/assetsManager/actions' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import './BlacklistDialog.scss' import { prefix } from './lang' diff --git a/src/components/assetsManager/BlacklistForm/BlacklistForm.jsx b/src/components/assetsManager/BlacklistForm/BlacklistForm.jsx index 7d9d2429c..1803ae726 100644 --- a/src/components/assetsManager/BlacklistForm/BlacklistForm.jsx +++ b/src/components/assetsManager/BlacklistForm/BlacklistForm.jsx @@ -3,16 +3,16 @@ * Licensed under the AGPL Version 3 license. */ -import OwnerCollection from 'models/wallet/OwnerCollection' +import OwnerCollection from '@chronobank/core/models/wallet/OwnerCollection' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { TextField } from 'redux-form-material-ui' import { Field, formPropTypes, reduxForm } from 'redux-form/immutable' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import UserIcon from 'components/common/HashedIcon/UserIcon' -import BlacklistModel from 'models/tokens/BlacklistModel' +import BlacklistModel from '@chronobank/core/models/tokens/BlacklistModel' import { Button } from 'components' import './BlacklistForm.scss' import validate from './validate' diff --git a/src/components/assetsManager/BlacklistForm/validate.js b/src/components/assetsManager/BlacklistForm/validate.js index 333cf7a5e..f7e94fa31 100644 --- a/src/components/assetsManager/BlacklistForm/validate.js +++ b/src/components/assetsManager/BlacklistForm/validate.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' import ErrorList from 'platform/ErrorList' export default function (values) { diff --git a/src/components/assetsManager/BlockAssetDialog/BlockAssetDialog.jsx b/src/components/assetsManager/BlockAssetDialog/BlockAssetDialog.jsx index cb6f43ea6..848b507b3 100644 --- a/src/components/assetsManager/BlockAssetDialog/BlockAssetDialog.jsx +++ b/src/components/assetsManager/BlockAssetDialog/BlockAssetDialog.jsx @@ -9,8 +9,8 @@ import { connect } from 'react-redux' import ModalDialog from 'components/dialogs/ModalDialog' import { modalsClose } from 'redux/modals/actions' import { Translate } from 'react-redux-i18n' -import { changePauseStatus } from 'redux/assetsManager/actions' -import TokenModel from 'models/tokens/TokenModel' +import { changePauseStatus } from '@chronobank/core/redux/assetsManager/actions' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { Button } from 'components' import './BlockAssetDialog.scss' import { prefix } from './lang' diff --git a/src/components/assetsManager/HistoryTable/HistoryTable.jsx b/src/components/assetsManager/HistoryTable/HistoryTable.jsx index 8a6d38c81..2c13654e5 100644 --- a/src/components/assetsManager/HistoryTable/HistoryTable.jsx +++ b/src/components/assetsManager/HistoryTable/HistoryTable.jsx @@ -3,22 +3,22 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import { CircularProgress } from 'material-ui' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' import moment from 'moment' -import { DUCK_ASSETS_MANAGER } from 'redux/assetsManager/actions' +import { DUCK_ASSETS_MANAGER } from '@chronobank/core/redux/assetsManager/actions' import Moment from 'components/common/Moment/index' -import { SHORT_DATE } from 'models/constants' +import { SHORT_DATE } from '@chronobank/core/models/constants' import TokenValue from 'components/common/TokenValue/TokenValue' -import { TX_ISSUE, TX_OWNERSHIP_CHANGE, TX_REVOKE } from 'dao/ChronoBankPlatformDAO' -import { TX_PLATFORM_ATTACHED, TX_PLATFORM_DETACHED, TX_PLATFORM_REQUESTED } from 'dao/PlatformsManagerDAO' -import { TX_ASSET_CREATED } from 'dao/AssetsManagerDAO' -import TransactionsCollection from 'models/wallet/TransactionsCollection' -import { TX_PAUSED, TX_RESTRICTED, TX_UNPAUSED, TX_UNRESTRICTED } from 'dao/ChronoBankAssetDAO' +import { TX_ISSUE, TX_OWNERSHIP_CHANGE, TX_REVOKE } from '@chronobank/core/dao/ChronoBankPlatformDAO' +import { TX_PLATFORM_ATTACHED, TX_PLATFORM_DETACHED, TX_PLATFORM_REQUESTED } from '@chronobank/core/dao/PlatformsManagerDAO' +import { TX_ASSET_CREATED } from '@chronobank/core/dao/AssetsManagerDAO' +import TransactionsCollection from '@chronobank/core/models/wallet/TransactionsCollection' +import { TX_PAUSED, TX_RESTRICTED, TX_UNPAUSED, TX_UNRESTRICTED } from '@chronobank/core/dao/ChronoBankAssetDAO' import './HistoryTable.scss' diff --git a/src/components/assetsManager/PlatformInfo/PlatformInfo.jsx b/src/components/assetsManager/PlatformInfo/PlatformInfo.jsx index a44f4ff7d..887c288ac 100644 --- a/src/components/assetsManager/PlatformInfo/PlatformInfo.jsx +++ b/src/components/assetsManager/PlatformInfo/PlatformInfo.jsx @@ -5,7 +5,7 @@ import classnames from 'classnames' import { Button, IPFSImage, TokenValue } from 'components' -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import AssetManagerDialog from 'components/assetsManager/AssetManagerDialog/AssetManagerDialog' import CrowdsaleDialog from 'components/assetsManager/CrowdsaleDialog/CrowdsaleDialog' import RevokeDialog from 'components/assetsManager/RevokeDialog/RevokeDialog' @@ -15,13 +15,13 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { DUCK_ASSETS_MANAGER, getFee, getManagersForAssetSymbol } from 'redux/assetsManager/actions' +import { DUCK_ASSETS_MANAGER, getFee, getManagersForAssetSymbol } from '@chronobank/core/redux/assetsManager/actions' import { modalsOpen } from 'redux/modals/actions' import BlockAssetDialog from 'components/assetsManager/BlockAssetDialog/BlockAssetDialog' import ReissueAssetForm from 'components/assetsManager/ReissueAssetForm/ReissueAssetForm' -import { getSelectedToken } from 'redux/assetsManager/selectors' +import { getSelectedToken } from '@chronobank/core/redux/assetsManager/selectors' import BlacklistDialog from 'components/assetsManager/BlacklistDialog/BlacklistDialog' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import tokenIconStubSVG from 'assets/img/asset_stub.svg' import blockedSVG from 'assets/img/blocked-white.svg' diff --git a/src/components/assetsManager/PlatformInfo/validate.js b/src/components/assetsManager/PlatformInfo/validate.js index cfe884556..40dd111a8 100644 --- a/src/components/assetsManager/PlatformInfo/validate.js +++ b/src/components/assetsManager/PlatformInfo/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' export default function (values) { let amountErrors = new ErrorList() diff --git a/src/components/assetsManager/PlatformsList/PlatformsList.jsx b/src/components/assetsManager/PlatformsList/PlatformsList.jsx index dccc92375..7f16cff4c 100644 --- a/src/components/assetsManager/PlatformsList/PlatformsList.jsx +++ b/src/components/assetsManager/PlatformsList/PlatformsList.jsx @@ -9,12 +9,12 @@ import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import classnames from 'classnames' import { connect } from 'react-redux' -import { detachPlatform, DUCK_ASSETS_MANAGER, selectPlatform, selectToken } from 'redux/assetsManager/actions' +import { detachPlatform, DUCK_ASSETS_MANAGER, selectPlatform, selectToken } from '@chronobank/core/redux/assetsManager/actions' import Preloader from 'components/common/Preloader/Preloader' -import TokenModel from 'models/tokens/TokenModel' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import Amount from 'models/Amount' -import TokensCollection from 'models/tokens/TokensCollection' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import Amount from '@chronobank/core/models/Amount' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import WithLoader from 'components/common/Preloader/WithLoader' import blockedSVG from 'assets/img/blocked-white.svg' import tokenIconStubSVG from 'assets/img/asset_stub.svg' diff --git a/src/components/assetsManager/ReissueAssetForm/ReissueAssetForm.jsx b/src/components/assetsManager/ReissueAssetForm/ReissueAssetForm.jsx index 0369b4238..78cff0a53 100644 --- a/src/components/assetsManager/ReissueAssetForm/ReissueAssetForm.jsx +++ b/src/components/assetsManager/ReissueAssetForm/ReissueAssetForm.jsx @@ -10,9 +10,9 @@ import React, { PureComponent } from 'react' import { TextField } from 'redux-form-material-ui' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import { DUCK_ASSETS_MANAGER, reissueAsset } from 'redux/assetsManager/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' +import { DUCK_ASSETS_MANAGER, reissueAsset } from '@chronobank/core/redux/assetsManager/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import validate from './validate' import './ReissueAssetForm.scss' diff --git a/src/components/assetsManager/ReissueAssetForm/validate.js b/src/components/assetsManager/ReissueAssetForm/validate.js index cfe884556..40dd111a8 100644 --- a/src/components/assetsManager/ReissueAssetForm/validate.js +++ b/src/components/assetsManager/ReissueAssetForm/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' export default function (values) { let amountErrors = new ErrorList() diff --git a/src/components/assetsManager/RevokeDialog/RevokeForm.jsx b/src/components/assetsManager/RevokeDialog/RevokeForm.jsx index 17f08d242..500e32ae7 100644 --- a/src/components/assetsManager/RevokeDialog/RevokeForm.jsx +++ b/src/components/assetsManager/RevokeDialog/RevokeForm.jsx @@ -10,9 +10,9 @@ import { connect } from 'react-redux' import { Button } from 'components' import { TextField } from 'redux-form-material-ui' import { Field, reduxForm } from 'redux-form/immutable' -import { DUCK_ASSETS_MANAGER, revokeAsset } from 'redux/assetsManager/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' +import { DUCK_ASSETS_MANAGER, revokeAsset } from '@chronobank/core/redux/assetsManager/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import validate from './validate' import './RevokeForm.scss' diff --git a/src/components/assetsManager/RevokeDialog/validate.js b/src/components/assetsManager/RevokeDialog/validate.js index de0ec834e..3d9fe7f2e 100644 --- a/src/components/assetsManager/RevokeDialog/validate.js +++ b/src/components/assetsManager/RevokeDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' export default function validate (values) { let res = {} diff --git a/src/components/common/DocumentsList/DocumentsList.jsx b/src/components/common/DocumentsList/DocumentsList.jsx index acb0e1bd0..934fc354a 100644 --- a/src/components/common/DocumentsList/DocumentsList.jsx +++ b/src/components/common/DocumentsList/DocumentsList.jsx @@ -6,9 +6,9 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import ArbitraryNoticeModel from 'models/notices/ArbitraryNoticeModel' +import ArbitraryNoticeModel from '@chronobank/core/models/notices/ArbitraryNoticeModel' import { download } from 'redux/ui/actions' -import { notify } from 'redux/notifier/actions' +import { notify } from '@chronobank/core/redux/notifier/actions' import FileIcon from 'components/common/FileSelect/FileIcon' import './DocumentsList.scss' diff --git a/src/components/common/FileSelect/FileItem.js b/src/components/common/FileSelect/FileItem.js index c9d8ac87a..98deedd26 100644 --- a/src/components/common/FileSelect/FileItem.js +++ b/src/components/common/FileSelect/FileItem.js @@ -10,10 +10,10 @@ import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' import globalStyles from 'styles' -import ArbitraryNoticeModel from 'models/notices/ArbitraryNoticeModel' -import FileModel from 'models/FileSelect/FileModel' +import ArbitraryNoticeModel from '@chronobank/core/models/notices/ArbitraryNoticeModel' +import FileModel from '@chronobank/core/models/FileSelect/FileModel' import { download } from 'redux/ui/actions' -import { notify } from 'redux/notifier/actions' +import { notify } from '@chronobank/core/redux/notifier/actions' import formatFileSize from 'utils/formatFileSize' import FileIcon from './FileIcon' diff --git a/src/components/common/FileSelect/FileSelect.js b/src/components/common/FileSelect/FileSelect.js index 1108a902b..126a4fb67 100644 --- a/src/components/common/FileSelect/FileSelect.js +++ b/src/components/common/FileSelect/FileSelect.js @@ -12,10 +12,10 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import globalStyles from 'styles' -import { ACCEPT_ALL } from 'models/FileSelect/FileExtension' -import FileCollection from 'models/FileSelect/FileCollection' -import FileModel, { fileConfig } from 'models/FileSelect/FileModel' -import ipfs from 'utils/IPFS' +import { ACCEPT_ALL } from '@chronobank/core/models/FileSelect/FileExtension' +import FileCollection from '@chronobank/core/models/FileSelect/FileCollection' +import FileModel, { fileConfig } from '@chronobank/core/models/FileSelect/FileModel' +import ipfs from '@chronobank/core/utils/IPFS' import FileItem from './FileItem' import './FileSelect.scss' diff --git a/src/components/common/GasSlider/GasSlider.jsx b/src/components/common/GasSlider/GasSlider.jsx index 4fa131157..60a09460b 100644 --- a/src/components/common/GasSlider/GasSlider.jsx +++ b/src/components/common/GasSlider/GasSlider.jsx @@ -8,11 +8,11 @@ import { Translate } from 'react-redux-i18n' import { Slider } from 'material-ui' import React, { PureComponent } from 'react' import PropTypes from 'prop-types' -import { GAS_SLIDER_MULTIPLIER_CHANGE } from 'redux/session/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokenModel from 'models/tokens/TokenModel' -import { getGasPriceMultiplier } from 'redux/session/selectors' -import { ETH, FEE_RATE_MULTIPLIER } from 'redux/mainWallet/actions' +import { GAS_SLIDER_MULTIPLIER_CHANGE } from '@chronobank/core/redux/session/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { getGasPriceMultiplier } from '@chronobank/core/redux/session/selectors' +import { ETH, FEE_RATE_MULTIPLIER } from '@chronobank/core/redux/mainWallet/actions' import './GasSlider.scss' import { prefix } from './lang' diff --git a/src/components/common/IPFSImage/IPFSImage.jsx b/src/components/common/IPFSImage/IPFSImage.jsx index 9bcd85dbe..00d35e327 100644 --- a/src/components/common/IPFSImage/IPFSImage.jsx +++ b/src/components/common/IPFSImage/IPFSImage.jsx @@ -6,7 +6,7 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' -import IPFS from 'utils/IPFS' +import IPFS from '@chronobank/core/utils/IPFS' import './IPFSImage.scss' diff --git a/src/components/common/Moment/index.js b/src/components/common/Moment/index.js index ce928538c..c7078b324 100644 --- a/src/components/common/Moment/index.js +++ b/src/components/common/Moment/index.js @@ -7,7 +7,7 @@ import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' import moment from 'moment' -import { FULL_DATE } from 'models/constants' +import { FULL_DATE } from '@chronobank/core/models/constants' const mapStateToProps = (state) => ({ locale: state.get('i18n').locale, diff --git a/src/components/common/TokenPrice/TokenPrice.jsx b/src/components/common/TokenPrice/TokenPrice.jsx index aa9a72275..9bb08cbdc 100644 --- a/src/components/common/TokenPrice/TokenPrice.jsx +++ b/src/components/common/TokenPrice/TokenPrice.jsx @@ -3,13 +3,13 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import BigNumber from 'bignumber.js' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { integerWithDelimiter } from 'utils/formatter' -import { priceTokenSelector } from 'redux/wallet/selectors' +import { priceTokenSelector } from '@chronobank/core/redux/wallet/selectors' function makeMapStateToProps (state, props) { const getBalance = priceTokenSelector(props.value) diff --git a/src/components/common/TokenValue/TokenValue.js b/src/components/common/TokenValue/TokenValue.js index 1726baa73..9fece2bb4 100644 --- a/src/components/common/TokenValue/TokenValue.js +++ b/src/components/common/TokenValue/TokenValue.js @@ -5,14 +5,14 @@ import BigNumber from 'bignumber.js' import Preloader from 'components/common/Preloader/Preloader' -import Amount from 'models/Amount' -import TokenModel from 'models/tokens/TokenModel' -import TokensCollection from 'models/tokens/TokensCollection' +import Amount from '@chronobank/core/models/Amount' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { DUCK_MARKET } from 'redux/market/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_MARKET } from '@chronobank/core/redux/market/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import { integerWithDelimiter } from 'utils/formatter' import './TokenValue.scss' diff --git a/src/components/common/TokenValueSimple/TokenValueSimple.jsx b/src/components/common/TokenValueSimple/TokenValueSimple.jsx index 630631a07..2ad87a9ac 100644 --- a/src/components/common/TokenValueSimple/TokenValueSimple.jsx +++ b/src/components/common/TokenValueSimple/TokenValueSimple.jsx @@ -3,14 +3,14 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import { integerWithDelimiter } from 'utils/formatter' -import TokensCollection from 'models/tokens/TokensCollection' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' const mapStateToProps = (state) => { return { diff --git a/src/components/common/TopButtons/buttons.js b/src/components/common/TopButtons/buttons.js index 9ee93cbba..0a20cdbf2 100644 --- a/src/components/common/TopButtons/buttons.js +++ b/src/components/common/TopButtons/buttons.js @@ -6,7 +6,7 @@ import { modalsOpen } from 'redux/modals/actions' import DepositTokensModal from 'components/dashboard/DepositTokens/DepositTokensModal' import { push } from 'react-router-redux' -import { goBackForAddWalletsForm } from 'redux/mainWallet/actions' +import { goBackForAddWalletsForm } from '@chronobank/core/redux/mainWallet/actions' import { changeWalletView } from 'redux/ui/actions' export default { diff --git a/src/components/common/Transactions/Transactions.js b/src/components/common/Transactions/Transactions.js index 7a1889e1b..2c5f48ec6 100644 --- a/src/components/common/Transactions/Transactions.js +++ b/src/components/common/Transactions/Transactions.js @@ -10,10 +10,10 @@ import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' import { getBlockExplorerUrl } from '@chronobank/login/network/settings' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' -import TokenModel from 'models/tokens/TokenModel' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import globalStyles from '../../../styles' import styles from './styles' diff --git a/src/components/common/TxConfirmations/TxConfirmations.jsx b/src/components/common/TxConfirmations/TxConfirmations.jsx index 8d0dac51c..b91cc47ca 100644 --- a/src/components/common/TxConfirmations/TxConfirmations.jsx +++ b/src/components/common/TxConfirmations/TxConfirmations.jsx @@ -7,10 +7,10 @@ import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import TxModel from 'models/TxModel' +import TxModel from '@chronobank/core/models/TxModel' import { TX_CONFIRMATIONS } from 'assets' -import { DUCK_SESSION } from 'redux/session/actions' -import { makeGetLastBlockForBlockchain } from 'redux/tokens/selectors' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' +import { makeGetLastBlockForBlockchain } from '@chronobank/core/redux/tokens/selectors' import { prefix } from './lang' import './TxConfirmations.scss' diff --git a/src/components/common/Value/Value.jsx b/src/components/common/Value/Value.jsx index 13cd47044..cd139688b 100644 --- a/src/components/common/Value/Value.jsx +++ b/src/components/common/Value/Value.jsx @@ -8,7 +8,7 @@ import PropTypes from 'prop-types' import Moment from 'components/common/Moment/index' import moment from 'moment' import BigNumber from 'bignumber.js' -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import TokenValue from 'components/common/TokenValue/TokenValue' import { Translate } from 'react-redux-i18n' diff --git a/src/components/dashboard/DepositTokens/DepositTokens.jsx b/src/components/dashboard/DepositTokens/DepositTokens.jsx index 51dd81a04..d14787860 100644 --- a/src/components/dashboard/DepositTokens/DepositTokens.jsx +++ b/src/components/dashboard/DepositTokens/DepositTokens.jsx @@ -3,12 +3,12 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { depositAsset, initAssetsHolder, withdrawAsset } from 'redux/assetsHolder/actions' -import { mainApprove } from 'redux/mainWallet/actions' +import { depositAsset, initAssetsHolder, withdrawAsset } from '@chronobank/core/redux/assetsHolder/actions' +import { mainApprove } from '@chronobank/core/redux/mainWallet/actions' import DepositTokensForm, { ACTION_APPROVE, ACTION_DEPOSIT, ACTION_WITHDRAW } from './DepositTokensForm' import './DepositTokensForm.scss' diff --git a/src/components/dashboard/DepositTokens/DepositTokensForm.jsx b/src/components/dashboard/DepositTokens/DepositTokensForm.jsx index 26d3fa4cf..6f8acc6a4 100644 --- a/src/components/dashboard/DepositTokens/DepositTokensForm.jsx +++ b/src/components/dashboard/DepositTokens/DepositTokensForm.jsx @@ -7,32 +7,32 @@ import { Button, IPFSImage } from 'components' import { Slider, TextField } from 'redux-form-material-ui' import { isTestingNetwork } from '@chronobank/login/network/settings' import { DUCK_NETWORK } from '@chronobank/login/redux/network/actions' -import web3Converter from 'utils/Web3Converter' +import web3Converter from '@chronobank/core/utils/Web3Converter' import { TOKEN_ICONS } from 'assets' import { modalsOpen } from 'redux/modals/actions' import BigNumber from 'bignumber.js' import Preloader from 'components/common/Preloader/Preloader' import TokenValue from 'components/common/TokenValue/TokenValue' -import Amount from 'models/Amount' -import AssetsCollection from 'models/assetHolder/AssetsCollection' -import TokenModel from 'models/tokens/TokenModel' -import TokensCollection from 'models/tokens/TokensCollection' -import MainWalletModel from 'models/wallet/MainWalletModel' +import Amount from '@chronobank/core/models/Amount' +import AssetsCollection from '@chronobank/core/models/assetHolder/AssetsCollection' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { change, Field, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable' -import { DUCK_ASSETS_HOLDER } from 'redux/assetsHolder/actions' -import { DUCK_MAIN_WALLET, estimateGasForDeposit, ETH, FEE_RATE_MULTIPLIER, mainApprove, mainRevoke, requireTIME } from 'redux/mainWallet/actions' -import { TX_DEPOSIT, TX_WITHDRAW_SHARES } from 'dao/AssetHolderDAO' -import { TX_APPROVE } from 'dao/ERC20DAO' -import { DUCK_SESSION } from 'redux/session/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import AllowanceModel from 'models/wallet/AllowanceModel' +import { DUCK_ASSETS_HOLDER } from '@chronobank/core/redux/assetsHolder/actions' +import { DUCK_MAIN_WALLET, estimateGasForDeposit, ETH, FEE_RATE_MULTIPLIER, mainApprove, mainRevoke, requireTIME } from '@chronobank/core/redux/mainWallet/actions' +import { TX_DEPOSIT, TX_WITHDRAW_SHARES } from '@chronobank/core/dao/AssetHolderDAO' +import { TX_APPROVE } from '@chronobank/core/dao/ERC20DAO' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import AllowanceModel from '@chronobank/core/models/wallet/AllowanceModel' import classnames from 'classnames' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import { getGasPriceMultiplier } from 'redux/session/selectors' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' +import { getGasPriceMultiplier } from '@chronobank/core/redux/session/selectors' import './DepositTokensForm.scss' import validate from './validate' import ReceiveTokenModal from '../ReceiveTokenModal/ReceiveTokenModal' diff --git a/src/components/dashboard/DepositTokens/DepositTokensModal.jsx b/src/components/dashboard/DepositTokens/DepositTokensModal.jsx index 2f2f56b14..24fbf448f 100644 --- a/src/components/dashboard/DepositTokens/DepositTokensModal.jsx +++ b/src/components/dashboard/DepositTokens/DepositTokensModal.jsx @@ -3,14 +3,14 @@ * Licensed under the AGPL Version 3 license. */ -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { change } from 'redux-form' -import { depositAsset, initAssetsHolder, withdrawAsset } from 'redux/assetsHolder/actions' +import { depositAsset, initAssetsHolder, withdrawAsset } from '@chronobank/core/redux/assetsHolder/actions' import { modalsClose } from 'redux/modals/actions' -import { mainApprove } from 'redux/mainWallet/actions' +import { mainApprove } from '@chronobank/core/redux/mainWallet/actions' import { ModalDialog } from 'components' import DepositTokensForm, { ACTION_APPROVE, ACTION_DEPOSIT, ACTION_WITHDRAW, FORM_DEPOSIT_TOKENS } from './DepositTokensForm' import './DepositTokensForm.scss' diff --git a/src/components/dashboard/DepositTokens/validate.js b/src/components/dashboard/DepositTokens/validate.js index 1ab6ec7c4..ab382a0c0 100644 --- a/src/components/dashboard/DepositTokens/validate.js +++ b/src/components/dashboard/DepositTokens/validate.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' import ErrorList from 'platform/ErrorList' export default (values, props) => { diff --git a/src/components/dashboard/MicroIcon/CopyIcon.jsx b/src/components/dashboard/MicroIcon/CopyIcon.jsx index 5008dc645..d8057755b 100644 --- a/src/components/dashboard/MicroIcon/CopyIcon.jsx +++ b/src/components/dashboard/MicroIcon/CopyIcon.jsx @@ -7,9 +7,9 @@ import { I18n } from 'platform/i18n' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import ArbitraryNoticeModel from 'models/notices/ArbitraryNoticeModel' +import ArbitraryNoticeModel from '@chronobank/core/models/notices/ArbitraryNoticeModel' import { modalsOpen } from 'redux/modals/actions' -import { notify } from 'redux/notifier/actions' +import { notify } from '@chronobank/core/redux/notifier/actions' import CopyDialog from 'components/dialogs/CopyDialog/CopyDialog' import clipboard from 'utils/clipboard' diff --git a/src/components/dashboard/MicroIcon/PKIcon.jsx b/src/components/dashboard/MicroIcon/PKIcon.jsx index 077bb263e..18f8a1bf2 100644 --- a/src/components/dashboard/MicroIcon/PKIcon.jsx +++ b/src/components/dashboard/MicroIcon/PKIcon.jsx @@ -7,9 +7,9 @@ import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import ArbitraryNoticeModel from 'models/notices/ArbitraryNoticeModel' +import ArbitraryNoticeModel from '@chronobank/core/models/notices/ArbitraryNoticeModel' import { modalsOpen } from 'redux/modals/actions' -import { notify } from 'redux/notifier/actions' +import { notify } from '@chronobank/core/redux/notifier/actions' import CopyDialog from 'components/dialogs/CopyDialog/CopyDialog' import clipboard from 'utils/clipboard' import { getPrivateKeyFromBlockchain } from '@chronobank/login/redux/network/actions' diff --git a/src/components/dashboard/Poll/Poll.jsx b/src/components/dashboard/Poll/Poll.jsx index 46560c129..654f1c1b0 100644 --- a/src/components/dashboard/Poll/Poll.jsx +++ b/src/components/dashboard/Poll/Poll.jsx @@ -9,19 +9,19 @@ import Moment from 'components/common/Moment' import PollDetailsDialog from 'components/dialogs/PollDetailsDialog' import VoteDialog from 'components/dialogs/VoteDialog' import { Paper } from 'material-ui' -import Amount from 'models/Amount' -import { SHORT_DATE } from 'models/constants' -import TokenModel from 'models/tokens/TokenModel' +import Amount from '@chronobank/core/models/Amount' +import { SHORT_DATE } from '@chronobank/core/models/constants' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import Preloader from 'components/common/Preloader/Preloader' import { Translate } from 'react-redux-i18n' import { modalsOpen } from 'redux/modals/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import { activatePoll, endPoll, removePoll } from 'redux/voting/actions' -import PollDetailsModel from 'models/PollDetailsModel' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import { activatePoll, endPoll, removePoll } from '@chronobank/core/redux/voting/actions' +import PollDetailsModel from '@chronobank/core/models/PollDetailsModel' import TokenValue from 'components/common/TokenValue/TokenValue' import BigNumber from 'bignumber.js' import './Poll.scss' diff --git a/src/components/dashboard/ReceiveTokenModal/ReceiveTokenModal.jsx b/src/components/dashboard/ReceiveTokenModal/ReceiveTokenModal.jsx index b96737d78..c43d05897 100644 --- a/src/components/dashboard/ReceiveTokenModal/ReceiveTokenModal.jsx +++ b/src/components/dashboard/ReceiveTokenModal/ReceiveTokenModal.jsx @@ -13,16 +13,16 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import ModalDialog from 'components/dialogs/ModalDialog' -import { DUCK_MAIN_WALLET, TIME } from 'redux/mainWallet/actions' -import MainWalletModel from 'models/wallet/MainWalletModel' +import { DUCK_MAIN_WALLET, TIME } from '@chronobank/core/redux/mainWallet/actions' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' import HITBTC_PNG from 'assets/img/marketsLogos/hitbtc.png' import LIVECOIN_PNG from 'assets/img/marketsLogos/livecoin.png' import LIQUI_PNG from 'assets/img/marketsLogos/liqui.png' import KUCOIN_PNG from 'assets/img/marketsLogos/kucoin.png' -import TokenModel from 'models/tokens/TokenModel' -import { getTokensForBlockchain } from 'redux/tokens/selectors' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { getTokensForBlockchain } from '@chronobank/core/redux/tokens/selectors' import { MenuItem } from 'material-ui' import styles from '../styles' diff --git a/src/components/dashboard/Rewards/Rewards.jsx b/src/components/dashboard/Rewards/Rewards.jsx index 8ebba8656..64e54850a 100644 --- a/src/components/dashboard/Rewards/Rewards.jsx +++ b/src/components/dashboard/Rewards/Rewards.jsx @@ -7,7 +7,7 @@ import RewardsPeriod from 'components/dashboard/RewardsPeriod/RewardsPeriod' import SplitSection from 'components/dashboard/SplitSection/SplitSection' import { Paper } from 'material-ui' import { Button } from 'components' -import RewardsPeriodModel from 'models/rewards/RewardsPeriodModel' +import RewardsPeriodModel from '@chronobank/core/models/rewards/RewardsPeriodModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' diff --git a/src/components/dashboard/RewardsPeriod/RewardsPeriod.jsx b/src/components/dashboard/RewardsPeriod/RewardsPeriod.jsx index 47a237f8c..7d023aa7d 100644 --- a/src/components/dashboard/RewardsPeriod/RewardsPeriod.jsx +++ b/src/components/dashboard/RewardsPeriod/RewardsPeriod.jsx @@ -7,20 +7,20 @@ import Moment from 'components/common/Moment' import TokenValue from 'components/common/TokenValue/TokenValue' import ProgressSection from 'components/dashboard/ProgressSection/ProgressSection' import { Paper } from 'material-ui' -import Amount from 'models/Amount' -import { SHORT_DATE } from 'models/constants' -import RewardsCollection from 'models/rewards/RewardsCollection' -import RewardsPeriodModel from 'models/rewards/RewardsPeriodModel' -import TokenModel from 'models/tokens/TokenModel' +import Amount from '@chronobank/core/models/Amount' +import { SHORT_DATE } from '@chronobank/core/models/constants' +import RewardsCollection from '@chronobank/core/models/rewards/RewardsCollection' +import RewardsPeriodModel from '@chronobank/core/models/rewards/RewardsPeriodModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import moment from 'moment' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { DUCK_ASSETS_HOLDER } from 'redux/assetsHolder/actions' +import { DUCK_ASSETS_HOLDER } from '@chronobank/core/redux/assetsHolder/actions' import { DUCK_I18N } from 'redux/i18n/actions' -import { DUCK_REWARDS } from 'redux/rewards/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_REWARDS } from '@chronobank/core/redux/rewards/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import './RewardsPeriod.scss' function prefix (token) { diff --git a/src/components/dashboard/SendTokens/SendTokens.jsx b/src/components/dashboard/SendTokens/SendTokens.jsx index bbebd6e7f..e5ef1f51f 100644 --- a/src/components/dashboard/SendTokens/SendTokens.jsx +++ b/src/components/dashboard/SendTokens/SendTokens.jsx @@ -10,21 +10,21 @@ import { BLOCKCHAIN_LITECOIN, } from '@chronobank/login/network/BitcoinProvider' import SendTokensForm, { ACTION_APPROVE, ACTION_TRANSFER, FORM_SEND_TOKENS, MODE_ADVANCED, MODE_SIMPLE } from 'components/dashboard/SendTokens/SendTokensForm' -import Amount from 'models/Amount' -import TokensCollection from 'models/tokens/TokensCollection' +import Amount from '@chronobank/core/models/Amount' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import PropTypes from 'prop-types' import BigNumber from 'bignumber.js' -import web3Converter from 'utils/Web3Converter' +import web3Converter from '@chronobank/core/utils/Web3Converter' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { change, untouch } from 'redux-form' -import { mainApprove, mainTransfer } from 'redux/mainWallet/actions' -import { multisigTransfer } from 'redux/multisigWallet/actions' -import { DUCK_TOKENS, estimateGas } from 'redux/tokens/actions' -import MainWalletModel from 'models/wallet/MainWalletModel' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import DerivedWalletModel from 'models/wallet/DerivedWalletModel' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import { mainApprove, mainTransfer } from '@chronobank/core/redux/mainWallet/actions' +import { multisigTransfer } from '@chronobank/core/redux/multisigWallet/actions' +import { DUCK_TOKENS, estimateGas } from '@chronobank/core/redux/tokens/actions' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' +import DerivedWalletModel from '@chronobank/core/models/wallet/DerivedWalletModel' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' function mapDispatchToProps (dispatch) { return { diff --git a/src/components/dashboard/SendTokens/SendTokensForm.jsx b/src/components/dashboard/SendTokens/SendTokensForm.jsx index 92ea28d2f..1eb0ff6a8 100644 --- a/src/components/dashboard/SendTokens/SendTokensForm.jsx +++ b/src/components/dashboard/SendTokens/SendTokensForm.jsx @@ -8,18 +8,18 @@ import { BLOCKCHAIN_BITCOIN, BLOCKCHAIN_BITCOIN_CASH, BLOCKCHAIN_BITCOIN_GOLD, B import { TOKEN_ICONS } from 'assets' import Preloader from 'components/common/Preloader/Preloader' import TokenValue from 'components/common/TokenValue/TokenValue' -import contractsManagerDAO from 'dao/ContractsManagerDAO' -import MainWalletModel from 'models/wallet/MainWalletModel' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import { TX_TRANSFER } from "dao/ERC20DAO" -import web3Converter from 'utils/Web3Converter' -import Amount from 'models/Amount' +import contractsManagerDAO from '@chronobank/core/dao/ContractsManagerDAO' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' +import { TX_TRANSFER } from '@chronobank/core/dao/ERC20DAO' +import web3Converter from '@chronobank/core/utils/Web3Converter' +import Amount from '@chronobank/core/models/Amount' import Immutable from 'immutable' import BigNumber from 'bignumber.js' -import * as validators from 'models/validator' +import * as validators from '@chronobank/core/models/validator' import { CircularProgress, MenuItem, MuiThemeProvider, Paper } from 'material-ui' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import PropTypes from 'prop-types' import { integerWithDelimiter } from 'utils/formatter' import React, { PureComponent } from 'react' @@ -27,14 +27,14 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { SelectField, Slider, TextField } from 'redux-form-material-ui' import { change, Field, formPropTypes, formValueSelector, getFormSyncErrors, getFormValues, reduxForm } from 'redux-form/immutable' -import { ETH, FEE_RATE_MULTIPLIER, getSpendersAllowance } from 'redux/mainWallet/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { getGasPriceMultiplier } from 'redux/session/selectors' -import { walletDetailSelector, walletInfoSelector } from 'redux/wallet/selectors' -import { DUCK_TOKENS, estimateBtcFee, estimateGas } from 'redux/tokens/actions' -import DerivedWalletModel from 'models/wallet/DerivedWalletModel' +import { ETH, FEE_RATE_MULTIPLIER, getSpendersAllowance } from '@chronobank/core/redux/mainWallet/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' +import { getGasPriceMultiplier } from '@chronobank/core/redux/session/selectors' +import { walletDetailSelector, walletInfoSelector } from '@chronobank/core/redux/wallet/selectors' +import { DUCK_TOKENS, estimateBtcFee, estimateGas } from '@chronobank/core/redux/tokens/actions' +import DerivedWalletModel from '@chronobank/core/models/wallet/DerivedWalletModel' import inversedTheme from 'styles/themes/inversed' -import { getMarket } from 'redux/market/selectors' +import { getMarket } from '@chronobank/core/redux/market/selectors' import styles from '../styles' import { prefix } from './lang' import './SendTokensForm.scss' diff --git a/src/components/dashboard/SendTokens/validate.js b/src/components/dashboard/SendTokens/validate.js index 4cdd0ffac..bb8b229e7 100644 --- a/src/components/dashboard/SendTokens/validate.js +++ b/src/components/dashboard/SendTokens/validate.js @@ -4,8 +4,8 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' -import tokenService from 'services/TokenService' +import * as validator from '@chronobank/core/models/validator' +import tokenService from '@chronobank/core/services/TokenService' import { MODE_ADVANCED } from './SendTokensForm' export default (values, props) => { diff --git a/src/components/dashboard/TransactionsTable/TransactionsTable.jsx b/src/components/dashboard/TransactionsTable/TransactionsTable.jsx index deaa923ce..de3615df4 100644 --- a/src/components/dashboard/TransactionsTable/TransactionsTable.jsx +++ b/src/components/dashboard/TransactionsTable/TransactionsTable.jsx @@ -16,11 +16,11 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { DUCK_I18N } from 'redux/i18n/actions' import Preloader from 'components/common/Preloader/Preloader' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' -import TokenModel from 'models/tokens/TokenModel' -import TransactionsCollection from 'models/wallet/TransactionsCollection' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import TransactionsCollection from '@chronobank/core/models/wallet/TransactionsCollection' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import './TransactionsTable.scss' import { prefix } from './lang' diff --git a/src/components/dashboard/Voting/Voting.jsx b/src/components/dashboard/Voting/Voting.jsx index b27e7e1e8..a7c34d34b 100644 --- a/src/components/dashboard/Voting/Voting.jsx +++ b/src/components/dashboard/Voting/Voting.jsx @@ -14,9 +14,9 @@ import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { Link } from 'react-router' -import { initAssetsHolder } from 'redux/assetsHolder/actions' +import { initAssetsHolder } from '@chronobank/core/redux/assetsHolder/actions' import { modalsOpen } from 'redux/modals/actions' -import { listPolls } from 'redux/voting/actions' +import { listPolls } from '@chronobank/core/redux/voting/actions' import './Voting.scss' diff --git a/src/components/dialogs/AddTokenDialog/AddTokenDialog.jsx b/src/components/dialogs/AddTokenDialog/AddTokenDialog.jsx index 7e8aee763..e55526202 100644 --- a/src/components/dialogs/AddTokenDialog/AddTokenDialog.jsx +++ b/src/components/dialogs/AddTokenDialog/AddTokenDialog.jsx @@ -11,16 +11,16 @@ import React, { PureComponent } from 'react' import { TextField } from 'redux-form-material-ui' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import { ACCEPT_IMAGES } from 'models/FileSelect/FileExtension' -import TokenModel from 'models/tokens/TokenModel' -import { addToken, formTokenLoadMetaData } from 'redux/settings/erc20/tokens/actions' -import { DUCK_SESSION } from 'redux/session/actions' +import { ACCEPT_IMAGES } from '@chronobank/core/models/FileSelect/FileExtension' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { addToken, formTokenLoadMetaData } from '@chronobank/core/redux/settings/erc20/tokens/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import { modalsClose } from 'redux/modals/actions' import FileSelect from 'components/common/FileSelect/FileSelect' import IPFSImage from 'components/common/IPFSImage/IPFSImage' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import TokenIcon from 'components/common/HashedIcon/TokenIcon' -import ProfileModel from 'models/ProfileModel' +import ProfileModel from '@chronobank/core/models/ProfileModel' import ModalDialog from '../ModalDialog' import validate, { normalizeSmallestUnit } from './validate' diff --git a/src/components/dialogs/AddTokenDialog/validate.js b/src/components/dialogs/AddTokenDialog/validate.js index 9f7e389d2..56b34ac1e 100644 --- a/src/components/dialogs/AddTokenDialog/validate.js +++ b/src/components/dialogs/AddTokenDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' const validateSmallestUnit = (value) => validator.between(value, 0, 20, true) diff --git a/src/components/dialogs/CBEAddressDialog.jsx b/src/components/dialogs/CBEAddressDialog.jsx index e581f6f0a..4f7c3e3c9 100644 --- a/src/components/dialogs/CBEAddressDialog.jsx +++ b/src/components/dialogs/CBEAddressDialog.jsx @@ -10,11 +10,11 @@ import React, { PureComponent } from 'react' import { TextField } from 'redux-form-material-ui' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import { validate } from 'models/CBEModel' -import { addCBE, formCBELoadName } from 'redux/settings/user/cbe/actions' +import { validate } from '@chronobank/core/models/CBEModel' +import { addCBE, formCBELoadName } from '@chronobank/core/redux/settings/user/cbe/actions' import { modalsClose } from 'redux/modals/actions' import ModalDialog from 'components/dialogs/ModalDialog' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' import './FormDialog.scss' diff --git a/src/components/dialogs/CBETokenDialog/CBETokenDialog.jsx b/src/components/dialogs/CBETokenDialog/CBETokenDialog.jsx index 6d0463605..ebda55fbd 100644 --- a/src/components/dialogs/CBETokenDialog/CBETokenDialog.jsx +++ b/src/components/dialogs/CBETokenDialog/CBETokenDialog.jsx @@ -11,14 +11,14 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { TextField } from 'redux-form-material-ui' import { connect } from 'react-redux' -import { ACCEPT_IMAGES } from 'models/FileSelect/FileExtension' -import { addToken, DUCK_SETTINGS_ERC20_TOKENS, formTokenLoadMetaData, getDataFromContract, modifyToken } from 'redux/settings/erc20/tokens/actions' +import { ACCEPT_IMAGES } from '@chronobank/core/models/FileSelect/FileExtension' +import { addToken, DUCK_SETTINGS_ERC20_TOKENS, formTokenLoadMetaData, getDataFromContract, modifyToken } from '@chronobank/core/redux/settings/erc20/tokens/actions' import { modalsClose } from 'redux/modals/actions' import FileSelect from 'components/common/FileSelect/FileSelect' import ModalDialog from 'components/dialogs/ModalDialog' -import TokenModel from 'models/tokens/TokenModel' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import validate from './validate' import '../FormDialog.scss' diff --git a/src/components/dialogs/CBETokenDialog/validate.js b/src/components/dialogs/CBETokenDialog/validate.js index 2272924aa..c1cb57591 100644 --- a/src/components/dialogs/CBETokenDialog/validate.js +++ b/src/components/dialogs/CBETokenDialog/validate.js @@ -4,8 +4,8 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' -import TokenModel from 'models/tokens/TokenModel' +import * as validator from '@chronobank/core/models/validator' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' const validateSmallestUnit = (value) => validator.between(value, 0, 20, true) diff --git a/src/components/dialogs/ConfirmTransferDialog/ConfirmTransferDialog.js b/src/components/dialogs/ConfirmTransferDialog/ConfirmTransferDialog.js index b15413d40..6b86740f6 100644 --- a/src/components/dialogs/ConfirmTransferDialog/ConfirmTransferDialog.js +++ b/src/components/dialogs/ConfirmTransferDialog/ConfirmTransferDialog.js @@ -10,15 +10,15 @@ import React, { PureComponent } from 'react' import { Table, TableBody, TableRow, TableRowColumn } from 'material-ui' import Button from 'components/common/ui/Button/Button' -import Amount from 'models/Amount' -import BalanceModel from 'models/tokens/BalanceModel' -import TransferExecModel from 'models/TransferExecModel' -import BitcoinDAO from 'dao/BitcoinDAO' -import NemDAO from 'dao/NemDAO' -import WavesDAO from 'dao/WavesDAO' +import Amount from '@chronobank/core/models/Amount' +import BalanceModel from '@chronobank/core/models/tokens/BalanceModel' +import TransferExecModel from '@chronobank/core/models/TransferExecModel' +import BitcoinDAO from '@chronobank/core/dao/BitcoinDAO' +import NemDAO from '@chronobank/core/dao/NemDAO' +import WavesDAO from '@chronobank/core/dao/WavesDAO' import { modalsClear, modalsClose } from 'redux/modals/actions' -import { getMainWalletBalance, getWalletBalanceForSymbol } from 'redux/wallet/selectors' +import { getMainWalletBalance, getWalletBalanceForSymbol } from '@chronobank/core/redux/wallet/selectors' import Value from 'components/common/Value/Value' import TokenValue from 'components/common/TokenValue/TokenValue' diff --git a/src/components/dialogs/ConfirmTxDialog/ConfirmTxDialog.js b/src/components/dialogs/ConfirmTxDialog/ConfirmTxDialog.js index 003fd1b17..0feeccb30 100644 --- a/src/components/dialogs/ConfirmTxDialog/ConfirmTxDialog.js +++ b/src/components/dialogs/ConfirmTxDialog/ConfirmTxDialog.js @@ -9,20 +9,20 @@ import BigNumber from 'bignumber.js' import Value from 'components/common/Value/Value' import ModalDialog from 'components/dialogs/ModalDialog' import { CircularProgress, Table, TableBody, TableRow, TableRowColumn } from 'material-ui' -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import Button from 'components/common/ui/Button/Button' -import TxExecModel from 'models/TxExecModel' +import TxExecModel from '@chronobank/core/models/TxExecModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { DUCK_MAIN_WALLET, ETH } from 'redux/mainWallet/actions' +import { DUCK_MAIN_WALLET, ETH } from '@chronobank/core/redux/mainWallet/actions' import { modalsClear, modalsClose } from 'redux/modals/actions' -import { DUCK_WATCHER, WATCHER_TX_SET } from 'redux/watcher/actions' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_WATCHER, WATCHER_TX_SET } from '@chronobank/core/redux/watcher/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import GasSlider from 'components/common/GasSlider/GasSlider' import Preloader from 'components/common/Preloader/Preloader' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' import './ConfirmTxDialog.scss' diff --git a/src/components/dialogs/LOC/LOCDialog/LOCDialog.js b/src/components/dialogs/LOC/LOCDialog/LOCDialog.js index f13bad4a8..ac3717458 100644 --- a/src/components/dialogs/LOC/LOCDialog/LOCDialog.js +++ b/src/components/dialogs/LOC/LOCDialog/LOCDialog.js @@ -7,12 +7,12 @@ import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { addLOC, updateLOC } from 'redux/locs/actions' +import { addLOC, updateLOC } from '@chronobank/core/redux/locs/actions' import { modalsClose } from 'redux/modals/actions' -import LOCModel from 'models/LOCModel' -import { getToken } from 'redux/locs/selectors' -import { LHT } from 'dao/LHTDAO' -import TokenModel from 'models/tokens/TokenModel' +import LOCModel from '@chronobank/core/models/LOCModel' +import { getToken } from '@chronobank/core/redux/locs/selectors' +import { LHT } from '@chronobank/core/dao/LHTDAO' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import ModalDialog from 'components/dialogs/ModalDialog' import LOCForm from './LOCForm' diff --git a/src/components/dialogs/LOC/LOCDialog/LOCForm.js b/src/components/dialogs/LOC/LOCDialog/LOCForm.js index 5ed6fb9e7..a35c192d4 100644 --- a/src/components/dialogs/LOC/LOCDialog/LOCForm.js +++ b/src/components/dialogs/LOC/LOCDialog/LOCForm.js @@ -10,13 +10,13 @@ import { Button } from 'components' import { I18n, Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' -import Amount from 'models/Amount' -import { getToken } from 'redux/locs/selectors' -import { LHT } from 'dao/LHTDAO' -import TokenModel from 'models/tokens/TokenModel' +import Amount from '@chronobank/core/models/Amount' +import { getToken } from '@chronobank/core/redux/locs/selectors' +import { LHT } from '@chronobank/core/dao/LHTDAO' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { connect } from 'react-redux' -import LOCModel from 'models/LOCModel' -import { addLOC, removeLOC, updateLOC } from 'redux/locs/actions' +import LOCModel from '@chronobank/core/models/LOCModel' +import { addLOC, removeLOC, updateLOC } from '@chronobank/core/redux/locs/actions' import FileSelect from 'components/common/FileSelect/FileSelect' import validate from './validate' diff --git a/src/components/dialogs/LOC/LOCDialog/validate.js b/src/components/dialogs/LOC/LOCDialog/validate.js index b248cdc12..ebf655b25 100644 --- a/src/components/dialogs/LOC/LOCDialog/validate.js +++ b/src/components/dialogs/LOC/LOCDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' export default (values, props) => { const errors = {} diff --git a/src/components/dialogs/LOC/LOCIssueDialog/LOCIssueDialog.js b/src/components/dialogs/LOC/LOCIssueDialog/LOCIssueDialog.js index eb4ee5bbd..814327a5f 100644 --- a/src/components/dialogs/LOC/LOCIssueDialog/LOCIssueDialog.js +++ b/src/components/dialogs/LOC/LOCIssueDialog/LOCIssueDialog.js @@ -7,14 +7,14 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import { issueAsset } from 'redux/locs/actions' +import { issueAsset } from '@chronobank/core/redux/locs/actions' import { modalsClose } from 'redux/modals/actions' import TokenValue from 'components/common/TokenValue/TokenValue' -import LOCModel from 'models/LOCModel' -import { getToken } from 'redux/locs/selectors' -import { LHT } from 'dao/LHTDAO' -import TokenModel from 'models/tokens/TokenModel' -import Amount from 'models/Amount' +import LOCModel from '@chronobank/core/models/LOCModel' +import { getToken } from '@chronobank/core/redux/locs/selectors' +import { LHT } from '@chronobank/core/dao/LHTDAO' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import Amount from '@chronobank/core/models/Amount' import ModalDialog from 'components/dialogs/ModalDialog' import IssueForm from './LOCIssueForm' import './LOCIssueDialog.scss' diff --git a/src/components/dialogs/LOC/LOCIssueDialog/LOCIssueForm.js b/src/components/dialogs/LOC/LOCIssueDialog/LOCIssueForm.js index a6d574ebd..215cce043 100644 --- a/src/components/dialogs/LOC/LOCIssueDialog/LOCIssueForm.js +++ b/src/components/dialogs/LOC/LOCIssueDialog/LOCIssueForm.js @@ -9,7 +9,7 @@ import { Button } from 'components' import React, { PureComponent } from 'react' import { TextField } from 'redux-form-material-ui' import { Translate, I18n } from 'react-redux-i18n' -import LOCModel from 'models/LOCModel' +import LOCModel from '@chronobank/core/models/LOCModel' import validate from './validate' import './LOCIssueForm.scss' diff --git a/src/components/dialogs/LOC/LOCIssueDialog/validate.js b/src/components/dialogs/LOC/LOCIssueDialog/validate.js index fbf9cadce..073b17c6f 100644 --- a/src/components/dialogs/LOC/LOCIssueDialog/validate.js +++ b/src/components/dialogs/LOC/LOCIssueDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' export default (values, props) => { const amount = +values.get('amount') diff --git a/src/components/dialogs/LOC/LOCRedeemDialog/LOCRedeemDialog.js b/src/components/dialogs/LOC/LOCRedeemDialog/LOCRedeemDialog.js index 55642ab2b..8b81ec0fa 100644 --- a/src/components/dialogs/LOC/LOCRedeemDialog/LOCRedeemDialog.js +++ b/src/components/dialogs/LOC/LOCRedeemDialog/LOCRedeemDialog.js @@ -7,14 +7,14 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import LOCModel from 'models/LOCModel' +import LOCModel from '@chronobank/core/models/LOCModel' import { modalsClose } from 'redux/modals/actions' -import { revokeAsset } from 'redux/locs/actions' +import { revokeAsset } from '@chronobank/core/redux/locs/actions' import TokenValue from 'components/common/TokenValue/TokenValue' -import { getToken } from 'redux/locs/selectors' -import { LHT } from 'dao/LHTDAO' -import TokenModel from 'models/tokens/TokenModel' -import Amount from 'models/Amount' +import { getToken } from '@chronobank/core/redux/locs/selectors' +import { LHT } from '@chronobank/core/dao/LHTDAO' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import Amount from '@chronobank/core/models/Amount' import ModalDialog from 'components/dialogs/ModalDialog' import LOCRedeemForm from './LOCRedeemForm' import './LOCRedeemDialog.scss' diff --git a/src/components/dialogs/LOC/LOCRedeemDialog/LOCRedeemForm.js b/src/components/dialogs/LOC/LOCRedeemDialog/LOCRedeemForm.js index 55c68ba32..9752e5322 100644 --- a/src/components/dialogs/LOC/LOCRedeemDialog/LOCRedeemForm.js +++ b/src/components/dialogs/LOC/LOCRedeemDialog/LOCRedeemForm.js @@ -9,7 +9,7 @@ import { Button } from 'components' import React, { PureComponent } from 'react' import { TextField } from 'redux-form-material-ui' import { I18n, Translate } from 'react-redux-i18n' -import LOCModel from 'models/LOCModel' +import LOCModel from '@chronobank/core/models/LOCModel' import validate from './validate' import './LOCRedeemForm.scss' diff --git a/src/components/dialogs/LOC/LOCRedeemDialog/validate.js b/src/components/dialogs/LOC/LOCRedeemDialog/validate.js index fbc01a17b..838f75b03 100644 --- a/src/components/dialogs/LOC/LOCRedeemDialog/validate.js +++ b/src/components/dialogs/LOC/LOCRedeemDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default (values, props) => { const amount = +values.get('amount') diff --git a/src/components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeDialog.js b/src/components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeDialog.js index fb4ff4aec..9e91daf98 100644 --- a/src/components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeDialog.js +++ b/src/components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeDialog.js @@ -7,13 +7,13 @@ import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import exchangeDAO from 'dao/ExchangeDAO' -import lhtDAO, { LHT } from 'dao/LHTDAO' -import TokenModel from 'models/tokens/TokenModel' +import exchangeDAO from '@chronobank/core/dao/ExchangeDAO' +import lhtDAO, { LHT } from '@chronobank/core/dao/LHTDAO' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { modalsClose } from 'redux/modals/actions' -import { sendAsset } from 'redux/locs/actions' -import Amount from 'models/Amount' -import { getToken } from 'redux/locs/selectors' +import { sendAsset } from '@chronobank/core/redux/locs/actions' +import Amount from '@chronobank/core/models/Amount' +import { getToken } from '@chronobank/core/redux/locs/selectors' import ModalDialog from 'components/dialogs/ModalDialog' import SendToExchangeForm from './SendToExchangeForm' diff --git a/src/components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeForm.js b/src/components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeForm.js index 0ada25936..0b77b0449 100644 --- a/src/components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeForm.js +++ b/src/components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeForm.js @@ -10,7 +10,7 @@ import React, { PureComponent } from 'react' import { TextField } from 'redux-form-material-ui' import { Translate } from 'react-redux-i18n' import TokenValue from 'components/common/TokenValue/TokenValue' -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import validate from './validate' import './SendToExchangeForm.scss' diff --git a/src/components/dialogs/LOC/LOCSendToExchangeDialog/validate.js b/src/components/dialogs/LOC/LOCSendToExchangeDialog/validate.js index 3fa2591e6..e9357d7ac 100644 --- a/src/components/dialogs/LOC/LOCSendToExchangeDialog/validate.js +++ b/src/components/dialogs/LOC/LOCSendToExchangeDialog/validate.js @@ -5,7 +5,7 @@ import BigNumber from 'bignumber.js' import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default (values, props) => { const sendAmount = values.get('sendAmount') diff --git a/src/components/dialogs/LOC/LOCStatusDialog/LOCStatusDialog.js b/src/components/dialogs/LOC/LOCStatusDialog/LOCStatusDialog.js index 80f041426..55f321173 100644 --- a/src/components/dialogs/LOC/LOCStatusDialog/LOCStatusDialog.js +++ b/src/components/dialogs/LOC/LOCStatusDialog/LOCStatusDialog.js @@ -11,7 +11,7 @@ import { connect } from 'react-redux' import { modalsClose } from 'redux/modals/actions' import LOCStatusForm from './LOCStatusForm' import ModalDialogBase from '../../ModalDialogBase/ModalDialogBase' -import { updateStatus } from '../../../../redux/locs/actions' +import { updateStatus } from '@chronobank/core/redux/locs/actions' const mapDispatchToProps = (dispatch) => ({ updateStatus: (status, loc) => dispatch(updateStatus(status, loc)), diff --git a/src/components/dialogs/OperationsSettingsDialog.jsx b/src/components/dialogs/OperationsSettingsDialog.jsx index bed0d4847..01252617b 100644 --- a/src/components/dialogs/OperationsSettingsDialog.jsx +++ b/src/components/dialogs/OperationsSettingsDialog.jsx @@ -12,10 +12,10 @@ import { TextField } from 'redux-form-material-ui' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' import { modalsClose } from 'redux/modals/actions' -import { setRequiredSignatures } from 'redux/operations/actions' +import { setRequiredSignatures } from '@chronobank/core/redux/operations/actions' import ErrorList from 'platform/ErrorList' import ModalDialog from 'components/dialogs/ModalDialog' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' import './FormDialog.scss' diff --git a/src/components/dialogs/PollDetailsDialog.jsx b/src/components/dialogs/PollDetailsDialog.jsx index a14b83091..97ce973fb 100644 --- a/src/components/dialogs/PollDetailsDialog.jsx +++ b/src/components/dialogs/PollDetailsDialog.jsx @@ -12,8 +12,8 @@ import { modalsClose } from 'redux/modals/actions' import DocumentsList from 'components/common/DocumentsList/DocumentsList' import DoughnutChart from 'components/common/DoughnutChart/DoughnutChart' import Moment from 'components/common/Moment' -import { SHORT_DATE } from 'models/constants' -import PollDetailsModel from 'models/PollDetailsModel' +import { SHORT_DATE } from '@chronobank/core/models/constants' +import PollDetailsModel from '@chronobank/core/models/PollDetailsModel' import TokenValue from 'components/common/TokenValue/TokenValue' import ModalDialog from './ModalDialog' import './PollDetailsDialog.scss' diff --git a/src/components/dialogs/PollDialog.jsx b/src/components/dialogs/PollDialog.jsx index ff1b27367..f51431eca 100644 --- a/src/components/dialogs/PollDialog.jsx +++ b/src/components/dialogs/PollDialog.jsx @@ -6,7 +6,7 @@ import classnames from 'classnames' import { FlatButton, FontIcon, IconButton } from 'material-ui' import { Button } from 'components' -import PollModel from 'models/PollModel' +import PollModel from '@chronobank/core/models/PollModel' import PropTypes from 'prop-types' import React from 'react' import { connect } from 'react-redux' @@ -14,8 +14,8 @@ import { CSSTransitionGroup } from 'react-transition-group' import { DatePicker, TextField } from 'redux-form-material-ui' import { Field, FieldArray, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable' import { modalsClose } from 'redux/modals/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { createPoll } from 'redux/voting/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' +import { createPoll } from '@chronobank/core/redux/voting/actions' import ModalDialog from './ModalDialog' import './PollDialog.scss' import validate from './PollDialogValidate' diff --git a/src/components/dialogs/PollDialogValidate.js b/src/components/dialogs/PollDialogValidate.js index 4764e8f80..dc7199d52 100644 --- a/src/components/dialogs/PollDialogValidate.js +++ b/src/components/dialogs/PollDialogValidate.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' import ErrorList from 'platform/ErrorList' export default (values) => { diff --git a/src/components/dialogs/UpdateProvideDialog/UpdateProfileDialog.jsx b/src/components/dialogs/UpdateProvideDialog/UpdateProfileDialog.jsx index ef9fd1e49..dbf42ec4c 100644 --- a/src/components/dialogs/UpdateProvideDialog/UpdateProfileDialog.jsx +++ b/src/components/dialogs/UpdateProvideDialog/UpdateProfileDialog.jsx @@ -11,9 +11,9 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { TextField } from 'redux-form-material-ui' import { connect } from 'react-redux' -import { ACCEPT_IMAGES } from 'models/FileSelect/FileExtension' -import ProfileModel from 'models/ProfileModel' -import { DUCK_SESSION, updateUserProfile } from 'redux/session/actions' +import { ACCEPT_IMAGES } from '@chronobank/core/models/FileSelect/FileExtension' +import ProfileModel from '@chronobank/core/models/ProfileModel' +import { DUCK_SESSION, updateUserProfile } from '@chronobank/core/redux/session/actions' import { modalsClose } from 'redux/modals/actions' import CopyIcon from 'components/dashboard/MicroIcon/CopyIcon' import FileSelect from 'components/common/FileSelect/FileSelect' diff --git a/src/components/dialogs/UpdateProvideDialog/validate.js b/src/components/dialogs/UpdateProvideDialog/validate.js index 03370c3d7..ca03181da 100644 --- a/src/components/dialogs/UpdateProvideDialog/validate.js +++ b/src/components/dialogs/UpdateProvideDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' export default (values) => { const errors = {} diff --git a/src/components/dialogs/UserActiveDialog/UserActiveDialog.jsx b/src/components/dialogs/UserActiveDialog/UserActiveDialog.jsx index 77be92e48..5239bd8da 100644 --- a/src/components/dialogs/UserActiveDialog/UserActiveDialog.jsx +++ b/src/components/dialogs/UserActiveDialog/UserActiveDialog.jsx @@ -9,7 +9,7 @@ import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import userMonitorService from 'user/monitorService' import { connect } from 'react-redux' -import { logout } from 'redux/session/actions' +import { logout } from '@chronobank/core/redux/session/actions' import { modalsClose } from 'redux/modals/actions' import ModalDialog from 'components/dialogs/ModalDialog' import Timer from 'components/common/Timer/Timer' diff --git a/src/components/dialogs/VoteDialog.jsx b/src/components/dialogs/VoteDialog.jsx index 0b41b9a74..40f441bad 100644 --- a/src/components/dialogs/VoteDialog.jsx +++ b/src/components/dialogs/VoteDialog.jsx @@ -10,12 +10,12 @@ import { Translate } from 'react-redux-i18n' import classnames from 'classnames' import { connect } from 'react-redux' import { modalsClose } from 'redux/modals/actions' -import { vote } from 'redux/voting/actions' +import { vote } from '@chronobank/core/redux/voting/actions' import DocumentsList from 'components/common/DocumentsList/DocumentsList' import DoughnutChart from 'components/common/DoughnutChart/DoughnutChart' import Moment from 'components/common/Moment' -import { SHORT_DATE } from 'models/constants' -import PollDetailsModel from 'models/PollDetailsModel' +import { SHORT_DATE } from '@chronobank/core/models/constants' +import PollDetailsModel from '@chronobank/core/models/PollDetailsModel' import TokenValue from 'components/common/TokenValue/TokenValue' import ModalDialog from './ModalDialog' import './VoteDialog.scss' diff --git a/src/components/dialogs/poll/PollEditDialog/PollEditForm.jsx b/src/components/dialogs/poll/PollEditDialog/PollEditForm.jsx index ec7b81abf..76498928d 100644 --- a/src/components/dialogs/poll/PollEditDialog/PollEditForm.jsx +++ b/src/components/dialogs/poll/PollEditDialog/PollEditForm.jsx @@ -9,8 +9,8 @@ import classnames from 'classnames' import FileSelect from 'components/common/FileSelect/FileSelect' import Immutable from 'immutable' import { FontIcon, IconButton } from 'material-ui' -import { ACCEPT_DOCS } from 'models/FileSelect/FileExtension' -import PollModel from 'models/PollModel' +import { ACCEPT_DOCS } from '@chronobank/core/models/FileSelect/FileExtension' +import PollModel from '@chronobank/core/models/PollModel' import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' @@ -18,16 +18,16 @@ import { Translate } from 'react-redux-i18n' import { DatePicker, Slider, TextField } from 'redux-form-material-ui' import { Field, FieldArray, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable' import { DUCK_I18N } from 'redux/i18n/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import { modalsClose } from 'redux/modals/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { createPoll, DUCK_VOTING } from 'redux/voting/actions' -import Amount from 'models/Amount' -import TokenModel from 'models/tokens/TokenModel' -import { TIME } from 'redux/mainWallet/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' +import { createPoll, DUCK_VOTING } from '@chronobank/core/redux/voting/actions' +import Amount from '@chronobank/core/models/Amount' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { TIME } from '@chronobank/core/redux/mainWallet/actions' import TokenValue from 'components/common/TokenValue/TokenValue' -import PollDetailsModel from 'models/PollDetailsModel' -import FileModel from 'models/FileSelect/FileModel' +import PollDetailsModel from '@chronobank/core/models/PollDetailsModel' +import FileModel from '@chronobank/core/models/FileSelect/FileModel' import { Button } from 'components' import './PollEditForm.scss' import validate from './validate' diff --git a/src/components/dialogs/poll/PollEditDialog/validate.js b/src/components/dialogs/poll/PollEditDialog/validate.js index 0b616bc53..cac751541 100644 --- a/src/components/dialogs/poll/PollEditDialog/validate.js +++ b/src/components/dialogs/poll/PollEditDialog/validate.js @@ -5,7 +5,7 @@ import ErrorList from 'platform/ErrorList' import BigNumber from 'bignumber.js' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default function validate (values, props) { let voteLimitInTIME = values.get('voteLimitInTIME') diff --git a/src/components/dialogs/tokens/AddCurrencyDialog.jsx b/src/components/dialogs/tokens/AddCurrencyDialog.jsx index 032f885d7..a1ae3f234 100644 --- a/src/components/dialogs/tokens/AddCurrencyDialog.jsx +++ b/src/components/dialogs/tokens/AddCurrencyDialog.jsx @@ -7,19 +7,19 @@ import Points from 'components/common/Points/Points' import Immutable from 'immutable' import { FloatingActionButton, FontIcon } from 'material-ui' import { Button } from 'components' -import BalancesCollection from 'models/tokens/BalancesCollection' -import TokensCollection from 'models/tokens/TokensCollection' +import BalancesCollection from '@chronobank/core/models/tokens/BalancesCollection' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { DUCK_MAIN_WALLET } from 'redux/mainWallet/actions' +import { DUCK_MAIN_WALLET } from '@chronobank/core/redux/mainWallet/actions' import { modalsClose, modalsOpen } from 'redux/modals/actions' -import { DUCK_SESSION, updateUserProfile } from 'redux/session/actions' -import ProfileModel, { isTokenChecked } from 'models/ProfileModel' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokenModel from 'models/tokens/TokenModel' -import { getProfileTokens } from 'redux/session/selectors' +import { DUCK_SESSION, updateUserProfile } from '@chronobank/core/redux/session/actions' +import ProfileModel, { isTokenChecked } from '@chronobank/core/models/ProfileModel' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import { getProfileTokens } from '@chronobank/core/redux/session/selectors' import AddTokenDialog from '../AddTokenDialog/AddTokenDialog' import ModalDialog from '../ModalDialog' import './AddCurrencyDialog.scss' diff --git a/src/components/dialogs/tokens/TokenRow.jsx b/src/components/dialogs/tokens/TokenRow.jsx index d722da32a..b95805f3a 100644 --- a/src/components/dialogs/tokens/TokenRow.jsx +++ b/src/components/dialogs/tokens/TokenRow.jsx @@ -8,11 +8,11 @@ import classnames from 'classnames' import { IPFSImage, TokenValue } from 'components' import WithLoader, { isFetching } from 'components/common/Preloader/WithLoader' import { Checkbox } from 'material-ui' -import ProfileModel from 'models/ProfileModel' -import BalancesCollection from 'models/tokens/BalancesCollection' -import TokenModel from 'models/tokens/TokenModel' +import ProfileModel from '@chronobank/core/models/ProfileModel' +import BalancesCollection from '@chronobank/core/models/tokens/BalancesCollection' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import PropTypes from 'prop-types' -import { MANDATORY_TOKENS } from 'dao/ERC20ManagerDAO' +import { MANDATORY_TOKENS } from '@chronobank/core/dao/ERC20ManagerDAO' import React, { PureComponent } from 'react' import './TokenRow.scss' diff --git a/src/components/dialogs/wallet/EditOwnersDialog/EditOwnersDialog.js b/src/components/dialogs/wallet/EditOwnersDialog/EditOwnersDialog.js index 8a15e9c9f..17d7284ff 100644 --- a/src/components/dialogs/wallet/EditOwnersDialog/EditOwnersDialog.js +++ b/src/components/dialogs/wallet/EditOwnersDialog/EditOwnersDialog.js @@ -3,11 +3,11 @@ * Licensed under the AGPL Version 3 license. */ -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { addOwner, removeOwner } from 'redux/multisigWallet/actions' +import { addOwner, removeOwner } from '@chronobank/core/redux/multisigWallet/actions' import { modalsClose } from 'redux/modals/actions' import EditManagersBaseForm from 'components/forms/EditManagersBaseForm/EditManagersBaseForm' import ModalDialog from 'components/dialogs/ModalDialog' diff --git a/src/components/dialogs/wallet/EditSignaturesDialog/EditSignaturesDialog.js b/src/components/dialogs/wallet/EditSignaturesDialog/EditSignaturesDialog.js index 4cd832a60..07d343233 100644 --- a/src/components/dialogs/wallet/EditSignaturesDialog/EditSignaturesDialog.js +++ b/src/components/dialogs/wallet/EditSignaturesDialog/EditSignaturesDialog.js @@ -5,12 +5,12 @@ import ModalDialog from 'components/dialogs/ModalDialog' import EditSignaturesForm from 'components/dialogs/wallet/EditSignaturesDialog/EditSignaturesForm' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { modalsClose } from 'redux/modals/actions' -import { changeRequirement } from 'redux/multisigWallet/actions' +import { changeRequirement } from '@chronobank/core/redux/multisigWallet/actions' function mapDispatchToProps (dispatch) { return { diff --git a/src/components/dialogs/wallet/EditSignaturesDialog/validate.js b/src/components/dialogs/wallet/EditSignaturesDialog/validate.js index 7d4d7c1ca..eeb1dae12 100644 --- a/src/components/dialogs/wallet/EditSignaturesDialog/validate.js +++ b/src/components/dialogs/wallet/EditSignaturesDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default (values, props) => { const requiredSignatures = values.get('requiredSignatures') diff --git a/src/components/exchange/AddExchangeDialog/AddExchangeDialog.jsx b/src/components/exchange/AddExchangeDialog/AddExchangeDialog.jsx index 2106adda1..3387f2ff9 100644 --- a/src/components/exchange/AddExchangeDialog/AddExchangeDialog.jsx +++ b/src/components/exchange/AddExchangeDialog/AddExchangeDialog.jsx @@ -5,9 +5,9 @@ import { Translate } from 'react-redux-i18n' import ModalDialog from 'components/dialogs/ModalDialog' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' +import ExchangeOrderModel from '@chronobank/core/models/exchange/ExchangeOrderModel' import React, { PureComponent } from 'react' -import { createExchange } from 'redux/exchange/actions' +import { createExchange } from '@chronobank/core/redux/exchange/actions' import { modalsClose } from 'redux/modals/actions' import AddExchangeForm, { prefix } from './AddExchangeForm' diff --git a/src/components/exchange/AddExchangeDialog/AddExchangeForm.jsx b/src/components/exchange/AddExchangeDialog/AddExchangeForm.jsx index 522ed8a29..3cae26c60 100644 --- a/src/components/exchange/AddExchangeDialog/AddExchangeForm.jsx +++ b/src/components/exchange/AddExchangeDialog/AddExchangeForm.jsx @@ -6,16 +6,16 @@ import { Button, TokenValue } from 'components' import BigNumber from 'bignumber.js' import classnames from 'classnames' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import TokensCollection from 'models/tokens/TokensCollection' +import ExchangeOrderModel from '@chronobank/core/models/exchange/ExchangeOrderModel' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import { DUCK_MAIN_WALLET } from 'redux/mainWallet/actions' -import BalancesCollection from 'models/tokens/BalancesCollection' -import Amount from 'models/Amount' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import { DUCK_MAIN_WALLET } from '@chronobank/core/redux/mainWallet/actions' +import BalancesCollection from '@chronobank/core/models/tokens/BalancesCollection' +import Amount from '@chronobank/core/models/Amount' import { TextField } from 'redux-form-material-ui' import { Field, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable' import './AddExchangeForm.scss' diff --git a/src/components/exchange/AddExchangeDialog/TokenListSelector.jsx b/src/components/exchange/AddExchangeDialog/TokenListSelector.jsx index 8cca6e39f..5d5ae7d7d 100644 --- a/src/components/exchange/AddExchangeDialog/TokenListSelector.jsx +++ b/src/components/exchange/AddExchangeDialog/TokenListSelector.jsx @@ -7,8 +7,8 @@ import iconTokenDefaultSVG from 'assets/img/avaToken.svg' import classnames from 'classnames' import { Button, IPFSImage } from 'components' import { MenuItem, TextField } from 'material-ui' -import TokensCollection from 'models/tokens/TokensCollection' -import TokenModel from 'models/tokens/TokenModel' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' diff --git a/src/components/exchange/AddExchangeDialog/validate.js b/src/components/exchange/AddExchangeDialog/validate.js index 2e0d99c53..af191af66 100644 --- a/src/components/exchange/AddExchangeDialog/validate.js +++ b/src/components/exchange/AddExchangeDialog/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default function validate (values) { let buyPriceErrors = new ErrorList() diff --git a/src/components/exchange/BuyTokensDialog/BuyTokensDialog.jsx b/src/components/exchange/BuyTokensDialog/BuyTokensDialog.jsx index d8eedbef8..29483b304 100644 --- a/src/components/exchange/BuyTokensDialog/BuyTokensDialog.jsx +++ b/src/components/exchange/BuyTokensDialog/BuyTokensDialog.jsx @@ -4,22 +4,22 @@ */ import iconTokenDefaultSVG from 'assets/img/avaToken.svg' -import { DUCK_MAIN_WALLET } from 'redux/mainWallet/actions' +import { DUCK_MAIN_WALLET } from '@chronobank/core/redux/mainWallet/actions' import { IPFSImage } from 'components' import TokenValue from 'components/common/TokenValue/TokenValue' import ModalDialog from 'components/dialogs/ModalDialog' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import TokensCollection from 'models/tokens/TokensCollection' +import ExchangeOrderModel from '@chronobank/core/models/exchange/ExchangeOrderModel' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import PropTypes from 'prop-types' import React from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { exchange, getTokensAllowance } from 'redux/exchange/actions' +import { exchange, getTokensAllowance } from '@chronobank/core/redux/exchange/actions' import { modalsClose } from 'redux/modals/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import Amount from 'models/Amount' -import BalancesCollection from 'models/tokens/BalancesCollection' -import BalanceModel from 'models/tokens/BalanceModel' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import Amount from '@chronobank/core/models/Amount' +import BalancesCollection from '@chronobank/core/models/tokens/BalancesCollection' +import BalanceModel from '@chronobank/core/models/tokens/BalanceModel' import './BuyTokensDialog.scss' import BuyTokensForm from './BuyTokensForm' diff --git a/src/components/exchange/BuyTokensDialog/BuyTokensForm.jsx b/src/components/exchange/BuyTokensDialog/BuyTokensForm.jsx index 493b5c521..ecc768846 100644 --- a/src/components/exchange/BuyTokensDialog/BuyTokensForm.jsx +++ b/src/components/exchange/BuyTokensDialog/BuyTokensForm.jsx @@ -5,23 +5,23 @@ import { Button, IPFSImage } from 'components' import iconTokenDefaultSVG from 'assets/img/avaToken.svg' -import { DUCK_MAIN_WALLET } from 'redux/mainWallet/actions' +import { DUCK_MAIN_WALLET } from '@chronobank/core/redux/mainWallet/actions' import BigNumber from 'bignumber.js' import TokenValue from 'components/common/TokenValue/TokenValue' import Immutable from 'immutable' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import TokensCollection from 'models/tokens/TokensCollection' +import ExchangeOrderModel from '@chronobank/core/models/exchange/ExchangeOrderModel' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import PropTypes from 'prop-types' import React from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { TextField } from 'redux-form-material-ui' import { change, Field, formPropTypes, formValueSelector, isInvalid, reduxForm } from 'redux-form/immutable' -import { approveTokensForExchange, getTokensAllowance } from 'redux/exchange/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import BalancesCollection from 'models/tokens/BalancesCollection' -import TokenModel from 'models/tokens/TokenModel' -import Amount from 'models/Amount' +import { approveTokensForExchange, getTokensAllowance } from '@chronobank/core/redux/exchange/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import BalancesCollection from '@chronobank/core/models/tokens/BalancesCollection' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import Amount from '@chronobank/core/models/Amount' import './BuyTokensDialog.scss' import validate from './validate' diff --git a/src/components/exchange/BuyTokensDialog/validate.js b/src/components/exchange/BuyTokensDialog/validate.js index f18cb60ac..934138547 100644 --- a/src/components/exchange/BuyTokensDialog/validate.js +++ b/src/components/exchange/BuyTokensDialog/validate.js @@ -4,7 +4,7 @@ */ import BigNumber from 'bignumber.js' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' import ErrorList from 'platform/ErrorList' export default function validate (values, props) { diff --git a/src/components/exchange/ExchangeTransferDialog/ExchangeDepositForm.jsx b/src/components/exchange/ExchangeTransferDialog/ExchangeDepositForm.jsx index 88450bf5b..eba74ac19 100644 --- a/src/components/exchange/ExchangeTransferDialog/ExchangeDepositForm.jsx +++ b/src/components/exchange/ExchangeTransferDialog/ExchangeDepositForm.jsx @@ -9,9 +9,9 @@ import PropTypes from 'prop-types' import React from 'react' import { Translate } from 'react-redux-i18n' import { TextField } from 'redux-form-material-ui' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { Field, formPropTypes, reduxForm } from 'redux-form/immutable' -import Amount from 'models/Amount' +import Amount from '@chronobank/core/models/Amount' import './ExchangeTransferDialog.scss' import styles from './styles' import validate from './validate' diff --git a/src/components/exchange/ExchangeTransferDialog/ExchangeTransferDialog.jsx b/src/components/exchange/ExchangeTransferDialog/ExchangeTransferDialog.jsx index 18bd4e624..5ea85287a 100644 --- a/src/components/exchange/ExchangeTransferDialog/ExchangeTransferDialog.jsx +++ b/src/components/exchange/ExchangeTransferDialog/ExchangeTransferDialog.jsx @@ -4,19 +4,19 @@ */ import ModalDialog from 'components/dialogs/ModalDialog' -import ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import TokenModel from 'models/tokens/TokenModel' -import MainWallet from 'models/wallet/MainWalletModel' +import ExchangeOrderModel from '@chronobank/core/models/exchange/ExchangeOrderModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import MainWallet from '@chronobank/core/models/wallet/MainWalletModel' import PropTypes from 'prop-types' import React from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { withdrawFromExchange } from 'redux/exchange/actions' -import { DUCK_MAIN_WALLET, mainTransfer } from 'redux/mainWallet/actions' -import TokensCollection from 'models/tokens/TokensCollection' -import Amount from 'models/Amount' +import { withdrawFromExchange } from '@chronobank/core/redux/exchange/actions' +import { DUCK_MAIN_WALLET, mainTransfer } from '@chronobank/core/redux/mainWallet/actions' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import Amount from '@chronobank/core/models/Amount' import { modalsClose } from 'redux/modals/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import ExchangeDepositForm from './ExchangeDepositForm' import './ExchangeTransferDialog.scss' diff --git a/src/components/exchange/ExchangeTransferDialog/validate.js b/src/components/exchange/ExchangeTransferDialog/validate.js index 2a5e7e2d2..d67e19974 100644 --- a/src/components/exchange/ExchangeTransferDialog/validate.js +++ b/src/components/exchange/ExchangeTransferDialog/validate.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' import ErrorList from 'platform/ErrorList' export default function validate (values, props) { diff --git a/src/components/exchange/ExchangeWidget/ExchangeWidget.jsx b/src/components/exchange/ExchangeWidget/ExchangeWidget.jsx index df8e4da76..b93c6ce73 100644 --- a/src/components/exchange/ExchangeWidget/ExchangeWidget.jsx +++ b/src/components/exchange/ExchangeWidget/ExchangeWidget.jsx @@ -15,7 +15,7 @@ import { SelectField, TextField } from 'redux-form-material-ui' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' import { modalsOpen } from 'redux/modals/actions' -import { DUCK_EXCHANGE, search } from 'redux/exchange/actions' +import { DUCK_EXCHANGE, search } from '@chronobank/core/redux/exchange/actions' import AddExchangeDialog from 'components/exchange/AddExchangeDialog/AddExchangeDialog' import validate from './validate' diff --git a/src/components/exchange/ExchangeWidget/validate.js b/src/components/exchange/ExchangeWidget/validate.js index 871996ad2..148ba927f 100644 --- a/src/components/exchange/ExchangeWidget/validate.js +++ b/src/components/exchange/ExchangeWidget/validate.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' import ErrorList from 'platform/ErrorList' export default function validate (values) { diff --git a/src/components/exchange/ExchangesTable/ExchangesTable.jsx b/src/components/exchange/ExchangesTable/ExchangesTable.jsx index 95f446291..5d4ccbd5b 100644 --- a/src/components/exchange/ExchangesTable/ExchangesTable.jsx +++ b/src/components/exchange/ExchangesTable/ExchangesTable.jsx @@ -9,17 +9,17 @@ import TokenValue from 'components/common/TokenValue/TokenValue' import BuyTokensDialog from 'components/exchange/BuyTokensDialog/BuyTokensDialog' import Immutable from 'immutable' import { Toggle } from 'material-ui' -import type ExchangeOrderModel from 'models/exchange/ExchangeOrderModel' -import ExchangesCollection from 'models/exchange/ExchangesCollection' +import type ExchangeOrderModel from '@chronobank/core/models/exchange/ExchangeOrderModel' +import ExchangesCollection from '@chronobank/core/models/exchange/ExchangesCollection' import PropTypes from 'prop-types' import React from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import Amount from 'models/Amount' -import { DUCK_EXCHANGE, getNextPage } from 'redux/exchange/actions' +import Amount from '@chronobank/core/models/Amount' +import { DUCK_EXCHANGE, getNextPage } from '@chronobank/core/redux/exchange/actions' import { modalsOpen } from 'redux/modals/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import './ExchangesTable.scss' import ExchangeTransferDialog from '../ExchangeTransferDialog/ExchangeTransferDialog' diff --git a/src/components/forms/EditManagersBaseForm/EditManagersBaseForm.js b/src/components/forms/EditManagersBaseForm/EditManagersBaseForm.js index 7e596b246..91d8ab32f 100644 --- a/src/components/forms/EditManagersBaseForm/EditManagersBaseForm.js +++ b/src/components/forms/EditManagersBaseForm/EditManagersBaseForm.js @@ -4,14 +4,14 @@ */ import Button from 'components/common/ui/Button/Button' -import OwnerCollection from 'models/wallet/OwnerCollection' +import OwnerCollection from '@chronobank/core/models/wallet/OwnerCollection' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { TextField } from 'redux-form-material-ui' import { Field, formPropTypes, reduxForm } from 'redux-form/immutable' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import './EditManagersBaseForm.scss' import ManagerItem from './ManagerItem' diff --git a/src/components/forms/EditManagersBaseForm/ManagerItem.js b/src/components/forms/EditManagersBaseForm/ManagerItem.js index 7ca91b2f8..7ef16ee6e 100644 --- a/src/components/forms/EditManagersBaseForm/ManagerItem.js +++ b/src/components/forms/EditManagersBaseForm/ManagerItem.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import OwnerModel from 'models/wallet/OwnerModel' +import OwnerModel from '@chronobank/core/models/wallet/OwnerModel' import UserIcon from 'components/common/HashedIcon/UserIcon' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' diff --git a/src/components/forms/EditManagersBaseForm/validate.js b/src/components/forms/EditManagersBaseForm/validate.js index b5ecb3fe5..6d770c935 100644 --- a/src/components/forms/EditManagersBaseForm/validate.js +++ b/src/components/forms/EditManagersBaseForm/validate.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import validator from 'models/validator' +import validator from '@chronobank/core/models/validator' import ErrorList from 'platform/ErrorList' export default function (values) { diff --git a/src/components/locs/LOCItem/LOCItemButtons.js b/src/components/locs/LOCItem/LOCItemButtons.js index 7d15a495f..91b56f205 100644 --- a/src/components/locs/LOCItem/LOCItemButtons.js +++ b/src/components/locs/LOCItem/LOCItemButtons.js @@ -8,13 +8,13 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import LOCModel from 'models/LOCModel' +import LOCModel from '@chronobank/core/models/LOCModel' import { modalsOpen } from 'redux/modals/actions' import LOCDialog from 'components/dialogs/LOC/LOCDialog/LOCDialog' import LOCIssueDialog from 'components/dialogs/LOC/LOCIssueDialog/LOCIssueDialog' import LOCRedeemDialog from 'components/dialogs/LOC/LOCRedeemDialog/LOCRedeemDialog' import LOCStatusDialog from 'components/dialogs/LOC/LOCStatusDialog/LOCStatusDialog' -import IPFS from 'utils/IPFS' +import IPFS from '@chronobank/core/utils/IPFS' import './LOCItem.scss' const mapDispatchToProps = (dispatch) => ({ diff --git a/src/components/locs/PageTitle.js b/src/components/locs/PageTitle.js index 5bee2df34..e9e0b45e7 100644 --- a/src/components/locs/PageTitle.js +++ b/src/components/locs/PageTitle.js @@ -8,12 +8,12 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import lhtDAO from 'dao/LHTDAO' +import lhtDAO from '@chronobank/core/dao/LHTDAO' import { modalsOpen } from 'redux/modals/actions' import LOCDialog from 'components/dialogs/LOC/LOCDialog/LOCDialog' import SendToExchangeDialog from 'components/dialogs/LOC/LOCSendToExchangeDialog/SendToExchangeDialog' -import LOCModel from 'models/LOCModel' -import Amount from 'models/Amount' +import LOCModel from '@chronobank/core/models/LOCModel' +import Amount from '@chronobank/core/models/Amount' import globalStyles from '../../styles' import './styles.scss' diff --git a/src/components/locs/Search.js b/src/components/locs/Search.js index 610fcfd6b..12a33e961 100644 --- a/src/components/locs/Search.js +++ b/src/components/locs/Search.js @@ -9,7 +9,7 @@ import React, { PureComponent } from 'react' import TextField from 'material-ui/TextField' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import { updateLOCFilter } from 'redux/locs/actions' +import { updateLOCFilter } from '@chronobank/core/redux/locs/actions' const mapStateToProps = (state) => ({ filter: state.get('locs').filter diff --git a/src/components/operations/Operations.jsx b/src/components/operations/Operations.jsx index 4efbd7dd4..b2671c20e 100644 --- a/src/components/operations/Operations.jsx +++ b/src/components/operations/Operations.jsx @@ -11,10 +11,10 @@ import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { getBlockExplorerUrl } from '@chronobank/login/network/settings' import { connect } from 'react-redux' -import { confirmOperation, listOperations, loadMoreCompletedOperations, revokeOperation, setupOperationsSettings } from 'redux/operations/actions' +import { confirmOperation, listOperations, loadMoreCompletedOperations, revokeOperation, setupOperationsSettings } from '@chronobank/core/redux/operations/actions' import { modalsOpen } from 'redux/modals/actions' import OperationsSettingsDialog from 'components/dialogs/OperationsSettingsDialog' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' import Value from 'components/common/Value/Value' import './Operations.scss' diff --git a/src/components/settings/CBEAddresses.jsx b/src/components/settings/CBEAddresses.jsx index 3ac44dce6..48c655899 100644 --- a/src/components/settings/CBEAddresses.jsx +++ b/src/components/settings/CBEAddresses.jsx @@ -9,8 +9,8 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import CBEModel from 'models/CBEModel' -import { listCBE, revokeCBE } from 'redux/settings/user/cbe/actions' +import CBEModel from '@chronobank/core/models/CBEModel' +import { listCBE, revokeCBE } from '@chronobank/core/redux/settings/user/cbe/actions' import { modalsOpen } from 'redux/modals/actions' import CBEAddressDialog from 'components/dialogs/CBEAddressDialog' import IPFSImage from 'components/common/IPFSImage/IPFSImage' diff --git a/src/components/settings/Tokens.jsx b/src/components/settings/Tokens.jsx index c0cacbda4..7908752d1 100644 --- a/src/components/settings/Tokens.jsx +++ b/src/components/settings/Tokens.jsx @@ -7,14 +7,14 @@ import { Button } from 'components' import IPFSImage from 'components/common/IPFSImage/IPFSImage' import CBETokenDialog from 'components/dialogs/CBETokenDialog/CBETokenDialog' import { FlatButton, FontIcon } from 'material-ui' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { modalsOpen } from 'redux/modals/actions' -import { revokeToken } from 'redux/settings/erc20/tokens/actions' -import { getChronobankTokens } from 'redux/settings/erc20/tokens/selectors' +import { revokeToken } from '@chronobank/core/redux/settings/erc20/tokens/actions' +import { getChronobankTokens } from '@chronobank/core/redux/settings/erc20/tokens/selectors' import Preloader from 'components/common/Preloader/Preloader' import './Tokens.scss' diff --git a/src/components/wallet/AddWalletWidget/AddWalletWidget.jsx b/src/components/wallet/AddWalletWidget/AddWalletWidget.jsx index 26dccb5fb..12d6efc9b 100644 --- a/src/components/wallet/AddWalletWidget/AddWalletWidget.jsx +++ b/src/components/wallet/AddWalletWidget/AddWalletWidget.jsx @@ -8,11 +8,11 @@ import React, { PureComponent } from 'react' import { change, formValueSelector } from 'redux-form/immutable' import { connect } from 'react-redux' import { BLOCKCHAIN_BITCOIN, BLOCKCHAIN_LITECOIN } from '@chronobank/login/network/BitcoinProvider' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import { BLOCKCHAIN_NEM } from 'dao/NemDAO' -import { BLOCKCHAIN_WAVES } from 'dao/WavesDAO' +import { BLOCKCHAIN_WAVES } from '@chronobank/core/dao/WavesDAO' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' +import { BLOCKCHAIN_NEM } from '@chronobank/core/dao/NemDAO' import WidgetContainer from 'components/WidgetContainer/WidgetContainer' -import { FORM_ADD_NEW_WALLET } from 'redux/mainWallet/actions' +import { FORM_ADD_NEW_WALLET } from '@chronobank/core/redux/mainWallet/actions' import './AddWalletWidget.scss' import SelectWalletType from './SelectWalletType/SelectWalletType' diff --git a/src/components/wallet/AddWalletWidget/CustomWalletForm/CustomWalletForm.jsx b/src/components/wallet/AddWalletWidget/CustomWalletForm/CustomWalletForm.jsx index 90611714e..8eac6dc8c 100644 --- a/src/components/wallet/AddWalletWidget/CustomWalletForm/CustomWalletForm.jsx +++ b/src/components/wallet/AddWalletWidget/CustomWalletForm/CustomWalletForm.jsx @@ -11,10 +11,10 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { TextField } from 'redux-form-material-ui' import { Field, FieldArray, formPropTypes, reduxForm } from 'redux-form/immutable' -import { createNewChildAddress, ETH, goToWallets, resetWalletsForm } from 'redux/mainWallet/actions' -import { getChronobankTokens } from 'redux/settings/erc20/tokens/selectors' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import TokenModel from 'models/tokens/TokenModel' +import { createNewChildAddress, ETH, goToWallets, resetWalletsForm } from '@chronobank/core/redux/mainWallet/actions' +import { getChronobankTokens } from '@chronobank/core/redux/settings/erc20/tokens/selectors' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { prefix } from './lang' import './CusotmWalletForm.scss' import TokensList from './TokensList' diff --git a/src/components/wallet/AddWalletWidget/CustomWalletForm/TokensList.jsx b/src/components/wallet/AddWalletWidget/CustomWalletForm/TokensList.jsx index 7df9b6ecf..0329a094a 100644 --- a/src/components/wallet/AddWalletWidget/CustomWalletForm/TokensList.jsx +++ b/src/components/wallet/AddWalletWidget/CustomWalletForm/TokensList.jsx @@ -8,8 +8,8 @@ import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Toggle } from 'redux-form-material-ui' import { Field } from 'redux-form/immutable' -import { getChronobankTokens } from 'redux/settings/erc20/tokens/selectors' -import TokenModel from 'models/tokens/TokenModel' +import { getChronobankTokens } from '@chronobank/core/redux/settings/erc20/tokens/selectors' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import IPFSImage from 'components/common/IPFSImage/IPFSImage' import { TOKEN_ICONS } from 'assets' diff --git a/src/components/wallet/AddWalletWidget/MultisigWalletForm/MultisigWalletForm.jsx b/src/components/wallet/AddWalletWidget/MultisigWalletForm/MultisigWalletForm.jsx index 2f3079e4f..c6687eff1 100644 --- a/src/components/wallet/AddWalletWidget/MultisigWalletForm/MultisigWalletForm.jsx +++ b/src/components/wallet/AddWalletWidget/MultisigWalletForm/MultisigWalletForm.jsx @@ -6,18 +6,18 @@ import OwnersList from 'components/wallet/OwnersList/OwnersList' import SignaturesList from 'components/wallet/SignaturesList/SignaturesList' import Button from 'components/common/ui/Button/Button' -import { createWallet } from 'redux/multisigWallet/actions' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' +import { createWallet } from '@chronobank/core/redux/multisigWallet/actions' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' import { TextField } from 'redux-form-material-ui' -import OwnerCollection from 'models/wallet/OwnerCollection' -import OwnerModel from 'models/wallet/OwnerModel' +import OwnerCollection from '@chronobank/core/models/wallet/OwnerCollection' +import OwnerModel from '@chronobank/core/models/wallet/OwnerModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { change, Field, FieldArray, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable' -import { goToWallets, resetWalletsForm } from 'redux/mainWallet/actions' -import { DUCK_SESSION } from 'redux/session/actions' +import { goToWallets, resetWalletsForm } from '@chronobank/core/redux/mainWallet/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import { prefix } from './lang' import validate from './validate' import './MultisigWalletForm.scss' diff --git a/src/components/wallet/AddWalletWidget/MultisigWalletForm/validate.js b/src/components/wallet/AddWalletWidget/MultisigWalletForm/validate.js index 7b3a8288d..ffab0d420 100644 --- a/src/components/wallet/AddWalletWidget/MultisigWalletForm/validate.js +++ b/src/components/wallet/AddWalletWidget/MultisigWalletForm/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default (values, props) => { const requiredSignatures = values.get('requiredSignatures') diff --git a/src/components/wallet/AddWalletWidget/SelectEthWallet/SelectEthWallet.jsx b/src/components/wallet/AddWalletWidget/SelectEthWallet/SelectEthWallet.jsx index e57ce49cb..15a90bf10 100644 --- a/src/components/wallet/AddWalletWidget/SelectEthWallet/SelectEthWallet.jsx +++ b/src/components/wallet/AddWalletWidget/SelectEthWallet/SelectEthWallet.jsx @@ -8,8 +8,8 @@ import classnames from 'classnames' import { connect } from 'react-redux' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' -import { createNewChildAddress, goToWallets, resetWalletsForm } from 'redux/mainWallet/actions' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import { createNewChildAddress, goToWallets, resetWalletsForm } from '@chronobank/core/redux/mainWallet/actions' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' import './SelectEthWallet.scss' import { prefix } from '../lang' diff --git a/src/components/wallet/AddWalletWidget/SelectWalletType/SelectWalletType.jsx b/src/components/wallet/AddWalletWidget/SelectWalletType/SelectWalletType.jsx index eaeaa92da..b7e8e5062 100644 --- a/src/components/wallet/AddWalletWidget/SelectWalletType/SelectWalletType.jsx +++ b/src/components/wallet/AddWalletWidget/SelectWalletType/SelectWalletType.jsx @@ -11,10 +11,10 @@ import { Translate } from 'react-redux-i18n' import { IPFSImage } from 'components' import { TOKEN_ICONS } from 'assets' import { BLOCKCHAIN_BITCOIN, BLOCKCHAIN_LITECOIN } from '@chronobank/login/network/BitcoinProvider' -import { BTC, createNewChildAddress, ETH, goToWallets, LTC, resetWalletsForm, XEM, WAVES } from 'redux/mainWallet/actions' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import { BLOCKCHAIN_NEM } from 'dao/NemDAO' -import { BLOCKCHAIN_WAVES } from 'dao/WavesDAO' +import { BTC, createNewChildAddress, ETH, goToWallets, LTC, resetWalletsForm, XEM, WAVES } from '@chronobank/core/redux/mainWallet/actions' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' +import { BLOCKCHAIN_NEM } from '@chronobank/core/dao/NemDAO' +import { BLOCKCHAIN_WAVES } from '@chronobank/core/dao/WavesDAO' import './SelectWalletType.scss' import { prefix } from '../lang' diff --git a/src/components/wallet/AddWalletWidget/TimeLockedWalletForm/TimeLockedWalletForm.jsx b/src/components/wallet/AddWalletWidget/TimeLockedWalletForm/TimeLockedWalletForm.jsx index b68926b52..1125d77ae 100644 --- a/src/components/wallet/AddWalletWidget/TimeLockedWalletForm/TimeLockedWalletForm.jsx +++ b/src/components/wallet/AddWalletWidget/TimeLockedWalletForm/TimeLockedWalletForm.jsx @@ -3,18 +3,18 @@ * Licensed under the AGPL Version 3 license. */ import Button from 'components/common/ui/Button/Button' -import { createWallet } from 'redux/multisigWallet/actions' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' +import { createWallet } from '@chronobank/core/redux/multisigWallet/actions' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' import { DatePicker, TextField, TimePicker } from 'redux-form-material-ui' -import OwnerCollection from 'models/wallet/OwnerCollection' -import OwnerModel from 'models/wallet/OwnerModel' +import OwnerCollection from '@chronobank/core/models/wallet/OwnerCollection' +import OwnerModel from '@chronobank/core/models/wallet/OwnerModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { change, Field, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable' -import { goToWallets, resetWalletsForm } from 'redux/mainWallet/actions' -import { DUCK_SESSION } from 'redux/session/actions' +import { goToWallets, resetWalletsForm } from '@chronobank/core/redux/mainWallet/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import { prefix } from './lang' import './TimeLockedWalletForm.scss' diff --git a/src/components/wallet/AddWalletWidget/WalletSettingsForm/WalletSettingsForm.jsx b/src/components/wallet/AddWalletWidget/WalletSettingsForm/WalletSettingsForm.jsx index 47211ccd8..d74fd8696 100644 --- a/src/components/wallet/AddWalletWidget/WalletSettingsForm/WalletSettingsForm.jsx +++ b/src/components/wallet/AddWalletWidget/WalletSettingsForm/WalletSettingsForm.jsx @@ -11,10 +11,10 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { Field, formPropTypes, reduxForm } from 'redux-form/immutable' import ModalDialog from 'components/dialogs/ModalDialog' -import { setMultisigWalletName } from 'redux/multisigWallet/actions' +import { setMultisigWalletName } from '@chronobank/core/redux/multisigWallet/actions' import { modalsClose } from 'redux/modals/actions' -import { WALLET_SET_NAME } from 'redux/mainWallet/actions' -import { PTWallet } from 'redux/wallet/types' +import { WALLET_SET_NAME } from '@chronobank/core/redux/mainWallet/actions' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import { prefix } from './lang' import './WalletSettingsForm.scss' diff --git a/src/components/wallet/LockedWallet/LockedWallet.jsx b/src/components/wallet/LockedWallet/LockedWallet.jsx new file mode 100644 index 000000000..835f1fa80 --- /dev/null +++ b/src/components/wallet/LockedWallet/LockedWallet.jsx @@ -0,0 +1,136 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +import PropTypes from 'prop-types' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' +import React, { PureComponent } from 'react' +import { connect } from 'react-redux' +import { Translate } from 'react-redux-i18n' +import { TOKEN_ICONS } from 'assets' +import Button from '../../common/ui/Button/Button' +import IPFSImage from '../../common/IPFSImage/IPFSImage' + +import './LockedWallet.scss' + +function mapStateToProps (state, props) { + + return { + + } +} + +function mapDispatchToProps (dispatch, props) { + return { + + } +} + +@connect(mapStateToProps, mapDispatchToProps) +export default class LockedWallet extends PureComponent { + static propTypes = { + token: PropTypes.instanceOf(TokenModel), + } + + + render () { + const { token } = this.props + + + return ( + +
+
+
settings
+
+
+
+
people
+
+
+
wallet
+
+
+
+
+

My Locked Wallet

+ + 1Q1pE5vPGEEMqRcVRMbtBK842Y6Pzo6nK9 + +
+
+
+ USD 121,600.00 +
+
+
+
+ + ETH 21.00, +3 more + +
+
+ Show All +
+
+
+
+
+
+ +
+
+ ETH 10.00 +
+
+ USD 10,000.00 +
+
+
+
+ +
+
+ ETH 10.00 +
+
+ USD 10,000.00 +
+
+
+
+
+ + Unlocks on 23 Feb 2018 + +
+
+
+
+
+
+
+
+
+
+
+ ) + } +} diff --git a/src/components/wallet/OwnersList/OwnersList.jsx b/src/components/wallet/OwnersList/OwnersList.jsx index 08e733038..0baac1c04 100644 --- a/src/components/wallet/OwnersList/OwnersList.jsx +++ b/src/components/wallet/OwnersList/OwnersList.jsx @@ -11,7 +11,7 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { TextField } from 'redux-form-material-ui' import { change, Field, formValueSelector, getFormSyncErrors } from 'redux-form/immutable' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import { prefix } from './lang' import './OwnersList.scss' import validate from './validate' diff --git a/src/components/wallet/OwnersList/validate.js b/src/components/wallet/OwnersList/validate.js index fe08c8bb8..68c6d0a67 100644 --- a/src/components/wallet/OwnersList/validate.js +++ b/src/components/wallet/OwnersList/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default (value, values, props) => { if (!value) { diff --git a/src/components/wallet/OwnersListWidget/OwnersListWidget.jsx b/src/components/wallet/OwnersListWidget/OwnersListWidget.jsx index f8b95f36a..5236ecaad 100644 --- a/src/components/wallet/OwnersListWidget/OwnersListWidget.jsx +++ b/src/components/wallet/OwnersListWidget/OwnersListWidget.jsx @@ -6,9 +6,9 @@ import PropTypes from 'prop-types' import { Translate } from 'react-redux-i18n' import React, { PureComponent } from 'react' -import TokensCollection from 'models/tokens/TokensCollection' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import Preloader from 'components/common/Preloader/Preloader' -import { PTWallet } from 'redux/wallet/types' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import { prefix } from './lang' import './OwnersListWidget.scss' diff --git a/src/components/wallet/PendingTxWidget/PendingTxWidget.jsx b/src/components/wallet/PendingTxWidget/PendingTxWidget.jsx index d8743ac5d..4b7a40771 100644 --- a/src/components/wallet/PendingTxWidget/PendingTxWidget.jsx +++ b/src/components/wallet/PendingTxWidget/PendingTxWidget.jsx @@ -9,19 +9,19 @@ import { Button, TokenValue } from 'components' import React, { PureComponent } from 'react' import classnames from 'classnames' import { connect } from 'react-redux' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import TokensCollection from 'models/tokens/TokensCollection' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' import Preloader from 'components/common/Preloader/Preloader' -import MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel' -import Amount from 'models/Amount' -import { confirmMultisigTx, getPendingData, revokeMultisigTx } from 'redux/multisigWallet/actions' +import MultisigWalletPendingTxModel from '@chronobank/core/models/wallet/MultisigWalletPendingTxModel' +import Amount from '@chronobank/core/models/Amount' +import { confirmMultisigTx, getPendingData, revokeMultisigTx } from '@chronobank/core/redux/multisigWallet/actions' import { DUCK_I18N } from 'redux/i18n/actions' import { modalsOpen } from 'redux/modals/actions' import TwoFaConfirmModal from 'components/wallet/TwoFaConfirmModal/TwoFaConfirmModal' -import DerivedWalletModel from 'models/wallet/DerivedWalletModel' -import { getMultisigWallets } from 'redux/wallet/selectors/models' -import { PTWallet } from 'redux/wallet/types' +import DerivedWalletModel from '@chronobank/core/models/wallet/DerivedWalletModel' +import { getMultisigWallets } from '@chronobank/core/redux/wallet/selectors/models' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import { prefix } from './lang' import './PendingTxWidget.scss' diff --git a/src/components/wallet/SubIconForWallet/SubIconForWallet.jsx b/src/components/wallet/SubIconForWallet/SubIconForWallet.jsx index 1d39386cb..6fe57187d 100644 --- a/src/components/wallet/SubIconForWallet/SubIconForWallet.jsx +++ b/src/components/wallet/SubIconForWallet/SubIconForWallet.jsx @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import { PTWallet } from 'redux/wallet/types' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import React, { PureComponent } from 'react' import './SubIconForWallet.scss' diff --git a/src/components/wallet/TokensListWidget/TokensListWidget.jsx b/src/components/wallet/TokensListWidget/TokensListWidget.jsx index 18a3a790b..420ee4206 100644 --- a/src/components/wallet/TokensListWidget/TokensListWidget.jsx +++ b/src/components/wallet/TokensListWidget/TokensListWidget.jsx @@ -8,14 +8,14 @@ import { Translate } from 'react-redux-i18n' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { TOKEN_ICONS } from 'assets' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import IPFSImage from 'components/common/IPFSImage/IPFSImage' import { integerWithDelimiter } from 'utils/formatter' -import TokensCollection from 'models/tokens/TokensCollection' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import { Button } from 'components' -import { mainWalletTokenBalanceWithPriceSelector } from 'redux/mainWallet/selectors' -import { multisigWalletTokenBalanceWithPriceSelector } from 'redux/multisigWallet/selectors' -import { PTWallet } from 'redux/wallet/types' +import { mainWalletTokenBalanceWithPriceSelector } from '@chronobank/core/redux/mainWallet/selectors' +import { multisigWalletTokenBalanceWithPriceSelector } from '@chronobank/core/redux/multisigWallet/selectors' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import { prefix } from './lang' import './TokensListWidget.scss' diff --git a/src/components/wallet/TransactionsListWidget/TransactionsListWidget.jsx b/src/components/wallet/TransactionsListWidget/TransactionsListWidget.jsx index 77b379550..a97338153 100644 --- a/src/components/wallet/TransactionsListWidget/TransactionsListWidget.jsx +++ b/src/components/wallet/TransactionsListWidget/TransactionsListWidget.jsx @@ -8,11 +8,11 @@ import { TransactionsTable } from 'components' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import React, { PureComponent } from 'react' -import TokensCollection from 'models/tokens/TokensCollection' -import { makeGetTxListForWallet } from 'redux/wallet/selectors' -import TransactionsCollection from 'models/wallet/TransactionsCollection' -import { formatDataAndGetTransactionsForWallet } from 'redux/mainWallet/actions' -import { PTWallet } from 'redux/wallet/types' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import { makeGetTxListForWallet } from '@chronobank/core/redux/wallet/selectors' +import TransactionsCollection from '@chronobank/core/models/wallet/TransactionsCollection' +import { formatDataAndGetTransactionsForWallet } from '@chronobank/core/redux/mainWallet/actions' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import { prefix } from './lang' import './TransactionsListWidget.scss' diff --git a/src/components/wallet/TwoFaConfirmModal/TwoFaConfirmModal.jsx b/src/components/wallet/TwoFaConfirmModal/TwoFaConfirmModal.jsx index 9930d1a14..72f57b78e 100644 --- a/src/components/wallet/TwoFaConfirmModal/TwoFaConfirmModal.jsx +++ b/src/components/wallet/TwoFaConfirmModal/TwoFaConfirmModal.jsx @@ -9,10 +9,10 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { TextField } from 'redux-form-material-ui' import { Field, formPropTypes, reduxForm, formValueSelector } from 'redux-form/immutable' -import { confirm2FATransfer, updatePendingTx } from 'redux/multisigWallet/actions' +import { confirm2FATransfer, updatePendingTx } from '@chronobank/core/redux/multisigWallet/actions' import PropTypes from 'prop-types' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' +import MultisigWalletPendingTxModel from '@chronobank/core/models/wallet/MultisigWalletPendingTxModel' import Preloader from 'components/common/Preloader/Preloader' import { modalsClose } from 'redux/modals/actions' import { prefix } from './lang' diff --git a/src/components/wallet/TwoFaConfirmModal/validate.js b/src/components/wallet/TwoFaConfirmModal/validate.js index 0c1dbf5ab..4c768696a 100644 --- a/src/components/wallet/TwoFaConfirmModal/validate.js +++ b/src/components/wallet/TwoFaConfirmModal/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default function validate (values) { let confirmTokenErrors = new ErrorList() diff --git a/src/components/wallet/TwoFaEnableForm/TwoFaEnableForm.jsx b/src/components/wallet/TwoFaEnableForm/TwoFaEnableForm.jsx index 3cf46786e..5b81f0830 100644 --- a/src/components/wallet/TwoFaEnableForm/TwoFaEnableForm.jsx +++ b/src/components/wallet/TwoFaEnableForm/TwoFaEnableForm.jsx @@ -10,15 +10,15 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { Checkbox, TextField } from 'redux-form-material-ui' import { change, Field, formPropTypes, formValueSelector, reduxForm } from 'redux-form/immutable' -import { goToWallets } from 'redux/mainWallet/actions' -import { confirm2FASecret, get2FAEncodedKey, MULTISIG_2_FA_CONFIRMED } from 'redux/multisigWallet/actions' +import { goToWallets } from '@chronobank/core/redux/mainWallet/actions' +import { confirm2FASecret, get2FAEncodedKey, MULTISIG_2_FA_CONFIRMED } from '@chronobank/core/redux/multisigWallet/actions' import PropTypes from 'prop-types' import TWO_FA_LOGO_PNG from 'assets/img/2fa/2-fa.png' import APPSTORE_SVG from 'assets/img/appstore.svg' import PLAY_SVG from 'assets/img/play.svg' import WidgetContainer from 'components/WidgetContainer/WidgetContainer' import Preloader from 'components/common/Preloader/Preloader' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import { prefix } from './lang' import validate from './validate' import './TwoFaEnableForm.scss' diff --git a/src/components/wallet/TwoFaEnableForm/validate.js b/src/components/wallet/TwoFaEnableForm/validate.js index 0c1dbf5ab..4c768696a 100644 --- a/src/components/wallet/TwoFaEnableForm/validate.js +++ b/src/components/wallet/TwoFaEnableForm/validate.js @@ -4,7 +4,7 @@ */ import ErrorList from 'platform/ErrorList' -import * as validator from 'models/validator' +import * as validator from '@chronobank/core/models/validator' export default function validate (values) { let confirmTokenErrors = new ErrorList() diff --git a/src/components/wallet/TwoFaWalletForm/TwoFaWalletForm.jsx b/src/components/wallet/TwoFaWalletForm/TwoFaWalletForm.jsx index a0bf63f45..9190c91f0 100644 --- a/src/components/wallet/TwoFaWalletForm/TwoFaWalletForm.jsx +++ b/src/components/wallet/TwoFaWalletForm/TwoFaWalletForm.jsx @@ -4,26 +4,26 @@ */ import { Button } from 'components' -import web3Converter from 'utils/Web3Converter' +import web3Converter from '@chronobank/core/utils/Web3Converter' import React, { PureComponent } from 'react' -import { getGasPriceMultiplier } from 'redux/session/selectors' +import { getGasPriceMultiplier } from '@chronobank/core/redux/session/selectors' import { push } from 'react-router-redux' import { change, Field, formValueSelector, reduxForm } from 'redux-form/immutable' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { Slider } from 'redux-form-material-ui' -import { FEE_RATE_MULTIPLIER, goToWallets } from 'redux/mainWallet/actions' +import { FEE_RATE_MULTIPLIER, goToWallets } from '@chronobank/core/redux/mainWallet/actions' import PropTypes from 'prop-types' import TWO_FA_LOGO_PNG from 'assets/img/2fa/2-fa.png' import TokenValue from 'components/common/TokenValue/TokenValue' import Preloader from 'components/common/Preloader/Preloader' -import { create2FAWallet, DUCK_MULTISIG_WALLET, estimateGasFor2FAForm, FORM_2FA_STEPS, FORM_2FA_WALLET } from 'redux/multisigWallet/actions' -import OwnerCollection from 'models/wallet/OwnerCollection' -import OwnerModel from 'models/wallet/OwnerModel' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' -import { getMarket } from 'redux/market/selectors' -import { DUCK_SESSION } from 'redux/session/actions' +import { create2FAWallet, DUCK_MULTISIG_WALLET, estimateGasFor2FAForm, FORM_2FA_STEPS, FORM_2FA_WALLET } from '@chronobank/core/redux/multisigWallet/actions' +import OwnerCollection from '@chronobank/core/models/wallet/OwnerCollection' +import OwnerModel from '@chronobank/core/models/wallet/OwnerModel' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' +import { getMarket } from '@chronobank/core/redux/market/selectors' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import { prefix } from './lang' import './TwoFaWalletForm.scss' diff --git a/src/components/wallet/WalletName/WalletName.jsx b/src/components/wallet/WalletName/WalletName.jsx index 5dbdc95ab..f6b9f9f40 100644 --- a/src/components/wallet/WalletName/WalletName.jsx +++ b/src/components/wallet/WalletName/WalletName.jsx @@ -5,7 +5,7 @@ import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' -import { PTWallet } from 'redux/wallet/types' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import { prefix } from './lang' export default class WalletName extends PureComponent { diff --git a/src/components/wallet/WalletPendingTransfers.jsx b/src/components/wallet/WalletPendingTransfers.jsx index ce3047a73..7be0b77d8 100644 --- a/src/components/wallet/WalletPendingTransfers.jsx +++ b/src/components/wallet/WalletPendingTransfers.jsx @@ -6,16 +6,16 @@ import { Button } from 'components' import Preloader from 'components/common/Preloader/Preloader' import { Paper } from 'material-ui' -import Amount from 'models/Amount' -import TokensCollection from 'models/tokens/TokensCollection' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import type MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel' +import Amount from '@chronobank/core/models/Amount' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' +import type MultisigWalletPendingTxModel from '@chronobank/core/models/wallet/MultisigWalletPendingTxModel' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { confirmMultisigTx, DUCK_MULTISIG_WALLET, getPendingData, revokeMultisigTx } from 'redux/multisigWallet/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { confirmMultisigTx, DUCK_MULTISIG_WALLET, getPendingData, revokeMultisigTx } from '@chronobank/core/redux/multisigWallet/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import './WalletPendingTransfers.scss' function mapStateToProps (state) { diff --git a/src/components/wallet/WalletWidget/WalletMainCoinBalance.jsx b/src/components/wallet/WalletWidget/WalletMainCoinBalance.jsx index 63d5872af..37d17756b 100644 --- a/src/components/wallet/WalletWidget/WalletMainCoinBalance.jsx +++ b/src/components/wallet/WalletWidget/WalletMainCoinBalance.jsx @@ -7,11 +7,11 @@ import PropTypes from 'prop-types' import { integerWithDelimiter } from 'utils/formatter' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { balanceSelector, mainWalletBalanceSelector } from 'redux/mainWallet/selectors' -import { multisigBalanceSelector, multisigWalletBalanceSelector } from 'redux/multisigWallet/selectors' -import { getMainSymbolForBlockchain } from 'redux/tokens/selectors' -import { getMarket } from 'redux/market/selectors' -import { PTWallet } from 'redux/wallet/types' +import { balanceSelector, mainWalletBalanceSelector } from '@chronobank/core/redux/mainWallet/selectors' +import { multisigBalanceSelector, multisigWalletBalanceSelector } from '@chronobank/core/redux/multisigWallet/selectors' +import { getMainSymbolForBlockchain } from '@chronobank/core/redux/tokens/selectors' +import { getMarket } from '@chronobank/core/redux/market/selectors' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import './WalletWidget.scss' function makeMapStateToProps (state, props) { diff --git a/src/components/wallet/WalletWidget/WalletTokensList.jsx b/src/components/wallet/WalletWidget/WalletTokensList.jsx index 79acd00ca..d24359517 100644 --- a/src/components/wallet/WalletWidget/WalletTokensList.jsx +++ b/src/components/wallet/WalletWidget/WalletTokensList.jsx @@ -9,15 +9,15 @@ import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import IPFSImage from 'components/common/IPFSImage/IPFSImage' import { TOKEN_ICONS } from 'assets' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import { integerWithDelimiter } from 'utils/formatter' -import { getMarket } from 'redux/market/selectors' -import { mainWalletTokenBalanceSelector } from 'redux/mainWallet/selectors' -import { multisigWalletTokenBalanceSelector } from 'redux/multisigWallet/selectors' +import { getMarket } from '@chronobank/core/redux/market/selectors' +import { mainWalletTokenBalanceSelector } from '@chronobank/core/redux/mainWallet/selectors' +import { multisigWalletTokenBalanceSelector } from '@chronobank/core/redux/multisigWallet/selectors' import TokenPrice from 'components/common/TokenPrice/TokenPrice' -import Amount from 'models/Amount' -import TokensCollection from 'models/tokens/TokensCollection' -import { PTWallet } from 'redux/wallet/types' +import Amount from '@chronobank/core/models/Amount' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import './WalletWidget.scss' import { prefix } from './lang' diff --git a/src/components/wallet/WalletWidget/WalletWidget.jsx b/src/components/wallet/WalletWidget/WalletWidget.jsx index b1f2ac269..18db1f19c 100644 --- a/src/components/wallet/WalletWidget/WalletWidget.jsx +++ b/src/components/wallet/WalletWidget/WalletWidget.jsx @@ -4,25 +4,25 @@ */ import PropTypes from 'prop-types' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { Link } from 'react-router' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { openSendForm, selectWallet } from 'redux/wallet/actions' +import { openSendForm, selectWallet } from '@chronobank/core/redux/wallet/actions' import { modalsOpen } from 'redux/modals/actions' import { Translate } from 'react-redux-i18n' import { TOKEN_ICONS } from 'assets' -import { DUCK_TOKENS } from 'redux/tokens/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' import Button from 'components/common/ui/Button/Button' import IPFSImage from 'components/common/IPFSImage/IPFSImage' import ReceiveTokenModal from 'components/dashboard/ReceiveTokenModal/ReceiveTokenModal' -import TokensCollection from 'models/tokens/TokensCollection' -import { getMainSymbolForBlockchain, getTokens } from 'redux/tokens/selectors' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' +import { getMainSymbolForBlockchain, getTokens } from '@chronobank/core/redux/tokens/selectors' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' import SendTokens from 'components/dashboard/SendTokens/SendTokens' import DepositTokensModal from 'components/dashboard/DepositTokens/DepositTokensModal' -import { PTWallet } from 'redux/wallet/types' -import { getAccount } from 'redux/session/selectors' +import { PTWallet } from '@chronobank/core/redux/wallet/types' +import { getAccount } from '@chronobank/core/redux/session/selectors' import './WalletWidget.scss' import { prefix } from './lang' import Moment from '../../common/Moment' diff --git a/src/components/wallet/WalletWidgetDetail/WalletWidgetDetail.jsx b/src/components/wallet/WalletWidgetDetail/WalletWidgetDetail.jsx index 806532110..af76b7817 100644 --- a/src/components/wallet/WalletWidgetDetail/WalletWidgetDetail.jsx +++ b/src/components/wallet/WalletWidgetDetail/WalletWidgetDetail.jsx @@ -4,7 +4,7 @@ */ import PropTypes from 'prop-types' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { modalsOpen } from 'redux/modals/actions' @@ -13,15 +13,15 @@ import { TOKEN_ICONS } from 'assets' import Button from 'components/common/ui/Button/Button' import IPFSImage from 'components/common/IPFSImage/IPFSImage' import ReceiveTokenModal from 'components/dashboard/ReceiveTokenModal/ReceiveTokenModal' -import { getMainTokenForWalletByBlockchain } from 'redux/tokens/selectors' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import { getMainTokenForWalletByBlockchain } from '@chronobank/core/redux/tokens/selectors' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' import SendTokens from 'components/dashboard/SendTokens/SendTokens' import DepositTokensModal from 'components/dashboard/DepositTokens/DepositTokensModal' import EditManagersDialog from 'components/dialogs/wallet/EditOwnersDialog/EditOwnersDialog' import EditSignaturesDialog from 'components/dialogs/wallet/EditSignaturesDialog/EditSignaturesDialog' import Moment from 'components/common/Moment' -import { openSendForm } from 'redux/wallet/actions' -import { PTWallet } from 'redux/wallet/types' +import { openSendForm } from '@chronobank/core/redux/wallet/actions' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import SubIconForWallet from '../SubIconForWallet/SubIconForWallet' import './WalletWidgetDetail.scss' import { prefix } from './lang' diff --git a/src/components/wallet/WalletWidgetMini/WalletTokensCount.jsx b/src/components/wallet/WalletWidgetMini/WalletTokensCount.jsx index c14bbf9ab..d1d7b94a2 100644 --- a/src/components/wallet/WalletWidgetMini/WalletTokensCount.jsx +++ b/src/components/wallet/WalletWidgetMini/WalletTokensCount.jsx @@ -6,9 +6,9 @@ import PropTypes from 'prop-types' import { Translate } from 'react-redux-i18n' import React, { PureComponent } from 'react' -import { tokensCountSelector } from 'redux/mainWallet/selectors' -import { multisigTokensCountSelector } from 'redux/multisigWallet/selectors' -import { PTWallet } from 'redux/wallet/types' +import { tokensCountSelector } from '@chronobank/core/redux/mainWallet/selectors' +import { multisigTokensCountSelector } from '@chronobank/core/redux/multisigWallet/selectors' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import { connect } from 'react-redux' import { prefix } from './lang' diff --git a/src/components/wallet/WalletWidgetMini/WalletWidgetMini.jsx b/src/components/wallet/WalletWidgetMini/WalletWidgetMini.jsx index 69111185d..0718fcdc9 100644 --- a/src/components/wallet/WalletWidgetMini/WalletWidgetMini.jsx +++ b/src/components/wallet/WalletWidgetMini/WalletWidgetMini.jsx @@ -4,20 +4,20 @@ */ import PropTypes from 'prop-types' -import TokenModel from 'models/tokens/TokenModel' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { Link } from 'react-router' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { selectWallet } from 'redux/wallet/actions' +import { selectWallet } from '@chronobank/core/redux/wallet/actions' import { modalsOpen } from 'redux/modals/actions' import { Translate } from 'react-redux-i18n' import { TOKEN_ICONS } from 'assets' import IPFSImage from 'components/common/IPFSImage/IPFSImage' -import { getMainSymbolForBlockchain, getTokens } from 'redux/tokens/selectors' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import { getMainSymbolForBlockchain, getTokens } from '@chronobank/core/redux/tokens/selectors' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' import SendTokens from 'components/dashboard/SendTokens/SendTokens' import TokenValueSimple from 'components/common/TokenValueSimple/TokenValueSimple' -import { PTWallet } from 'redux/wallet/types' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import './WalletWidgetMini.scss' import { prefix } from './lang' import SubIconForWallet from '../SubIconForWallet/SubIconForWallet' diff --git a/src/components/wallet/WalletWidgetMini/WalletWidgetMiniUsdAmount.jsx b/src/components/wallet/WalletWidgetMini/WalletWidgetMiniUsdAmount.jsx index a01bc2a3b..c007cea29 100644 --- a/src/components/wallet/WalletWidgetMini/WalletWidgetMiniUsdAmount.jsx +++ b/src/components/wallet/WalletWidgetMini/WalletWidgetMiniUsdAmount.jsx @@ -5,13 +5,13 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' -import { balanceSelector } from 'redux/mainWallet/selectors' -import { multisigBalanceSelector } from 'redux/multisigWallet/selectors' -import { getMainSymbolForBlockchain } from 'redux/tokens/selectors' -import { PTWallet } from 'redux/wallet/types' +import { balanceSelector } from '@chronobank/core/redux/mainWallet/selectors' +import { multisigBalanceSelector } from '@chronobank/core/redux/multisigWallet/selectors' +import { getMainSymbolForBlockchain } from '@chronobank/core/redux/tokens/selectors' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import { connect } from 'react-redux' import { integerWithDelimiter } from 'utils/formatter' -import { getMarket } from 'redux/market/selectors' +import { getMarket } from '@chronobank/core/redux/market/selectors' function makeMapStateToProps (state, ownProps) { const { wallet } = ownProps diff --git a/src/components/wallet/WalletWidgetMini/selectors.js b/src/components/wallet/WalletWidgetMini/selectors.js index 065d789ea..5c8093d80 100644 --- a/src/components/wallet/WalletWidgetMini/selectors.js +++ b/src/components/wallet/WalletWidgetMini/selectors.js @@ -4,12 +4,12 @@ */ import { createSelector, createSelectorCreator, defaultMemoize } from 'reselect' -import MainWalletModel from 'models/wallet/MainWalletModel' -import MultisigWalletCollection from 'models/wallet/MultisigWalletCollection' -import { getMainWallet, getMultisigWallets } from 'redux/wallet/selectors' -import BalanceModel from 'models/tokens/BalanceModel' -import { getMainSymbolForBlockchain } from 'redux/tokens/selectors' -import OwnerModel from 'models/wallet/OwnerModel' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' +import MultisigWalletCollection from '@chronobank/core/models/wallet/MultisigWalletCollection' +import { getMainWallet, getMultisigWallets } from '@chronobank/core/redux/wallet/selectors' +import BalanceModel from '@chronobank/core/models/tokens/BalanceModel' +import { getMainSymbolForBlockchain } from '@chronobank/core/redux/tokens/selectors' +import OwnerModel from '@chronobank/core/models/wallet/OwnerModel' // provides filtered list of addresses of MainWallets export const selectWallet = (blockchain, address) => createSelector( diff --git a/src/i18n/en-notices.js b/src/i18n/en-notices.js index dc91b860d..36b863959 100644 --- a/src/i18n/en-notices.js +++ b/src/i18n/en-notices.js @@ -10,7 +10,7 @@ import { MANAGER_REMOVED, USER_ADDED_TO_BLACKLIST, USER_DELETED_FROM_BLACKLIST, -} from 'models/notices/AssetsManagerNoticeModel' +} from '@chronobank/core/models/notices/AssetsManagerNoticeModel' export default { approval: { diff --git a/src/i18n/en.js b/src/i18n/en.js index 34b7559f5..a2dbaa45e 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -5,22 +5,22 @@ import { en as Login } from '@chronobank/login-ui/lang' import components from 'components/lang' -import * as assetDonator from 'dao/AssetDonatorDAO' -import * as erc20 from 'dao/ERC20DAO' -import * as erc20Manager from 'dao/ERC20ManagerDAO' -import * as eth from 'dao/EthereumDAO' +import * as assetDonator from '@chronobank/core/dao/AssetDonatorDAO' +import * as erc20 from '@chronobank/core/dao/ERC20DAO' +import * as erc20Manager from '@chronobank/core/dao/ERC20ManagerDAO' +import * as eth from '@chronobank/core/dao/EthereumDAO' import * as bitcoin from '@chronobank/login/network/BitcoinProvider' -import * as exchange from 'dao/ExchangeDAO' -import * as loc from 'dao/LOCManagerDAO' -import * as operations from 'dao/PendingManagerDAO' -import * as platformsManager from 'dao/PlatformsManagerDAO' -import * as pollInterface from 'dao/PollInterfaceDAO' -import * as rewards from 'dao/RewardsDAO' -import * as time from 'dao/AssetHolderDAO' -import * as user from 'dao/UserManagerDAO' +import * as exchange from '@chronobank/core/dao/ExchangeDAO' +import * as loc from '@chronobank/core/dao/LOCManagerDAO' +import * as operations from '@chronobank/core/dao/PendingManagerDAO' +import * as platformsManager from '@chronobank/core/dao/PlatformsManagerDAO' +import * as pollInterface from '@chronobank/core/dao/PollInterfaceDAO' +import * as rewards from '@chronobank/core/dao/RewardsDAO' +import * as time from '@chronobank/core/dao/AssetHolderDAO' +import * as user from '@chronobank/core/dao/UserManagerDAO' import layouts from 'layouts/lang' -import * as votingManager from 'dao/VotingManagerDAO' -import * as chronoBankAsset from 'dao/ChronoBankAssetDAO' +import * as votingManager from '@chronobank/core/dao/VotingManagerDAO' +import * as chronoBankAsset from '@chronobank/core/dao/ChronoBankAssetDAO' export default { copyright: 'Copyright © 2018 LaborX Pty Ltd. All Rights Reserved.', diff --git a/src/layouts/Markup.jsx b/src/layouts/Markup.jsx index c82973551..ab15d141f 100644 --- a/src/layouts/Markup.jsx +++ b/src/layouts/Markup.jsx @@ -12,8 +12,8 @@ import { IconButton, MuiThemeProvider } from 'material-ui' import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { connect } from 'react-redux' -import { closeNotifier, DUCK_NOTIFIER } from 'redux/notifier/actions' -import { DUCK_SESSION } from 'redux/session/actions' +import { closeNotifier, DUCK_NOTIFIER } from '@chronobank/core/redux/notifier/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import theme from 'styles/themes/default' import { DUCK_SIDES, SIDES_TOGGLE_MAIN_MENU } from 'redux/sides/actions' import { DUCK_MODALS } from 'redux/modals/actions' diff --git a/src/layouts/partials/DepositContent/DepositContent.jsx b/src/layouts/partials/DepositContent/DepositContent.jsx index c05e32a5c..a06a128b6 100644 --- a/src/layouts/partials/DepositContent/DepositContent.jsx +++ b/src/layouts/partials/DepositContent/DepositContent.jsx @@ -7,10 +7,10 @@ import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import { TIME } from 'redux/mainWallet/actions' -import { initAssetsHolder } from 'redux/assetsHolder/actions' -import { getDeposit } from 'redux/mainWallet/selectors' -import Amount from 'models/Amount' +import { TIME } from '@chronobank/core/redux/mainWallet/actions' +import { initAssetsHolder } from '@chronobank/core/redux/assetsHolder/actions' +import { getDeposit } from '@chronobank/core/redux/mainWallet/selectors' +import Amount from '@chronobank/core/models/Amount' import Deposit from 'components/Deposits/Deposit/Deposit' import { prefix } from './lang' import './DepositContent.scss' diff --git a/src/layouts/partials/DepositsContent/DepositsContent.jsx b/src/layouts/partials/DepositsContent/DepositsContent.jsx index cdd0af2b5..c8bc42515 100644 --- a/src/layouts/partials/DepositsContent/DepositsContent.jsx +++ b/src/layouts/partials/DepositsContent/DepositsContent.jsx @@ -7,10 +7,10 @@ import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import { TIME } from 'redux/mainWallet/actions' -import { initAssetsHolder } from 'redux/assetsHolder/actions' -import { getDeposit } from 'redux/mainWallet/selectors' -import Amount from 'models/Amount' +import { TIME } from '@chronobank/core/redux/mainWallet/actions' +import { initAssetsHolder } from '@chronobank/core/redux/assetsHolder/actions' +import { getDeposit } from '@chronobank/core/redux/mainWallet/selectors' +import Amount from '@chronobank/core/models/Amount' import DepositsList from 'components/Deposits/DepositsList/DepositsList' import { Button } from 'components' import { modalsOpen } from 'redux/modals/actions' diff --git a/src/layouts/partials/DrawerMainMenu/DrawerMainMenu.jsx b/src/layouts/partials/DrawerMainMenu/DrawerMainMenu.jsx index 87342c72c..4cd644337 100644 --- a/src/layouts/partials/DrawerMainMenu/DrawerMainMenu.jsx +++ b/src/layouts/partials/DrawerMainMenu/DrawerMainMenu.jsx @@ -12,11 +12,11 @@ import { Translate } from 'react-redux-i18n' import classnames from 'classnames' import { connect } from 'react-redux' import menu from 'menu' -import { multisigWalletsSelector } from 'redux/wallet/selectors' +import { multisigWalletsSelector } from '@chronobank/core/redux/wallet/selectors' import { drawerHide, drawerToggle } from 'redux/drawer/actions' -import { DUCK_SESSION, logout } from 'redux/session/actions' +import { DUCK_SESSION, logout } from '@chronobank/core/redux/session/actions' import chronWalletLogoSVG from 'assets/img/chronowallettext-white.svg' -import ProfileModel from 'models/ProfileModel' +import ProfileModel from '@chronobank/core/models/ProfileModel' import profileImgJPG from 'assets/img/profile-photo-1.jpg' import { IPFSImage } from 'components' import exitSvg from 'assets/img/exit-white.svg' diff --git a/src/layouts/partials/DrawerMainMenu/MenuAssetsManagerMoreInfo/MenuAssetsManagerMoreInfo.jsx b/src/layouts/partials/DrawerMainMenu/MenuAssetsManagerMoreInfo/MenuAssetsManagerMoreInfo.jsx index 48930a831..fcfb4f634 100644 --- a/src/layouts/partials/DrawerMainMenu/MenuAssetsManagerMoreInfo/MenuAssetsManagerMoreInfo.jsx +++ b/src/layouts/partials/DrawerMainMenu/MenuAssetsManagerMoreInfo/MenuAssetsManagerMoreInfo.jsx @@ -11,8 +11,8 @@ import PropTypes from 'prop-types' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import iconSvg from 'assets/img/icons/portfolio-white.svg' -import { getUserTokens } from 'redux/assetsManager/selectors' -import TokenModel from 'models/tokens/TokenModel' +import { getUserTokens } from '@chronobank/core/redux/assetsManager/selectors' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { IconButton } from 'material-ui' import { IPFSImage } from 'components' import { SIDES_TOGGLE_MAIN_MENU } from 'redux/sides/actions' diff --git a/src/layouts/partials/DrawerMainMenu/MenuTokenMoreInfo/MenuTokenMoreInfo.jsx b/src/layouts/partials/DrawerMainMenu/MenuTokenMoreInfo/MenuTokenMoreInfo.jsx index f083f1616..3a401a4f5 100644 --- a/src/layouts/partials/DrawerMainMenu/MenuTokenMoreInfo/MenuTokenMoreInfo.jsx +++ b/src/layouts/partials/DrawerMainMenu/MenuTokenMoreInfo/MenuTokenMoreInfo.jsx @@ -9,23 +9,23 @@ import { CopyIcon, IPFSImage, QRIcon } from 'components' import React, { PureComponent } from 'react' import PropTypes from 'prop-types' import { connect } from 'react-redux' -import { selectWallet } from 'redux/wallet/actions' -import { getToken } from 'redux/locs/selectors' -import TokenModel from 'models/tokens/TokenModel' +import { selectWallet } from '@chronobank/core/redux/wallet/actions' +import { getToken } from '@chronobank/core/redux/locs/selectors' +import TokenModel from '@chronobank/core/models/tokens/TokenModel' import { Translate } from 'react-redux-i18n' import { IconButton } from 'material-ui' import { TOKEN_ICONS } from 'assets' -import { getWalletAddress } from 'redux/mainWallet/selectors' -import AddressModel from 'models/wallet/AddressModel' +import { getWalletAddress } from '@chronobank/core/redux/mainWallet/selectors' +import AddressModel from '@chronobank/core/models/wallet/AddressModel' import walletLinkSvg from 'assets/img/icons/prev.svg' import copySvg from 'assets/img/icons/copy.svg' import qrSvg from 'assets/img/icons/qr.svg' -import { DUCK_MULTISIG_WALLET } from 'redux/multisigWallet/actions' -import MultisigWalletCollection from 'models/wallet/MultisigWalletCollection' -import { BLOCKCHAIN_ETHEREUM } from 'dao/EthereumDAO' +import { DUCK_MULTISIG_WALLET } from '@chronobank/core/redux/multisigWallet/actions' +import MultisigWalletCollection from '@chronobank/core/models/wallet/MultisigWalletCollection' +import { BLOCKCHAIN_ETHEREUM } from '@chronobank/core/dao/EthereumDAO' import { NETWORK_STATUS_OFFLINE, NETWORK_STATUS_ONLINE, NETWORK_STATUS_UNKNOWN, SYNC_STATUS_SYNCED, SYNC_STATUS_SYNCING } from '@chronobank/login/network/MonitorService' import { SIDES_TOGGLE_MAIN_MENU } from 'redux/sides/actions' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import './MenuTokenMoreInfo.scss' import { prefix } from './lang' diff --git a/src/layouts/partials/DrawerMainMenu/MenuTokensList/MenuTokensList.jsx b/src/layouts/partials/DrawerMainMenu/MenuTokensList/MenuTokensList.jsx index 02db05d0c..a4d6367ae 100644 --- a/src/layouts/partials/DrawerMainMenu/MenuTokensList/MenuTokensList.jsx +++ b/src/layouts/partials/DrawerMainMenu/MenuTokensList/MenuTokensList.jsx @@ -13,8 +13,8 @@ import { DUCK_MONITOR } from '@chronobank/login/redux/monitor/actions' import React, { PureComponent } from 'react' import { connect } from 'react-redux' import { drawerHide, drawerToggle } from 'redux/drawer/actions' -import { DUCK_SESSION, logout } from 'redux/session/actions' -import { getBlockchainAddressesList } from 'redux/session/selectors' +import { DUCK_SESSION, logout } from '@chronobank/core/redux/session/actions' +import { getBlockchainAddressesList } from '@chronobank/core/redux/session/selectors' import { SIDES_CLOSE_ALL, sidesPush } from 'redux/sides/actions' import MenuTokenMoreInfo, { MENU_TOKEN_MORE_INFO_PANEL_KEY } from '../MenuTokenMoreInfo/MenuTokenMoreInfo' import { prefix } from './lang' diff --git a/src/layouts/partials/DrawerPartial/DrawerPartial.jsx b/src/layouts/partials/DrawerPartial/DrawerPartial.jsx index 306c607e0..054a5fac6 100644 --- a/src/layouts/partials/DrawerPartial/DrawerPartial.jsx +++ b/src/layouts/partials/DrawerPartial/DrawerPartial.jsx @@ -12,7 +12,7 @@ import classnames from 'classnames' import { connect } from 'react-redux' import menu from 'menu' import { drawerToggle, drawerHide } from 'redux/drawer/actions' -import { logout } from 'redux/session/actions' +import { logout } from '@chronobank/core/redux/session/actions' import styles from '../styles' import './DrawerPartial.scss' diff --git a/src/layouts/partials/ExchangeContent/ExchangeContent.jsx b/src/layouts/partials/ExchangeContent/ExchangeContent.jsx index cda4220c5..1a7d6e3b7 100644 --- a/src/layouts/partials/ExchangeContent/ExchangeContent.jsx +++ b/src/layouts/partials/ExchangeContent/ExchangeContent.jsx @@ -8,7 +8,7 @@ import { Paper } from 'material-ui' import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import { watchExchanges } from 'redux/exchange/actions' +import { watchExchanges } from '@chronobank/core/redux/exchange/actions' import './ExchangeContent.scss' const mapDispatchToProps = (dispatch) => ({ diff --git a/src/layouts/partials/LOCContent/LOCContent.jsx b/src/layouts/partials/LOCContent/LOCContent.jsx index c3b8f8a73..167215539 100644 --- a/src/layouts/partials/LOCContent/LOCContent.jsx +++ b/src/layouts/partials/LOCContent/LOCContent.jsx @@ -8,8 +8,8 @@ import PropTypes from 'prop-types' import React, { PureComponent } from 'react' import { Translate } from 'react-redux-i18n' import { connect } from 'react-redux' -import type LOCModel from 'models/LOCModel' -import { getLOCs } from 'redux/locs/actions' +import type LOCModel from '@chronobank/core/models/LOCModel' +import { getLOCs } from '@chronobank/core/redux/locs/actions' import LOCItem from 'components/locs/LOCItem/LOCItem' import PageTitle from 'components/locs/PageTitle' import Search from 'components/locs/Search' diff --git a/src/layouts/partials/NotificationContent/NotificationContent.jsx b/src/layouts/partials/NotificationContent/NotificationContent.jsx index cf4687268..4e2aa35c3 100644 --- a/src/layouts/partials/NotificationContent/NotificationContent.jsx +++ b/src/layouts/partials/NotificationContent/NotificationContent.jsx @@ -6,16 +6,16 @@ import classnames from 'classnames' import { Translate } from 'react-redux-i18n' import PropTypes from 'prop-types' -import { DUCK_WATCHER } from 'redux/watcher/actions' -import { DUCK_NOTIFIER } from 'redux/notifier/actions' +import { DUCK_WATCHER } from '@chronobank/core/redux/watcher/actions' +import { DUCK_NOTIFIER } from '@chronobank/core/redux/notifier/actions' import Immutable from 'immutable' import { connect } from "react-redux" import React, { PureComponent } from 'react' import ReceivedTransactionSVG from 'assets/img/r-0.svg' import Value from 'components/common/Value/Value' -import AbstractNoticeModel from 'models/notices/AbstractNoticeModel' +import AbstractNoticeModel from '@chronobank/core/models/notices/AbstractNoticeModel' import Moment from 'components/common/Moment' -import { FULL_DATE } from 'models/constants' +import { FULL_DATE } from '@chronobank/core/models/constants' import { IconButton } from 'material-ui' import { SIDES_CLOSE_ALL } from 'redux/sides/actions' import { prefix } from './lang' diff --git a/src/layouts/partials/ProfileContent/ProfileContent.jsx b/src/layouts/partials/ProfileContent/ProfileContent.jsx index ae7c37cbd..4afffa3b1 100644 --- a/src/layouts/partials/ProfileContent/ProfileContent.jsx +++ b/src/layouts/partials/ProfileContent/ProfileContent.jsx @@ -7,11 +7,11 @@ import { Translate } from 'react-redux-i18n' import { connect } from "react-redux" import PropTypes from "prop-types" import { TOKEN_ICONS } from 'assets' -import ProfileModel from 'models/ProfileModel' +import ProfileModel from '@chronobank/core/models/ProfileModel' import networkService from '@chronobank/login/network/NetworkService' import React, { PureComponent } from 'react' -import { logout } from 'redux/session/actions' -import { getBlockchainAddressesList } from 'redux/session/selectors' +import { logout } from '@chronobank/core/redux/session/actions' +import { getBlockchainAddressesList } from '@chronobank/core/redux/session/selectors' import { FontIcon } from 'material-ui' import { modalsOpen } from 'redux/modals/actions' import { IPFSImage, QRIcon, PKIcon, CopyIcon, UpdateProfileDialog } from 'components' diff --git a/src/layouts/partials/RewardsContent/RewardsContent.jsx b/src/layouts/partials/RewardsContent/RewardsContent.jsx index cca50d420..04fe0919f 100644 --- a/src/layouts/partials/RewardsContent/RewardsContent.jsx +++ b/src/layouts/partials/RewardsContent/RewardsContent.jsx @@ -5,16 +5,16 @@ import { Button } from 'components' import RewardsPeriod from 'components/dashboard/RewardsPeriod/RewardsPeriod' -import RewardsCollection from 'models/rewards/RewardsCollection' -import RewardsCurrentPeriodModel from 'models/rewards/RewardsCurrentPeriodModel' +import RewardsCollection from '@chronobank/core/models/rewards/RewardsCollection' +import RewardsCurrentPeriodModel from '@chronobank/core/models/rewards/RewardsCurrentPeriodModel' import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { Link } from 'react-router' -import { DUCK_ASSETS_HOLDER } from 'redux/assetsHolder/actions' -import { closePeriod, DUCK_REWARDS, initRewards, withdrawRevenue } from 'redux/rewards/actions' -import { DUCK_SESSION } from 'redux/session/actions' +import { DUCK_ASSETS_HOLDER } from '@chronobank/core/redux/assetsHolder/actions' +import { closePeriod, DUCK_REWARDS, initRewards, withdrawRevenue } from '@chronobank/core/redux/rewards/actions' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' import './RewardsContent.scss' function prefix (token) { diff --git a/src/layouts/partials/VotingContent/VotingContent.jsx b/src/layouts/partials/VotingContent/VotingContent.jsx index 32c0809e8..bbb109e9e 100644 --- a/src/layouts/partials/VotingContent/VotingContent.jsx +++ b/src/layouts/partials/VotingContent/VotingContent.jsx @@ -6,20 +6,20 @@ import { Poll, PollEditDialog } from 'components' import Preloader from 'components/common/Preloader/Preloader' import { RaisedButton } from 'material-ui' -import Amount from 'models/Amount' -import PollModel from 'models/PollModel' +import Amount from '@chronobank/core/models/Amount' +import PollModel from '@chronobank/core/models/PollModel' import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' import { Link } from 'react-router' -import { DUCK_ASSETS_HOLDER, initAssetsHolder } from 'redux/assetsHolder/actions' +import { DUCK_ASSETS_HOLDER, initAssetsHolder } from '@chronobank/core/redux/assetsHolder/actions' import { modalsOpen } from 'redux/modals/actions' -import { DUCK_SESSION } from 'redux/session/actions' -import { DUCK_TOKENS } from 'redux/tokens/actions' -import { DUCK_VOTING, listPolls } from 'redux/voting/actions' -import VotingCollection from 'models/voting/VotingCollection' -import getStatistics from 'redux/voting/getters' +import { DUCK_SESSION } from '@chronobank/core/redux/session/actions' +import { DUCK_TOKENS } from '@chronobank/core/redux/tokens/actions' +import { DUCK_VOTING, listPolls } from '@chronobank/core/redux/voting/actions' +import VotingCollection from '@chronobank/core/models/voting/VotingCollection' +import getStatistics from '@chronobank/core/redux/voting/getters' import { Button } from 'components' import './VotingContent.scss' diff --git a/src/layouts/partials/WalletContent/WalletContent.jsx b/src/layouts/partials/WalletContent/WalletContent.jsx index 3817fcdd5..08d3e89c0 100644 --- a/src/layouts/partials/WalletContent/WalletContent.jsx +++ b/src/layouts/partials/WalletContent/WalletContent.jsx @@ -8,15 +8,15 @@ import { DUCK_NETWORK } from '@chronobank/login/redux/network/actions' import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import { DUCK_WALLET } from 'redux/wallet/actions' +import { DUCK_WALLET } from '@chronobank/core/redux/wallet/actions' import WalletWidgetDetail from 'components/wallet/WalletWidgetDetail/WalletWidgetDetail' import TokensListWidget from 'components/wallet/TokensListWidget/TokensListWidget' import PendingTxWidget from 'components/wallet/PendingTxWidget/PendingTxWidget' import OwnersListWidget from 'components/wallet/OwnersListWidget/OwnersListWidget' -import { getTransactionsForWallet, goToWallets } from 'redux/mainWallet/actions' +import { getTransactionsForWallet, goToWallets } from '@chronobank/core/redux/mainWallet/actions' import { getWalletInfo } from 'components/wallet/WalletWidgetMini/selectors' import TransactionsListWidget from 'components/wallet/TransactionsListWidget/TransactionsListWidget' -import { PTWallet } from 'redux/wallet/types' +import { PTWallet } from '@chronobank/core/redux/wallet/types' import './WalletContent.scss' diff --git a/src/layouts/partials/WalletsContent/WalletsContent.jsx b/src/layouts/partials/WalletsContent/WalletsContent.jsx index e92c44630..7de5a8303 100644 --- a/src/layouts/partials/WalletsContent/WalletsContent.jsx +++ b/src/layouts/partials/WalletsContent/WalletsContent.jsx @@ -3,17 +3,17 @@ * Licensed under the AGPL Version 3 license. */ -import { getIsHave2FAWallets } from 'redux/wallet/selectors' +import { getIsHave2FAWallets } from '@chronobank/core/redux/wallet/selectors' import { WalletWidget } from 'components' import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' -import MainWalletModel from 'models/wallet/MainWalletModel' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' import TwoFAWarningWidget from 'components/wallet/TwoFAWarningWidget/TwoFAWarningWidget' -import { DUCK_MULTISIG_WALLET } from 'redux/multisigWallet/actions' +import { DUCK_MULTISIG_WALLET } from '@chronobank/core/redux/multisigWallet/actions' import WalletWidgetMini from 'components/wallet/WalletWidgetMini/WalletWidgetMini' -import { getBalance } from 'redux/mainWallet/actions' +import { getBalance } from '@chronobank/core/redux/mainWallet/actions' import { DUCK_UI } from 'redux/ui/reducer' import './WalletsContent.scss' import { sectionsSelector } from './selectors' diff --git a/src/layouts/partials/WalletsContent/selectors.js b/src/layouts/partials/WalletsContent/selectors.js index 98f63aa46..f65a906f6 100644 --- a/src/layouts/partials/WalletsContent/selectors.js +++ b/src/layouts/partials/WalletsContent/selectors.js @@ -4,11 +4,11 @@ */ import { createSelector, createSelectorCreator, defaultMemoize } from 'reselect' -import MainWalletModel from 'models/wallet/MainWalletModel' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import AddressModel from 'models/wallet/AddressModel' -import MultisigWalletCollection from 'models/wallet/MultisigWalletCollection' -import { getMainWallet, getMultisigWallets } from 'redux/wallet/selectors' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' +import AddressModel from '@chronobank/core/models/wallet/AddressModel' +import MultisigWalletCollection from '@chronobank/core/models/wallet/MultisigWalletCollection' +import { getMainWallet, getMultisigWallets } from '@chronobank/core/redux/wallet/selectors' // provides filtered list of addresses of MainWallets export const selectMainWalletsList = createSelector( diff --git a/src/platform/IPFS.js b/src/platform/IPFS.js new file mode 100644 index 000000000..14f6c1c6a --- /dev/null +++ b/src/platform/IPFS.js @@ -0,0 +1,8 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + * + * @flow + */ + +export { default } from 'utils/IPFS' diff --git a/src/platform/LocalStorage.js b/src/platform/LocalStorage.js new file mode 100644 index 000000000..9b76653e0 --- /dev/null +++ b/src/platform/LocalStorage.js @@ -0,0 +1,8 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + * + * @flow + */ + +export { default } from 'utils/LocalStorage' diff --git a/src/platform/SessionStorage.js b/src/platform/SessionStorage.js new file mode 100644 index 000000000..59e4a9c1b --- /dev/null +++ b/src/platform/SessionStorage.js @@ -0,0 +1,7 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + * + * @flow + */ +export { default } from 'utils/SessionStorage' diff --git a/src/platform/constants.js b/src/platform/constants.js new file mode 100644 index 000000000..2b408c256 --- /dev/null +++ b/src/platform/constants.js @@ -0,0 +1,9 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + * + * @flow + */ +/* eslint-disable import/prefer-default-export */ + +export { FORM_CBE_TOKEN } from 'components/dialogs/CBETokenDialog/CBETokenDialog' diff --git a/src/platform/imageValidator.js b/src/platform/imageValidator.js index 2ee99a149..aac995a68 100644 --- a/src/platform/imageValidator.js +++ b/src/platform/imageValidator.js @@ -1,9 +1,10 @@ /** * Copyright 2017–2018, LaborX PTY * Licensed under the AGPL Version 3 license. + * + * @flow */ - -import FileModel, { fileConfig } from 'models/FileSelect/FileModel' +import FileModel, { fileConfig } from '@chronobank/core/models/FileSelect/FileModel' const noopURL = { createObjectURL () { diff --git a/src/platform/logger.js b/src/platform/logger.js new file mode 100644 index 000000000..b2db8fd6b --- /dev/null +++ b/src/platform/logger.js @@ -0,0 +1,29 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + * + * @flow + */ +class Logger { + static log () { + if (!__DEV__) return + console.log(arguments) // eslint-disable-line + } + + static warn () { + if (!__DEV__) return + console.warn(arguments) // eslint-disable-line + } + + static error () { + if (!__DEV__) return + console.error(arguments) // eslint-disable-line + } + + static info () { + if (!__DEV__) return + console.info(arguments) // eslint-disable-line + } +} + +export default new Logger () diff --git a/src/platform/redux/ui/actions.js b/src/platform/redux/ui/actions.js new file mode 100644 index 000000000..4812ffdbb --- /dev/null +++ b/src/platform/redux/ui/actions.js @@ -0,0 +1,8 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + * + * @flow + */ + +export * from 'redux/ui/actions' diff --git a/src/platform/router.js b/src/platform/router.js new file mode 100644 index 000000000..508dacbf0 --- /dev/null +++ b/src/platform/router.js @@ -0,0 +1,8 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + * + * @flow + */ + +export * from 'react-router-redux' diff --git a/src/redux/configureStore.js b/src/redux/configureStore.js index aa62a9aa2..bbe8364d6 100644 --- a/src/redux/configureStore.js +++ b/src/redux/configureStore.js @@ -12,15 +12,15 @@ import { reducer as formReducer } from 'redux-form/immutable' import { DUCK_I18N, loadI18n } from 'redux/i18n/actions' import { I18n, i18nReducer, loadTranslations, setLocale } from 'platform/i18n' import moment from 'moment' -import saveAccountMiddleWare from 'redux/session/saveAccountMiddleWare' +import saveAccountMiddleWare from '@chronobank/core/redux/session/saveAccountMiddleWare' import { routerMiddleware, syncHistoryWithStore } from 'react-router-redux' import thunk from 'redux-thunk' -import ls from 'utils/LocalStorage' +import ls from '@chronobank/core/utils/LocalStorage' import * as ducks from './ducks' -import { globalWatcher } from './watcher/actions' +import { globalWatcher } from '@chronobank/core/redux/watcher/actions' import routingReducer from './routing' import transformer from './serialize' -import { SESSION_DESTROY } from './session/actions' +import { SESSION_DESTROY } from '@chronobank/core/redux/session/actions' let i18nJson // declaration of a global var for the i18n object for a standalone version @@ -50,9 +50,9 @@ const createSelectLocationState = () => { // add noised action here const IGNORED_ACTIONS = [ - 'market/UPDATE_RATES', - 'market/UPDATE_LAST_MARKET', - 'market/UPDATE_PRICES', + '@chronobank/core/market/UPDATE_RATES', + '@chronobank/core/market/UPDATE_LAST_MARKET', + '@chronobank/core/market/UPDATE_PRICES', ] let logActions = process.env.NODE_ENV === 'development' diff --git a/src/redux/ducks.js b/src/redux/ducks.js index 54ee07874..d1152b5be 100644 --- a/src/redux/ducks.js +++ b/src/redux/ducks.js @@ -4,26 +4,26 @@ */ import Login from '@chronobank/login/redux/ducks' -import * as assetsManager from './assetsManager' +import * as assetsManager from '@chronobank/core/redux/assetsManager' import * as drawer from './drawer' -import * as exchange from './exchange' -import * as locs from './locs' -import * as mainWallet from './mainWallet' -import * as market from './market' +import * as exchange from '@chronobank/core/redux/exchange' +import * as locs from '@chronobank/core/redux/locs' +import * as mainWallet from '@chronobank/core/redux/mainWallet' +import * as market from '@chronobank/core/redux/market' import * as modals from './modals' import * as sides from './sides' -import * as multisigWallet from './multisigWallet' -import * as notifier from './notifier' -import * as operations from './operations' -import * as rewards from './rewards' -import * as session from './session' -import * as settings from './settings' +import * as multisigWallet from '@chronobank/core/redux/multisigWallet' +import * as notifier from '@chronobank/core/redux/notifier' +import * as operations from '@chronobank/core/redux/operations' +import * as rewards from '@chronobank/core/redux/rewards' +import * as session from '@chronobank/core/redux/session' +import * as settings from '@chronobank/core/redux/settings' import * as ui from './ui' -import * as voting from './voting' -import * as wallet from './wallet' -import * as watcher from './watcher' -import * as tokens from './tokens' -import * as assetsHolder from './assetsHolder' +import * as voting from '@chronobank/core/redux/voting' +import * as wallet from '@chronobank/core/redux/wallet' +import * as watcher from '@chronobank/core/redux/watcher' +import * as tokens from '@chronobank/core/redux/tokens' +import * as assetsHolder from '@chronobank/core/redux/assetsHolder' export default { ui, diff --git a/src/redux/i18n/reducer.js b/src/redux/i18n/reducer.js index 769fff124..f52042cd1 100644 --- a/src/redux/i18n/reducer.js +++ b/src/redux/i18n/reducer.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import TokensCollection from 'models/tokens/TokensCollection' +import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import * as a from './actions' import {I18N_LOADED} from "./actions"; diff --git a/src/redux/serialize.js b/src/redux/serialize.js index 151ea8731..eb0ccc465 100644 --- a/src/redux/serialize.js +++ b/src/redux/serialize.js @@ -6,24 +6,24 @@ import Immutable from 'immutable' import { createTransform } from 'redux-persist' import jsan from 'jsan' -import Amount from 'models/Amount' -import BalanceModel from 'models/tokens/BalanceModel' -import BalancesCollection from 'models/tokens/BalancesCollection' -import TxModel from 'models/TxModel' -import TransactionsCollection from 'models/wallet/TransactionsCollection' -import OwnerModel from 'models/wallet/OwnerModel' -import OwnerCollection from 'models/wallet/OwnerCollection' -import MultisigWalletPendingTxModel from 'models/wallet/MultisigWalletPendingTxModel' -import TxExecModel from 'models/TxExecModel' -import MultisigWalletPendingTxCollection from 'models/wallet/MultisigWalletPendingTxCollection' -import AddressModel from 'models/wallet/AddressModel' -import AddressesCollection from 'models/wallet/AddressesCollection' -import MultisigWalletModel from 'models/wallet/MultisigWalletModel' -import MultisigWalletCollection from 'models/wallet/MultisigWalletCollection' -import DerivedWalletModel from 'models/wallet/DerivedWalletModel' -import AllowanceCollection from 'models/wallet/AllowanceCollection' -import AllowanceModel from 'models/wallet/AllowanceModel' -import MainWalletModel from 'models/wallet/MainWalletModel' +import Amount from '@chronobank/core/models/Amount' +import BalanceModel from '@chronobank/core/models/tokens/BalanceModel' +import BalancesCollection from '@chronobank/core/models/tokens/BalancesCollection' +import TxModel from '@chronobank/core/models/TxModel' +import TransactionsCollection from '@chronobank/core/models/wallet/TransactionsCollection' +import OwnerModel from '@chronobank/core/models/wallet/OwnerModel' +import OwnerCollection from '@chronobank/core/models/wallet/OwnerCollection' +import MultisigWalletPendingTxModel from '@chronobank/core/models/wallet/MultisigWalletPendingTxModel' +import TxExecModel from '@chronobank/core/models/TxExecModel' +import MultisigWalletPendingTxCollection from '@chronobank/core/models/wallet/MultisigWalletPendingTxCollection' +import AddressModel from '@chronobank/core/models/wallet/AddressModel' +import AddressesCollection from '@chronobank/core/models/wallet/AddressesCollection' +import MultisigWalletModel from '@chronobank/core/models/wallet/MultisigWalletModel' +import MultisigWalletCollection from '@chronobank/core/models/wallet/MultisigWalletCollection' +import DerivedWalletModel from '@chronobank/core/models/wallet/DerivedWalletModel' +import AllowanceCollection from '@chronobank/core/models/wallet/AllowanceCollection' +import AllowanceModel from '@chronobank/core/models/wallet/AllowanceModel' +import MainWalletModel from '@chronobank/core/models/wallet/MainWalletModel' function mark (data, type, transformMethod) { return { diff --git a/src/redux/ui/actions.js b/src/redux/ui/actions.js index 1d984aeb8..47736c949 100644 --- a/src/redux/ui/actions.js +++ b/src/redux/ui/actions.js @@ -5,11 +5,11 @@ import moment from 'moment' import { setLocale } from 'platform/i18n' -import ls from 'utils/LocalStorage' -import ipfs from 'utils/IPFS' +import ls from '@chronobank/core/utils/LocalStorage' +import ipfs from '@chronobank/core/utils/IPFS' import userMonitorService from 'user/monitorService' import { modalsOpen } from 'redux/modals/actions' -import { DUCK_WATCHER, WATCHER_TX_SET } from 'redux/watcher/actions' +import { DUCK_WATCHER, WATCHER_TX_SET } from '@chronobank/core/redux/watcher/actions' import ConfirmTxDialog from 'components/dialogs/ConfirmTxDialog/ConfirmTxDialog' import ConfirmTransferDialog from 'components/dialogs/ConfirmTransferDialog/ConfirmTransferDialog' import UserActiveDialog from 'components/dialogs/UserActiveDialog/UserActiveDialog' diff --git a/src/specsInit.js b/src/specsInit.js index 7121012dc..c1077afce 100644 --- a/src/specsInit.js +++ b/src/specsInit.js @@ -16,8 +16,8 @@ import networkService from '@chronobank/login/network/NetworkService' import configureMockStore from 'redux-mock-store' import thunk from 'redux-thunk' import Web3 from 'web3' -import AbstractContractDAO from './dao/AbstractContractDAO' -import MarketSocket from './market/MarketSocket' +import AbstractContractDAO from '@chronobank/dao/AbstractContractDAO' +import MarketSocket from '@chronobank/core/market/MarketSocket' import ls from './utils/LocalStorage' Enzyme.configure({ adapter: new Adapter() }) diff --git a/yarn.lock b/yarn.lock index 33a53105c..790102769 100644 --- a/yarn.lock +++ b/yarn.lock @@ -96,6 +96,9 @@ react-dom "^16.1.1" swiper "^4.1.5" +"@chronobank/core-dependencies@./src/platform": + version "0.0.0" + "@ledgerhq/hw-app-eth@^4.7.3": version "4.14.0" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.14.0.tgz#dd6b29024827348702cfe22bb1611e1c97923717" @@ -596,7 +599,7 @@ async-eventemitter@^0.2.2: dependencies: async "^2.4.0" -async-eventemitter@ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c: +"async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c": version "0.2.3" resolved "https://codeload.github.com/ahultgren/async-eventemitter/tar.gz/fa06e39e56786ba541c180061dbf2c0a5bbf951c" dependencies: @@ -6015,7 +6018,7 @@ import-sort@^3.3.0: import-sort-style "^3.0.0" is-builtin-module "^1.0.0" -imurmurhash@^0.1.4: +imurmurhash@*, imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -7694,6 +7697,10 @@ lodash._baseeach@^3.0.0: dependencies: lodash.keys "^3.0.0" +lodash._baseindexof@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" + lodash._baseisequal@^3.0.0: version "3.0.7" resolved "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1" @@ -7833,6 +7840,10 @@ lodash.repeat@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/lodash.repeat/-/lodash.repeat-4.1.0.tgz#fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44" +lodash.restparam@*: + version "3.6.1" + resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" + lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -9049,6 +9060,177 @@ npm@^6.1.0: wrappy "~1.0.2" write-file-atomic "^2.3.0" +"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@~4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + dependencies: + aproba "^1.1.2 || 2" + make-fetch-happen "^2.5.0 || 3 || 4" + +npm-registry-client@^8.5.1: + version "8.5.1" + resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.5.1.tgz#8115809c0a4b40938b8a109b8ea74d26c6f5d7f1" + dependencies: + concat-stream "^1.5.2" + graceful-fs "^4.1.6" + normalize-package-data "~1.0.1 || ^2.0.0" + npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" + once "^1.3.3" + request "^2.74.0" + retry "^0.10.0" + safe-buffer "^5.1.1" + semver "2 >=2.2.1 || 3.x || 4 || 5" + slide "^1.1.3" + ssri "^5.2.4" + optionalDependencies: + npmlog "2 || ^3.1.0 || ^4.0.0" + +npm-registry-fetch@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-1.1.1.tgz#710bc5947d9ee2c549375072dab6d5d17baf2eb2" + dependencies: + bluebird "^3.5.1" + figgy-pudding "^3.0.0" + lru-cache "^4.1.2" + make-fetch-happen "^3.0.0" + npm-package-arg "^6.0.0" + safe-buffer "^5.1.1" + +npm-registry-fetch@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.1.1.tgz#e96bae698afdd45d4a01aca29e881fc0bc55206c" + dependencies: + bluebird "^3.5.1" + figgy-pudding "^3.1.0" + lru-cache "^4.1.2" + make-fetch-happen "^4.0.0" + npm-package-arg "^6.0.0" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + dependencies: + path-key "^2.0.0" + +npm-user-validate@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951" + +npm@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/npm/-/npm-6.1.0.tgz#d685cdfc1a812fb063f031af09bed7a5a68eedf1" + dependencies: + JSONStream "^1.3.2" + abbrev "~1.1.1" + ansi-regex "~3.0.0" + ansicolors "~0.3.2" + ansistyles "~0.1.3" + aproba "~1.2.0" + archy "~1.0.0" + bin-links "^1.1.2" + bluebird "~3.5.1" + byte-size "^4.0.3" + cacache "^11.0.2" + call-limit "~1.1.0" + chownr "~1.0.1" + cli-columns "^3.1.2" + cli-table2 "~0.2.0" + cmd-shim "~2.0.2" + columnify "~1.5.4" + config-chain "~1.1.11" + detect-indent "~5.0.0" + detect-newline "^2.1.0" + dezalgo "~1.0.3" + editor "~1.0.0" + figgy-pudding "^3.1.0" + find-npm-prefix "^1.0.2" + fs-vacuum "~1.2.10" + fs-write-stream-atomic "~1.0.10" + gentle-fs "^2.0.1" + glob "~7.1.2" + graceful-fs "~4.1.11" + has-unicode "~2.0.1" + hosted-git-info "^2.6.0" + iferr "^1.0.0" + inflight "~1.0.6" + inherits "~2.0.3" + ini "^1.3.5" + init-package-json "^1.10.3" + is-cidr "^2.0.5" + json-parse-better-errors "^1.0.2" + lazy-property "~1.0.0" + libcipm "^1.6.2" + libnpmhook "^4.0.1" + libnpx "^10.2.0" + lock-verify "^2.0.2" + lockfile "^1.0.4" + lodash._baseuniq "~4.6.0" + lodash.clonedeep "~4.5.0" + lodash.union "~4.6.0" + lodash.uniq "~4.5.0" + lodash.without "~4.4.0" + lru-cache "^4.1.3" + meant "~1.0.1" + mississippi "^3.0.0" + mkdirp "~0.5.1" + move-concurrently "^1.0.1" + node-gyp "^3.6.2" + nopt "~4.0.1" + normalize-package-data "~2.4.0" + npm-audit-report "^1.2.1" + npm-cache-filename "~1.0.2" + npm-install-checks "~3.0.0" + npm-lifecycle "^2.0.3" + npm-package-arg "^6.1.0" + npm-packlist "~1.1.10" + npm-pick-manifest "^2.1.0" + npm-profile "^3.0.1" + npm-registry-client "^8.5.1" + npm-registry-fetch "^1.1.0" + npm-user-validate "~1.0.0" + npmlog "~4.1.2" + once "~1.4.0" + opener "~1.4.3" + osenv "^0.1.5" + pacote "^8.1.5" + path-is-inside "~1.0.2" + promise-inflight "~1.0.1" + qrcode-terminal "^0.12.0" + query-string "^6.1.0" + qw "~1.0.1" + read "~1.0.7" + read-cmd-shim "~1.0.1" + read-installed "~4.0.3" + read-package-json "^2.0.13" + read-package-tree "^5.2.1" + readable-stream "^2.3.6" + request "^2.86.0" + retry "^0.12.0" + rimraf "~2.6.2" + safe-buffer "^5.1.2" + semver "^5.5.0" + sha "~2.0.1" + slide "~1.1.6" + sorted-object "~2.0.1" + sorted-union-stream "~2.1.3" + ssri "^6.0.0" + strip-ansi "~4.0.0" + tar "^4.4.1" + text-table "~0.2.0" + tiny-relative-date "^1.3.0" + uid-number "0.0.6" + umask "~1.1.0" + unique-filename "~1.1.0" + unpipe "~1.0.0" + update-notifier "^2.5.0" + uuid "^3.2.1" + validate-npm-package-license "^3.0.3" + validate-npm-package-name "~3.0.0" + which "~1.3.0" + worker-farm "^1.6.0" + wrappy "~1.0.2" + write-file-atomic "^2.3.0" + "npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@~4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -13002,7 +13184,7 @@ truffle-error@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/truffle-error/-/truffle-error-0.0.2.tgz#01b189b78505566ae1689c239c7ca2dd121cfe4c" -truffle-hdwallet-provider@mikefluff/truffle-hdwallet-provider#7a2eccca1ba17c235a3ef258914ca74ea5f13014: +"truffle-hdwallet-provider@github:mikefluff/truffle-hdwallet-provider#7a2eccca1ba17c235a3ef258914ca74ea5f13014": version "0.0.5" resolved "https://codeload.github.com/mikefluff/truffle-hdwallet-provider/tar.gz/7a2eccca1ba17c235a3ef258914ca74ea5f13014" dependencies: From 1b5a139e93e2089ff49da7a751ac3ef78fbdd734 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 13 Jun 2018 16:34:27 +0300 Subject: [PATCH 16/30] Use Core in @chronobank/login-ui Refers to: CM-58 --- packages/login-ui/components/LoginForm/LoginForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/login-ui/components/LoginForm/LoginForm.js b/packages/login-ui/components/LoginForm/LoginForm.js index c150f63ec..ac4734211 100644 --- a/packages/login-ui/components/LoginForm/LoginForm.js +++ b/packages/login-ui/components/LoginForm/LoginForm.js @@ -14,7 +14,7 @@ import PropTypes from 'prop-types' import React, { Component } from 'react' import { connect } from 'react-redux' import { Translate } from 'react-redux-i18n' -import { login } from 'redux/session/actions' +import { login } from '@chronobank/core/redux/session/actions' import inverted from 'styles/themes/inversed' import LoginWithOptions from '../LoginWithOptions/LoginWithOptions' import AutomaticProviderSelector from '../ProviderSelectorSwitcher/AutomaticProviderSelector' From 245febf7605a7e7f30f9cb6e68c50320dfe93daf Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 13 Jun 2018 15:35:04 +0300 Subject: [PATCH 17/30] Add core-dependencies package.json --- src/platform/package.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/platform/package.json diff --git a/src/platform/package.json b/src/platform/package.json new file mode 100644 index 000000000..e5f6e5a53 --- /dev/null +++ b/src/platform/package.json @@ -0,0 +1,4 @@ +{ + "name": "@chronobank/core-dependencies", + "version": "0.8.1" +} \ No newline at end of file From 05625d100ba5e523360a9152098285c7fff0231a Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Wed, 20 Jun 2018 18:23:34 +0300 Subject: [PATCH 18/30] Add core-dependencies workspace --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index ad6e62e52..c555349ad 100644 --- a/package.json +++ b/package.json @@ -202,6 +202,7 @@ "yarn": ">=1.0.0" }, "workspaces": [ + "src/platform", "packages/*" ] } From 36d894beb9e6e6d8e568bfae86a19240c8533896 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 12:06:13 +0300 Subject: [PATCH 19/30] Add modals actions core-dependencies --- src/platform/redux/modals/actions.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/platform/redux/modals/actions.js diff --git a/src/platform/redux/modals/actions.js b/src/platform/redux/modals/actions.js new file mode 100644 index 000000000..b9c9a0d6e --- /dev/null +++ b/src/platform/redux/modals/actions.js @@ -0,0 +1,6 @@ +/** + * Copyright 2017–2018, LaborX PTY + * Licensed under the AGPL Version 3 license. + */ + +export * from 'redux/modals/actions' \ No newline at end of file From dfb32e975bbfd476a35794c29268f28d0bc70eaa Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 13:37:36 +0300 Subject: [PATCH 20/30] Fixup i18n chronomint --- src/i18nApp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18nApp.js b/src/i18nApp.js index 155ced580..cad2ddf27 100644 --- a/src/i18nApp.js +++ b/src/i18nApp.js @@ -7,8 +7,8 @@ import 'flexboxgrid/css/flexboxgrid.css' import networkService from '@chronobank/login/network/NetworkService' import i18n from 'i18n/index' import injectTapEventPlugin from 'react-tap-event-plugin' -import { bootstrap } from './redux/session/actions' -import { store } from './redux/configureStore' +import { bootstrap } from '@chronobank/core/redux/session/actions' +import { store } from '@chronobank/core/redux/configureStore' networkService.connectStore(store) injectTapEventPlugin() From e53e7ef59356845afa3a1e57a12fbd15d980a679 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 14:01:24 +0300 Subject: [PATCH 21/30] Fixup i18n --- src/i18nApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18nApp.js b/src/i18nApp.js index cad2ddf27..152340f4c 100644 --- a/src/i18nApp.js +++ b/src/i18nApp.js @@ -8,7 +8,7 @@ import networkService from '@chronobank/login/network/NetworkService' import i18n from 'i18n/index' import injectTapEventPlugin from 'react-tap-event-plugin' import { bootstrap } from '@chronobank/core/redux/session/actions' -import { store } from '@chronobank/core/redux/configureStore' +import { store } from 'redux/configureStore' networkService.connectStore(store) injectTapEventPlugin() From 0910d95ba79ef4faa71d11621dfac6d7930721b5 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 14:01:50 +0300 Subject: [PATCH 22/30] Fixup market actions names --- packages/core/redux/market/actions.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/redux/market/actions.js b/packages/core/redux/market/actions.js index b9fabf250..b0810adc1 100644 --- a/packages/core/redux/market/actions.js +++ b/packages/core/redux/market/actions.js @@ -9,12 +9,12 @@ import axios from 'axios' export const DUCK_MARKET = 'market' -export const MARKET_INIT = '../../market/INIT' -export const MARKET_ADD_TOKEN = '../../market/ADD_TOKEN' -export const MARKET_UPDATE_PRICES = '../../market/UPDATE_PRICES' -export const MARKET_UPDATE_RATES = '../../market/UPDATE_RATES' -export const LAST_MARKET_UPDATE = '../../market/UPDATE_LAST_MARKET' -export const SET_SELECTED_COIN = '../../market/SET_SELECTED_COIN' +export const MARKET_INIT = 'market/INIT' +export const MARKET_ADD_TOKEN = 'market/ADD_TOKEN' +export const MARKET_UPDATE_PRICES = 'market/UPDATE_PRICES' +export const MARKET_UPDATE_RATES = 'market/UPDATE_RATES' +export const LAST_MARKET_UPDATE = 'market/UPDATE_LAST_MARKET' +export const SET_SELECTED_COIN = 'market/SET_SELECTED_COIN' const MARKET_REQUEST_DELAY = 30000 export let timerId From 637fde961475018bd0c8b9d04c6d911903508fbe Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 14:13:50 +0300 Subject: [PATCH 23/30] Remove redundant line --- src/redux/i18n/reducer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/redux/i18n/reducer.js b/src/redux/i18n/reducer.js index f52042cd1..648b24766 100644 --- a/src/redux/i18n/reducer.js +++ b/src/redux/i18n/reducer.js @@ -5,7 +5,6 @@ import TokensCollection from '@chronobank/core/models/tokens/TokensCollection' import * as a from './actions' -import {I18N_LOADED} from "./actions"; const initialState = new TokensCollection() From af8ab4f2850afa29e5e46b0f18f6819f0e06d120 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 14:14:08 +0300 Subject: [PATCH 24/30] Fix code style --- src/redux/i18n/reducer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redux/i18n/reducer.js b/src/redux/i18n/reducer.js index 648b24766..c00a601d9 100644 --- a/src/redux/i18n/reducer.js +++ b/src/redux/i18n/reducer.js @@ -13,7 +13,7 @@ export default (state = initialState, action) => { case a.LOAD_INIT: return state.isInited(action.isInited) case a.I18N_LOADED: - return {...state, list: action.payload.list} + return { ...state, list: action.payload.list } default: return state } From 87cb0214a4635684f5e5686caecacf656c0772ea Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 14:20:06 +0300 Subject: [PATCH 25/30] Add i18nJson to eslint globals --- .eslintrc.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.eslintrc.js b/.eslintrc.js index 5bd36f80c..e26d3060f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,6 +1,9 @@ module.exports = { root: true, extends: ['plugin:chronobank-react/recommended'], + globals: { + "i18nJson": true, + }, rules: { 'space-before-function-paren': ['error', 'always'], 'import/no-extraneous-dependencies': 'off' // TODO Use webpack resolver possible to solve issues with aliased modules From 184f1d8d8c49e87e32fa96ffc5e6ada8ece0cbd4 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 14:32:32 +0300 Subject: [PATCH 26/30] Fix code style --- src/redux/ducks.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/redux/ducks.js b/src/redux/ducks.js index d1152b5be..fc7cdd8d8 100644 --- a/src/redux/ducks.js +++ b/src/redux/ducks.js @@ -4,26 +4,26 @@ */ import Login from '@chronobank/login/redux/ducks' +import * as assetsHolder from '@chronobank/core/redux/assetsHolder' import * as assetsManager from '@chronobank/core/redux/assetsManager' -import * as drawer from './drawer' import * as exchange from '@chronobank/core/redux/exchange' import * as locs from '@chronobank/core/redux/locs' import * as mainWallet from '@chronobank/core/redux/mainWallet' import * as market from '@chronobank/core/redux/market' -import * as modals from './modals' -import * as sides from './sides' import * as multisigWallet from '@chronobank/core/redux/multisigWallet' import * as notifier from '@chronobank/core/redux/notifier' import * as operations from '@chronobank/core/redux/operations' import * as rewards from '@chronobank/core/redux/rewards' import * as session from '@chronobank/core/redux/session' import * as settings from '@chronobank/core/redux/settings' -import * as ui from './ui' +import * as tokens from '@chronobank/core/redux/tokens' import * as voting from '@chronobank/core/redux/voting' import * as wallet from '@chronobank/core/redux/wallet' import * as watcher from '@chronobank/core/redux/watcher' -import * as tokens from '@chronobank/core/redux/tokens' -import * as assetsHolder from '@chronobank/core/redux/assetsHolder' +import * as drawer from './drawer' +import * as modals from './modals' +import * as sides from './sides' +import * as ui from './ui' export default { ui, From feeda756d698c507146e54d25916ea20b9283843 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 14:47:23 +0300 Subject: [PATCH 27/30] Fixup add-module-reexports --- src/layouts/lang.js | 2 +- src/layouts/partials/lang.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/layouts/lang.js b/src/layouts/lang.js index 3b988b15d..1d536aebe 100644 --- a/src/layouts/lang.js +++ b/src/layouts/lang.js @@ -3,7 +3,7 @@ * Licensed under the AGPL Version 3 license. */ -import * as partials from 'layouts/partials/lang' +import partials from 'layouts/partials/lang' export default { en: { diff --git a/src/layouts/partials/lang.js b/src/layouts/partials/lang.js index c7bfd8e5d..7b530f863 100644 --- a/src/layouts/partials/lang.js +++ b/src/layouts/partials/lang.js @@ -3,16 +3,16 @@ * Licensed under the AGPL Version 3 license. */ -import * as FooterPartial from 'layouts/partials/FooterPartial/lang' -import * as OperationsContent from 'layouts/partials/OperationsContent/lang' -import * as RewardsContent from 'layouts/partials/RewardsContent/lang' -import * as VotingContent from 'layouts/partials/VotingContent/lang' +import FooterPartial from 'layouts/partials/FooterPartial/lang' +import OperationsContent from 'layouts/partials/OperationsContent/lang' +import RewardsContent from 'layouts/partials/RewardsContent/lang' +import VotingContent from 'layouts/partials/VotingContent/lang' import DrawerMainMenu from 'layouts/partials/DrawerMainMenu/lang' import MenuTokenMoreInfo from 'layouts/partials/DrawerMainMenu/MenuTokenMoreInfo/lang' import MenuTokensList from 'layouts/partials/DrawerMainMenu/MenuTokensList/lang' import MenuAssetsManagerMoreInfo from 'layouts/partials/DrawerMainMenu/MenuAssetsManagerMoreInfo/lang' import NotificationContent from 'layouts/partials/NotificationContent/lang' -import * as ProfileContent from 'layouts/partials/ProfileContent/lang' +import ProfileContent from 'layouts/partials/ProfileContent/lang' import DepositsContent from 'layouts/partials/DepositsContent/lang' import WalletsContent from 'layouts/partials/WalletsContent/lang' import WalletContent from 'layouts/partials/WalletContent/lang' From cb6cda670500c6cc0357d76dbcc9bd71c5bc6c90 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 14:49:45 +0300 Subject: [PATCH 28/30] Fix code style --- src/i18nApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18nApp.js b/src/i18nApp.js index 152340f4c..17f49793f 100644 --- a/src/i18nApp.js +++ b/src/i18nApp.js @@ -5,10 +5,10 @@ import 'flexboxgrid/css/flexboxgrid.css' import networkService from '@chronobank/login/network/NetworkService' -import i18n from 'i18n/index' import injectTapEventPlugin from 'react-tap-event-plugin' import { bootstrap } from '@chronobank/core/redux/session/actions' import { store } from 'redux/configureStore' +import i18n from './i18n' networkService.connectStore(store) injectTapEventPlugin() From ad627206eab87e9b2425723c9245331981220617 Mon Sep 17 00:00:00 2001 From: maximus Date: Thu, 21 Jun 2018 14:48:26 +0300 Subject: [PATCH 29/30] Fix redux ui export --- packages/core/redux/ui/actions.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/core/redux/ui/actions.js b/packages/core/redux/ui/actions.js index 1da45519f..7fcde9506 100644 --- a/packages/core/redux/ui/actions.js +++ b/packages/core/redux/ui/actions.js @@ -3,6 +3,4 @@ * Licensed under the AGPL Version 3 license. */ -import * as actions from '@chronobank/core-dependencies/redux/ui/actions' - -export default actions \ No newline at end of file +export * from '@chronobank/core-dependencies/redux/ui/actions' From 1ee782c5a6040c4ae7b8e7aab8f69a002acfb104 Mon Sep 17 00:00:00 2001 From: Oleg Dizus Date: Thu, 21 Jun 2018 15:52:24 +0300 Subject: [PATCH 30/30] Fix i18n --- src/redux/configureStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redux/configureStore.js b/src/redux/configureStore.js index bbe8364d6..b01d46bd5 100644 --- a/src/redux/configureStore.js +++ b/src/redux/configureStore.js @@ -134,7 +134,7 @@ const locale = ls.getLocale() // set moment locale moment.locale(locale) -store.dispatch(loadTranslations(require('../i18n/'))) +store.dispatch(loadTranslations(require('../i18n/').default)) store.dispatch(setLocale(locale)) // load i18n from the public site