stop de/restructuring notificationProps; add path as valid prop

This commit is contained in:
Travis Eden 2018-05-30 15:23:48 -04:00
parent fb27fb6638
commit 3a59c27308
3 changed files with 24 additions and 25 deletions

39
dist/bundle.js vendored
View file

@ -46,19 +46,34 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ // define getter function for harmony exports /******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) { /******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) { /******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, { /******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ } /******/ }
/******/ }; /******/ };
/******/ /******/
/******/ // define __esModule on exports /******/ // define __esModule on exports
/******/ __webpack_require__.r = function(exports) { /******/ __webpack_require__.r = function(exports) {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true }); /******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ }; /******/ };
/******/ /******/
/******/ // create a fake namespace object
/******/ // mode & 1: value is a module id, require it
/******/ // mode & 2: merge all properties of value into the ns
/******/ // mode & 4: return value when already ns object
/******/ // mode & 8|1: behave like require
/******/ __webpack_require__.t = function(value, mode) {
/******/ if(mode & 1) value = __webpack_require__(value);
/******/ if(mode & 8) return value;
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
/******/ var ns = Object.create(null);
/******/ __webpack_require__.r(ns);
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
/******/ return ns;
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules /******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) { /******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ? /******/ var getter = module && module.__esModule ?
@ -1078,6 +1093,7 @@ exports.selectSearchState = _search3.selectState;
};*/ };*/
/*:: export type NotificationProps = { /*:: export type NotificationProps = {
uri: ?string, uri: ?string,
path: ?string,
};*/ };*/
/***/ }), /***/ }),
@ -5243,11 +5259,6 @@ reducers[ACTIONS.CREATE_NOTIFICATION] = function (state, action) {
error = notification.error, error = notification.error,
displayType = notification.displayType, displayType = notification.displayType,
id = notification.id; id = notification.id;
var uri = notificationProps.uri,
nout = notificationProps.nout,
txid = notificationProps.txid,
amount = notificationProps.amount,
address = notificationProps.address;
var queue = Object.assign([], state.queue); var queue = Object.assign([], state.queue);
@ -5260,13 +5271,7 @@ reducers[ACTIONS.CREATE_NOTIFICATION] = function (state, action) {
error: error, error: error,
displayType: displayType displayType: displayType
}, },
notificationProps: { notificationProps: notificationProps
uri: uri,
txid: txid,
nout: nout,
amount: amount,
address: address
}
}); });
return Object.assign({}, state, { return Object.assign({}, state, {

View file

@ -11,7 +11,6 @@ const defaultState = {
reducers[ACTIONS.CREATE_NOTIFICATION] = (state, action) => { reducers[ACTIONS.CREATE_NOTIFICATION] = (state, action) => {
const { notification, notificationProps } = action.data; const { notification, notificationProps } = action.data;
const { title, message, type, error, displayType, id } = notification; const { title, message, type, error, displayType, id } = notification;
const { uri, nout, txid, amount, address } = notificationProps;
const queue = Object.assign([], state.queue); const queue = Object.assign([], state.queue);
queue.push({ queue.push({
@ -23,13 +22,7 @@ reducers[ACTIONS.CREATE_NOTIFICATION] = (state, action) => {
error, error,
displayType, displayType,
}, },
notificationProps: { notificationProps,
uri,
txid,
nout,
amount,
address,
},
}); });
return Object.assign({}, state, { return Object.assign({}, state, {

View file

@ -15,4 +15,5 @@ export type Notification = {
// Used for retreiving data from redux store // Used for retreiving data from redux store
export type NotificationProps = { export type NotificationProps = {
uri: ?string, uri: ?string,
path: ?string,
}; };