@capillarytech/creatives-library 7.18.0-beta.0 → 8.0.0

package/containers/Ebill/sagas.js

@@ -1,5 +1,4 @@
-import { take, cancel, call, put, takeLatest } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
+import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import * as types from './constants';
 
@@ -40,21 +39,21 @@ export function* getCmsData({cmsType, projectId}) {
 }
 
 function* watchCreateTemplate() {
-  const watcher = yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
+  
+  
 }
 
 function* watchGetTemplateDetails() {
-  const watcher = yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
+  
+  
 }
 
 function* watchGetCmsData() {
-  const watcher = yield takeLatest(types.GET_CMS_EDITOR_DATA_REQUEST, getCmsData);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_CMS_EDITOR_DATA_REQUEST, getCmsData);
+  
+  
 }
 
 // All sagas to be loaded
@@ -63,3 +62,11 @@ export default [
   watchGetTemplateDetails,
   watchGetCmsData,
 ];
+
+export function* ebillSaga() {
+  yield all([
+    watchCreateTemplate(),
+    watchGetTemplateDetails(),
+    watchGetCmsData(),
+  ]);
+}

package/containers/Email/index.js

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
+import { bindActionCreators, compose } from 'redux';
 import Helmet from 'react-helmet';
 import { Row, Col, Spin, Breadcrumb, Popover, Modal, Select } from 'antd';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
@@ -32,6 +32,12 @@ import EmailPreview from '../../components/EmailPreview';
 import ImagePreview from '../../components/ImagePreview';
 import CardGrid from '../../components/CardGrid';
 import Pagination from '../../components/Pagination';
+import injectSaga from '../../utils/injectSaga';
+import injectReducer from '../../utils/injectReducer';
+import reducer from './reducer';
+import { emailSaga } from './sagas';
+import { templateSaga } from '../Templates/sagas';
+
 const BreadcrumbItem = Breadcrumb.Item;
 
 export class Email extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -3104,7 +3110,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           <CapInput
             className="search-text"
             style={{width: '210px'}}
-            placeholder="Search"
+            placeholder={this.props.intl.formatMessage(messages.searchText)}
             prefix={<i className="material-icons" style={{color: '#707070', fontSize: '16px'}}>search</i>}
             value={this.state.searchText}
             onChange={(e) => this.searchAsset(e.target.value)}
@@ -3307,4 +3313,15 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Email)));
+const withConnect = connect(mapStateToProps, mapDispatchToProps);
+const withReducer = injectReducer({ key: 'email', reducer });
+const withSaga = injectSaga({ key: 'email', saga: emailSaga });
+const withTemplateSaga = injectSaga({ key: 'templates', saga: templateSaga });
+
+export default compose(
+  UserIsAuthenticated,
+  withReducer,
+  withSaga,
+  withTemplateSaga,
+  withConnect,
+)(injectIntl(Email));

package/containers/Email/sagas.js

@@ -1,5 +1,4 @@
-import { take, cancel, call, put, takeLatest, takeEvery } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
+import { take, cancel, call, put, takeLatest, takeEvery, all } from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import * as types from './constants';
 
@@ -83,45 +82,45 @@ export function* uploadAsset(file, assetType, fileParams) {
 }
 
 function* watchCreateTemplate() {
-  const watcher = yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
+  
+  
 }
 
 function* watchGetTemplateDetails() {
-  const watcher = yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
+  
+  
 }
 
 function* watchGetAllAssets() {
-  const watcher = yield takeLatest(types.GET_ALL_ASSETS_REQUEST, getAllAssets);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_ALL_ASSETS_REQUEST, getAllAssets);
+  
+  
 }
 
 function* watchGetCmsSetting() {
-  const watcher = yield takeEvery(types.GET_CMS_EDITOR_DETAILS_REQUEST, getCmsSetting);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeEvery(types.GET_CMS_EDITOR_DETAILS_REQUEST, getCmsSetting);
+  
+  
 }
 
 function* watchGetCmsData() {
-  const watcher = yield takeEvery(types.GET_CMS_EDITOR_DATA_REQUEST, getCmsData);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeEvery(types.GET_CMS_EDITOR_DATA_REQUEST, getCmsData);
+  
+  
 }
 
 function* watchUploadAsset() {
-  const watcher = yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
+  
+  
 }
 
 function* watchDuplicateTemplate() {
-  const watcher = yield takeLatest(types.DUPLICATE_TEMPLATE_REQUEST, duplicateTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.DUPLICATE_TEMPLATE_REQUEST, duplicateTemplate);
+  
+  
 }
 
 // All sagas to be loaded
@@ -134,3 +133,15 @@ export default [
   watchUploadAsset,
   watchDuplicateTemplate,
 ];
+
+export function* emailSaga() {
+  yield all([
+    watchCreateTemplate(),
+    watchGetTemplateDetails(),
+    watchGetAllAssets(),
+    watchGetCmsSetting(),
+    watchGetCmsData(),
+    watchUploadAsset(),
+    watchDuplicateTemplate(),
+  ]);
+}

package/containers/LanguageProvider/index.js

@@ -6,37 +6,50 @@
  * IntlProvider component and i18n messages (loaded from `app/translations`)
  */
 
-import PropTypes from 'prop-types';
-
 import React from 'react';
-import { ConfigProvider } from 'antd';
-import enUS from 'antd/es/locale-provider/en_US';
-import zhCN from 'antd/es/locale-provider/zh_CN';
-import jaJP from 'antd/es/locale-provider/ja_JP';
+import PropTypes from 'prop-types';
+import moment from 'moment';
 import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
 import { IntlProvider } from 'react-intl';
-import moment from 'moment';
+import { createStructuredSelector } from 'reselect';
+import { bindActionCreators } from 'redux';
+import { DEFAULT_LOCALE } from '../Cap/constants';
 import { makeSelectLocale } from './selectors';
+import makeSelectApp from '../App/selectors';
+import * as appActions from '../App/actions';
+import { getLocale } from '../../utils/ApiCaller';
+export class LanguageProvider extends React.PureComponent {
+  // eslint-disable-line react/prefer-stateless-function
 
-export class LanguageProvider extends React.PureComponent { // eslint-disable-line react/prefer-stateless-function
-  render() {
-    const mappedLocale = {
-      'en': enUS,
-      'zh-cn': zhCN,
-      'en-US': enUS,
-      'zh': zhCN,
-      'ja-JP': jaJP,
+  componentDidMount() {
+    const jlocale = getLocale() || DEFAULT_LOCALE;
+    const locale = this.getReversedMappedLocale(jlocale);
+    this.props.actions.getLocizMessage(locale);
+    moment.locale(jlocale);
+  }
+
+  getReversedMappedLocale = locale => {
+    const map = {
+      en: 'en-US',
+      'zh-cn': 'zh',
+      hi: 'hi',
+      vi: 'vi',
+      tr: 'tr',
+      'ja-JP': 'ja-JP',
     };
-    const jLocale = localStorage.getItem('jlocale') || 'en';
-    moment.locale(jLocale);
-    const file = mappedLocale[jLocale];
+    return map[locale];
+  };
+
+  render() {
+    const { messagesData } = this.props.messages;
     return (
-      <ConfigProvider locale={file}>
-        <IntlProvider locale={this.props.locale} key={this.props.locale} messages={this.props.messages[this.props.locale]}>
-          {React.Children.only(this.props.children)}
-        </IntlProvider>
-      </ConfigProvider>
+      <IntlProvider
+        locale={this.props.locale}
+        key={this.props.locale}
+        messages={messagesData}
+      >
+        {React.Children.only(this.props.children)}
+      </IntlProvider>
     );
   }
 }
@@ -45,18 +58,23 @@ LanguageProvider.propTypes = {
   locale: PropTypes.string,
   messages: PropTypes.object,
   children: PropTypes.element.isRequired,
+  actions: PropTypes.object,
 };
 
-
-const mapStateToProps = createSelector(
-  makeSelectLocale(),
-  (locale) => ({ locale })
-);
+const mapStateToProps = createStructuredSelector({
+  messages: makeSelectApp(),
+  locale: makeSelectLocale(),
+});
 
 function mapDispatchToProps(dispatch) {
   return {
-    dispatch,
+    actions: bindActionCreators(appActions, dispatch),
   };
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(LanguageProvider);
+const withConnect = connect(
+  mapStateToProps,
+  mapDispatchToProps,
+);
+
+export default withConnect(LanguageProvider);

package/containers/LanguageProvider/tests/index.test.js

@@ -2,10 +2,11 @@ import React from 'react';
 import { shallow, mount } from 'enzyme';
 import { FormattedMessage, defineMessages } from 'react-intl';
 import { Provider } from 'react-redux';
-import { browserHistory } from 'react-router';
+import { createBrowserHistory } from 'history';
 
 import ConnectedLanguageProvider, { LanguageProvider } from '../index';
-import configureStore from '../../../store';
+import { configureStore }  from '@capillarytech/vulcan-react-sdk/utils';
+import { initialReducer } from '../../../initialReducer';
 
 import { translationMessages } from '../../../i18n';
 
@@ -36,9 +37,10 @@ describe('<LanguageProvider />', () => {
 
 describe('<ConnectedLanguageProvider />', () => {
   let store;
+  let browserHistory = createBrowserHistory();
 
   beforeAll(() => {
-    store = configureStore({}, browserHistory);
+    store = configureStore({}, initialReducer, browserHistory);
   });
 
   it('should render the default language messages', () => {

package/containers/Line/Create/index.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import {connect} from 'react-redux';
-import { bindActionCreators } from 'redux';
+import { bindActionCreators, compose } from 'redux';
 import { injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import { Row, Col, Spin, Breadcrumb } from 'antd';
@@ -17,6 +17,10 @@ import { makeSelectMetaEntities, setInjectedTags } from '../../Cap/selectors';
 import {getMessageObject} from '../../../utils/messageUtils';
 import { makeSelectTemplates } from '../../Templates/selectors';
 import './_lineCreate.scss';
+import injectSaga from '../../../utils/injectSaga';
+import injectReducer from '../../../utils/injectReducer';
+import reducer from './reducer';
+import { lineCreateSaga } from './sagas';
 
 const BreadcrumbItem = Breadcrumb.Item;
 
@@ -819,4 +823,13 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(Line)));
+const withConnect = connect(mapStateToProps, mapDispatchToProps);
+const withReducer = injectReducer({ key: 'line', reducer });
+const withSaga = injectSaga({ key: 'line', saga: lineCreateSaga});
+
+export default compose(
+  UserIsAuthenticated,
+  withReducer,
+  withSaga,
+  withConnect,
+)(injectIntl(Line));

package/containers/Line/Create/sagas.js

@@ -1,7 +1,6 @@
 // Line Sagas
 
-import { take, cancel, call, put, takeLatest } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
+import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
 import * as Api from '../../../services/api';
 import * as types from './constants';
 
@@ -30,15 +29,15 @@ export function* uploadAsset(file, assetType, fileParams) {
 
 function* watchCreateTemplate() {
   
-  const watcher = yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
+  
+  
 }
 function* watchUploadAsset() {
   
-  const watcher = yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
+  
+  
 }
 
 // edit
@@ -80,21 +79,21 @@ export function* getLineTemplatesList(params) {
 }
 
 function* watchEditTemplate() {
-  const watcher = yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
+  
+  
 }
 
 function* watchGetTemplateDetails() {
-  const watcher = yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
+  
+  
 }
 
 function* watchLineTemplatesList() {
-  const watcher = yield takeLatest(types.GET_LINE_TEMPLATES_LIST_REQUEST, getLineTemplatesList);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_LINE_TEMPLATES_LIST_REQUEST, getLineTemplatesList);
+  
+  
 }
 
 // All sagas to be loaded
@@ -105,3 +104,13 @@ export default [
   watchGetTemplateDetails,
   watchLineTemplatesList,
 ];
+
+export function* lineCreateSaga() {
+  yield all([
+    watchCreateTemplate(),
+    watchUploadAsset(),
+    watchEditTemplate(),
+    watchGetTemplateDetails(),
+    watchLineTemplatesList(),
+  ]);
+}

package/containers/Line/Edit/sagas.js

@@ -1,5 +1,4 @@
 import { call, put, takeLatest, take, cancel } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';
@@ -51,27 +50,27 @@ export function* getLineTemplatesList(params) {
 }
 
 function* watchEditTemplate() {
-  const watcher = yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
+  
+  
 }
 
 function* watchGetTemplateDetails() {
-  const watcher = yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
+  
+  
 }
 
 function* watchUploadAsset() {
-  const watcher = yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
+  
+  
 }
 
 function* watchLineTemplatesList() {
-  const watcher = yield takeLatest(types.GET_LINE_TEMPLATES_LIST_REQUEST, getLineTemplatesList);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_LINE_TEMPLATES_LIST_REQUEST, getLineTemplatesList);
+  
+  
 }
 
 // All sagas to be loaded

package/containers/Login/index.js

@@ -1,17 +1,20 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
+import { withRouter } from 'react-router-dom';
 import Helmet from 'react-helmet';
 import { FormattedMessage } from 'react-intl';
-import { routerActions } from 'react-router-redux';
+import { routerActions } from 'connected-react-router';
 import { Row, Col } from 'antd';
-import { bindActionCreators } from 'redux';
+import { compose, bindActionCreators } from 'redux';
 import { createStructuredSelector } from 'reselect';
 import makeSelectLogin from './selectors';
 import messages from './messages';
 import config from '../../config/app';
 import LoginForm from './components/LoginForm';
 import * as actions from '../../containers/Cap/actions';
+import { capSaga } from '../Cap/sagas';
+import injectSaga from '../../utils/injectSaga';
 import { UserIsNotAuthenticated } from '../../utils/authWrapper';
 import loaderGif from '../../assets/loading_img.gif';
 const logo = require('./assets/images/capillary_logo.png');
@@ -27,15 +30,25 @@ export class Login extends React.Component { // eslint-disable-line react/prefer
 
   componentWillMount() {
     const isAuthenticated = this.props.Login.token !== '';
-    const replace = this.props.replace;
-    if ((this.props.Login.login_progress === false) && (this.props.Login.fetching_userdata === false) && isAuthenticated) {
-      replace(process.env.NODE_ENV === 'production' ? config.production.dashboard_url : config.development.dashboard_url);
+    const { replace } = this.props;
+    if (
+      this.props.Login.login_progress === false &&
+      this.props.Login.fetching_userdata === false &&
+      isAuthenticated
+    ) {
+      replace(
+        process.env.NODE_ENV === 'production'
+          ? config.production.dashboard_url
+          : config.development.dashboard_url,
+      );
     }
   }
 
   componentWillReceiveProps(nextProps) {
-    const isAuthenticated = nextProps.Login.token !== undefined && nextProps.Login.token !== '';
-    const wasAuthenticated = this.props.Login.token !== undefined && this.props.Login.token !== '';
+    const isAuthenticated =
+      nextProps.Login.token !== undefined && nextProps.Login.token !== '';
+    const wasAuthenticated =
+      this.props.Login.token !== undefined && this.props.Login.token !== '';
     if (this.props.Login && this.props.Login.isError) {
       this.setState({ isLoginError: true });
     } else {
@@ -43,10 +56,14 @@ export class Login extends React.Component { // eslint-disable-line react/prefer
     }
 
     if (!wasAuthenticated && isAuthenticated) {
-      let redirectUrl = process.env.NODE_ENV === 'production' ? config.production.dashboard_url : config.development.dashboard_url;
-      if (this.props.location.query.redirect) redirectUrl = this.props.location.query.redirect;
+      let redirectUrl =
+        process.env.NODE_ENV === 'production'
+          ? config.production.dashboard_url
+          : config.development.dashboard_url;
+      if (this.props.location.query.redirect)
+        redirectUrl = this.props.location.query.redirect;
       this.props.router.push({ pathname: redirectUrl, state: {} });
-      this.props.router.go(redirectUrl);
+      this.props.router.go(); // reload the page
     }
   }
 
@@ -103,4 +120,12 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-export default UserIsNotAuthenticated(connect(mapStateToProps, mapDispatchToProps)(Login));
+const withConnect = connect(mapStateToProps, mapDispatchToProps);
+
+const withSaga = injectSaga({ key: 'Login', saga: capSaga });
+export default compose(
+  UserIsNotAuthenticated,
+  withRouter,
+  withSaga,
+  withConnect,
+)(Login);

package/containers/MobilePush/Create/index.js

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 
 import React from 'react';
 import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
+import { bindActionCreators, compose } from 'redux';
 import { Row, Col, Spin, Breadcrumb, notification } from 'antd';
 import _ from 'lodash';
 import { createStructuredSelector } from 'reselect';
@@ -22,6 +22,12 @@ import * as actions from './actions';
 import {getMessageObject} from '../../../utils/messageUtils';
 import { makeSelectTemplates } from '../../Templates/selectors';
 import messages from './messages';
+import injectReducer from '../../../utils/injectReducer';
+import injectSaga from '../../../utils/injectSaga';
+import reducer from './reducer';
+import { createMPushSaga } from './sagas';
+import { UserIsAuthenticated } from '../../../utils/authWrapper';
+
 const BreadcrumbItem = Breadcrumb.Item;
 export class Create extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -2277,4 +2283,13 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Create));
+const withConnect = connect(mapStateToProps, mapDispatchToProps);
+const withReducer = injectReducer({ key: 'mobileCreate', reducer });
+const withSaga = injectSaga({ key: 'mobileCreate', saga: createMPushSaga });
+
+export default compose(
+  UserIsAuthenticated,
+  withReducer,
+  withSaga,
+  withConnect,
+)(injectIntl(Create));

package/containers/MobilePush/Create/sagas.js

@@ -1,6 +1,4 @@
-import { take, cancel, call, put, takeLatest } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
-// import { LOCATION_CHANGE } from 'react-router-redux';
+import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';
@@ -38,19 +36,19 @@ export function* getIosCtas(licenseCode) {
 
 function* watchCreateTemplate() {
   
-  const watcher = yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
+  
+  
 }
 function* watchUploadAsset() {
-  const watcher = yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
+  
+  
 }
 function* watchGetIosCtas() {
-  const watcher = yield takeLatest(types.GET_IOS_CTAS, getIosCtas);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_IOS_CTAS, getIosCtas);
+  
+  
 }
 // All sagas to be loaded
 export default [
@@ -58,3 +56,11 @@ export default [
   watchUploadAsset,
   watchGetIosCtas,
 ];
+
+export function* createMPushSaga() {
+  yield all([
+    watchCreateTemplate(),
+    watchUploadAsset(),
+    watchGetIosCtas(),
+  ]);
+}