fixed some cycle dependencies

Author: 2vm

src/components/Protypo/index.ts

@@ -7,7 +7,6 @@ import Data from './Data';
 import DBFind from './DBFind';
 import Em from './Em';
 import Form from './Form';
-// import Image from './Image';
 import Input from './Input';
 import InputError from './InputError';
 import InputImage from './InputImage';

src/components/ui/theme.ts

@@ -58,4 +58,4 @@ export const cancelButton = {
   borderWidth: 1,
   width: '100%',
   marginTop: 0,
-}
+}

src/containers/MenuGridContainer.ts

@@ -3,7 +3,7 @@ import MenuGrid from 'components/MenuGrid';
 
 import * as application from 'modules/application';
 import * as page from 'modules/page';
-import * as navigator from 'modules/navigator';
+import * as navigatorActions from 'modules/navigator/actions';
 import { navTypes } from '../constants';
 
 const mapStateToProps = (state: any, ownProps: any) => {
@@ -16,9 +16,9 @@ const mapStateToProps = (state: any, ownProps: any) => {
 
 const mapDispatchToProps = dispatch => ({
   navigateToSubMenu: (menu: any) =>
-    dispatch(navigator.actions.navigate(navTypes.SUB_MENU, { menu })),
+    dispatch(navigatorActions.navigate(navTypes.SUB_MENU, { menu })),
   receivePageParams: (params: any) => {
-    dispatch(navigator.actions.navigate(navTypes.PAGE));
+    dispatch(navigatorActions.navigate(navTypes.PAGE));
     dispatch(application.actions.receivePageParams(params));
   }
 });

src/containers/NotificationsIconContainer.ts

@@ -2,7 +2,7 @@ import { connect, Dispatch } from 'react-redux';
 import { getNotificationsCount } from 'modules/notifications/selectors';
 
 import NotificationsIcon from 'components/NotificationsIcon';
-import * as navigator from 'modules/navigator';
+import * as navigatorActions from 'modules/navigator/actions';
 import * as page from 'modules/page';
 import * as application from 'modules/application';
 import * as navigatorSelectors from 'modules/navigator/selectors';
@@ -19,11 +19,11 @@ const mapDispatchToProps = (dispatch: Dispatch<any>) => ({
   showNotificationsPage: (withReset = false) => {
     dispatch(page.actions.requestPage.started({ name: 'notifications'}));
     if (withReset) {
-      dispatch(navigator.actions.navigateWithReset([{ routeName: navTypes.PAGE , params: {
+      dispatch(navigatorActions.navigateWithReset([{ routeName: navTypes.PAGE , params: {
         withGoHomeButton: true,
       }}]));
     } else {
-      dispatch(navigator.actions.navigate(navTypes.PAGE));
+      dispatch(navigatorActions.navigate(navTypes.PAGE));
     }
   },
 });

src/index.tsx

@@ -46,4 +46,4 @@ AppRegistry.registerComponent('Apla', () =>
   })(App)
 );
 
-console.ignoredYellowBox = ['Require cycle: node_modules'];
+console.ignoredYellowBox = ['Require cycle: node_modules', 'Header.HEIGHT is deprecated '];

src/modules/application/saga.ts

@@ -14,9 +14,10 @@ import {
 } from './actions';
 import { getDrawerState, getAlert } from './selectors';
 
-import * as auth from 'modules/auth';
-import * as account from 'modules/account';
-import * as navigator from 'modules/navigator';
+import * as navigatorActions from 'modules/navigator/actions';
+import * as authActions from 'modules/auth/actions';
+import * as authSelectors from 'modules/auth/selectors';
+import * as accountSelectors from 'modules/account/selectors';
 
 interface IErrorAlert {
   error: {
@@ -31,8 +32,8 @@ interface IErrorAlert {
 
 export function* initWorker(): SagaIterator {
   const { hasValidToken, token, isTouchIDAvailable, currentLocale } = yield all({
-    token: select(auth.selectors.getToken),
-    hasValidToken: select(auth.selectors.hasValidToken),
+    token: select(authSelectors.getToken),
+    hasValidToken: select(authSelectors.hasValidToken),
     isTouchIDAvailable: call(checkTouchIDAvailiability),
     currentLocale: call(getCurrentLocale),
   });
@@ -52,15 +53,15 @@ export function* initWorker(): SagaIterator {
 
     yield put(initFinish());
     yield put(
-      navigator.actions.navigateWithReset([{ routeName: navTypes.HOME }])
+      navigatorActions.navigateWithReset([{ routeName: navTypes.HOME }])
     );
 
     return;
   } else {
-    yield put(auth.actions.detachSession());
+    yield put(authActions.detachSession());
     yield put(initFinish());
     yield put(
-      navigator.actions.navigateWithReset([
+      navigatorActions.navigateWithReset([
         { routeName: navTypes.ACCOUNT_SELECT }
       ])
     );
@@ -73,21 +74,21 @@ export function* persistWorker() {
 
 export function* expiredTokenWorker() {
   yield take(cancelAlert);
-  const isAuthed = yield select(auth.selectors.getAuthStatus);
+  const isAuthed = yield select(authSelectors.getAuthStatus);
   if (!isAuthed) return;
 
-  const uniqKey = yield select(auth.selectors.getCurrentAccount);
+  const uniqKey = yield select(authSelectors.getCurrentAccount);
   const { drawerOpen, encKey } = yield all({
     drawerOpen: select(getDrawerState),
-    encKey: select(account.selectors.getAccountEncKey(uniqKey))
+    encKey: select(accountSelectors.getAccountEncKey(uniqKey))
   });
 
   if (drawerOpen) {
     yield put(toggleDrawer(false));
   }
 
-  yield put(auth.actions.detachSession());
-  yield put(navigator.actions.navigateWithReset([{ routeName: navTypes.SIGN_IN, params: { uniqKey, encKey } }]));
+  yield put(authActions.detachSession());
+  yield put(navigatorActions.navigateWithReset([{ routeName: navTypes.SIGN_IN, params: { uniqKey, encKey } }]));
 }
 
 export function* alertWorker(action: Action<IErrorAlert>): SagaIterator {
@@ -117,7 +118,7 @@ function* resetDefaultPageWorker() {
 export function* applicationWatcher(): SagaIterator {
   yield takeEvery(initStart, initWorker);
   yield takeEvery(waitForError(), alertWorker);
-  yield takeEvery(auth.actions.detachSession, resetDefaultPageWorker);
+  yield takeEvery(authActions.detachSession, resetDefaultPageWorker);
 }
 
 export default applicationWatcher;

src/modules/auth/saga.ts

@@ -228,7 +228,7 @@ export function* logoutWorker() {
 }
 
 export function* receiveSelectedAccountWorker(action: Action<{uniqKey: string; encKey: string;}>) {
-  yield put(application.actions.toggleDrawer(false))
+  yield put(application.actions.toggleDrawer(false));
   yield call(delay, 350);
   yield put(
     navigatorActions.navigate(navTypes.SIGN_IN, action.payload)

src/modules/nodes/saga.ts

@@ -8,12 +8,13 @@ import api, { apiSetUrl, apiSetToken, apiDeleteToken } from '../../utils/api';
 
 import * as application from 'modules/application';
 import * as auth from 'modules/auth';
-import * as node from 'modules/nodes';
+import * as nodesSelectors from './selectors';
+import * as nodesActions from './actions';
 
 
 export function* nodesWorker() {
   const { currentNode, isAuthenticated } = yield all({
-    currentNode: select(node.selectors.getCurrentNode),
+    currentNode: select(nodesSelectors.getCurrentNode),
     isAuthenticated: select(auth.selectors.getAuthStatus)
   });
 
@@ -35,15 +36,15 @@ export function* nodesWorker() {
 
 export function* setRandomNode() {
   const { nodesList, isAuthenticated } = yield all({
-    nodesList: select(node.selectors.getNodesList),
+    nodesList: select(nodesSelectors.getNodesList),
     isAuthenticated: select(auth.selectors.getAuthStatus),
   });
 
   const filteredNodes = !!nodesList.length ? nodesList : yield call(filterDuplicateNodes, fullNodes);
 
   const checkedNodes = yield call(checkNodeValidity, filteredNodes, 1);
 
-  yield put(node.actions.setCurrentNode(checkedNodes[0]));
+  yield put(nodesActions.setCurrentNode(checkedNodes[0]));
 
   if (isAuthenticated) yield put(auth.actions.detachSession());
 }
@@ -52,7 +53,7 @@ export function* getFullNodesWorkerHelper() {
   try {
     const { data: { list } } = yield call(api.getFullNodes);
 
-    const nodesList = yield select(node.selectors.getNodesList);
+    const nodesList = yield select(nodesSelectors.getNodesList);
 
     let nodes = [];
 
@@ -69,7 +70,7 @@ export function* getFullNodesWorkerHelper() {
       }
     })));
 
-    yield put(node.actions.setNodesList(newNodes));
+    yield put(nodesActions.setNodesList(newNodes));
   } catch(err) {
     yield put(auth.actions.logout());
   }

src/modules/sagas/sagaHelpers.ts

@@ -11,11 +11,13 @@ import defaultSchema from 'utils/transactions/schema/defaultSchema';
 import { toHex } from 'utils/transactions/convert';
 import api, { apiSetToken, apiDeleteToken, apiSetUrl, ApiFactory } from 'utils/api';
 
+import * as authSelectors from 'modules/auth/selectors';
+import * as authActions from 'modules/auth/actions';
+import * as appActions from 'modules/application/actions';
+import * as accountSelectors from 'modules/account/selectors';
+import * as nodesSelectors from 'modules/nodes/selectors';
+
 import { IAuthPayload } from 'modules/auth/saga';
-import * as account from 'modules/account';
-import * as application from 'modules/application';
-import * as auth from 'modules/auth';
-import * as nodes from 'modules/nodes';
 
 export function* getUsername(token: string, key_id: string) {
   apiDeleteToken();
@@ -29,7 +31,7 @@ export function* getUsername(token: string, key_id: string) {
 }
 
 export function* loginByGuestKey() {
-  const currentNode = yield select(nodes.selectors.getCurrentNode);
+  const currentNode = yield select(nodesSelectors.getCurrentNode);
 
   const apiInstance = create({
     baseURL: `${currentNode.apiUrl}api/v2`,
@@ -84,21 +86,21 @@ export function* loginCall(payload: IAuthPayload, role_id?: number, signParams?:
 }
 
 export function* roleSelect(roles: IRole[]) {
-  yield put(application.actions.showModal({ type: ModalTypes.ROLE_SELECT, params: { roles } }));
+  yield put(appActions.showModal({ type: ModalTypes.ROLE_SELECT, params: { roles } }));
 
   const roleSelected = yield race({
-    success: take(application.actions.confirmModal),
-    failed: take(application.actions.closeModal),
+    success: take(appActions.confirmModal),
+    failed: take(appActions.closeModal),
   });
-  yield put(application.actions.closeModal());
+  yield put(appActions.closeModal());
   yield call(delay, MODAL_ANIMATION_TIME + 150);
 
   if (roleSelected.failed) return;
 
   if (roleSelected.success) {
-    yield put(auth.actions.setRole(roleSelected.success.payload));
+    yield put(authActions.setRole(roleSelected.success.payload));
     return roleSelected.success.payload;
-  };
+  }
 }
 
 export function* checkNodeValidity(nodesArray: INode[], requiredCount = 1, token?: string, currentNode?: INode, withSignature = false) {
@@ -148,17 +150,17 @@ export function* checkNodeValidity(nodesArray: INode[], requiredCount = 1, token
 }
 
 export function* defaultPageSetter(role_id?: number | string | undefined) {
-  const currentRole = yield select(auth.selectors.getCurrentRole);
+  const currentRole = yield select(authSelectors.getCurrentRole);
   if (role_id || currentRole && currentRole.role_id) {
     const { data: { value: { default_page } } } = yield call(api.getRow, 'roles', role_id || currentRole.role_id);
 
-    yield put(application.actions.setDefaultPage(default_page || DEFAULT_PAGE));
+    yield put(appActions.setDefaultPage(default_page || DEFAULT_PAGE));
   }
 }
 
 export function* prepareContractWorker(payload: any, privateKey: string) {
-  const uniqKey = yield select(auth.selectors.getCurrentAccount);
-  const currentAcc = yield select(account.selectors.getAccount(uniqKey));
+  const uniqKey = yield select(authSelectors.getCurrentAccount);
+  const currentAcc = yield select(accountSelectors.getAccount(uniqKey));
 
   try {
     const request: {[hash: string]: any}  = {};

tslint.json

@@ -16,6 +16,7 @@
       "no-unused-expression": true,
       "interface-over-type-literal": false,
       "no-empty-interface": false,
-      "max-line-length": [true, 140]
+      "max-line-length": [true, 140],
+      "curly": [true, "ignore-same-line"],
     }
 }