diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js
index 31e9290..7d3c7cb 100644
--- a/react/src/actions/actionCreators.js
+++ b/react/src/actions/actionCreators.js
@@ -1,7 +1,7 @@
import 'whatwg-fetch';
import 'bluebird';
-import Config from '../config';
+import _config from '../config';
import {
startCurrencyAssetChain,
startAssetChain,
@@ -12,6 +12,14 @@ import {
import { copyToClipboard } from '../util/copyToClipboard';
import { translate } from '../translate/translate';
+let Config;
+
+try {
+ Config = window.require('electron').remote.getCurrentWindow();
+} catch (e) {
+ Config = _config;
+}
+
export const TOASTER_MESSAGE = 'TOASTER_MESSAGE';
export const DISPLAY_ADDCOIN_MODAL = 'DISPLAY_ADDCOIN_MODAL';
export const GET_ACTIVE_COINS = 'GET_ACTIVE_COINS';
@@ -3423,7 +3431,6 @@ export function getAgamaLog(type) {
}
export function guiLogState(logData) {
- console.log(logData);
return {
type: LOG_GUI_HTTP,
timestamp: logData.timestamp,
diff --git a/react/src/components/dashboard/about.js b/react/src/components/dashboard/about.js
index f671f59..91c5564 100644
--- a/react/src/components/dashboard/about.js
+++ b/react/src/components/dashboard/about.js
@@ -3,7 +3,7 @@ import { translate } from '../../translate/translate';
class About extends React.Component {
render() {
- return(
+ return (
About Iguana
diff --git a/react/src/components/dashboard/dashboard.js b/react/src/components/dashboard/dashboard.js
index dfd94b8..06c69fe 100644
--- a/react/src/components/dashboard/dashboard.js
+++ b/react/src/components/dashboard/dashboard.js
@@ -3,7 +3,6 @@ import Navbar from './navbar';
import CoinTile from './coinTile';
import EDEX from './edex';
import WalletsBalance from './walletsBalance';
-import WalletsHeader from './walletsHeader';
import WalletsProgress from './walletsProgress';
import WalletsNav from './walletsNav';
import SendCoin from './sendCoin';
diff --git a/react/src/components/dashboard/jumblr.js b/react/src/components/dashboard/jumblr.js
index 4f13110..fbe0577 100644
--- a/react/src/components/dashboard/jumblr.js
+++ b/react/src/components/dashboard/jumblr.js
@@ -1,5 +1,6 @@
import React from 'react';
import { translate } from '../../translate/translate';
+import WalletsHeader from './walletsHeader';
/*import { dashboardChangeSection, toggleAddcoinModal, logout } from '../../actions/actionCreators';
import Store from '../../store';*/
@@ -31,7 +32,8 @@ class Jumblr extends React.Component {
render() {
return (
-
+
+
diff --git a/react/src/components/dashboard/navbar.js b/react/src/components/dashboard/navbar.js
index 18f1779..58f87f4 100644
--- a/react/src/components/dashboard/navbar.js
+++ b/react/src/components/dashboard/navbar.js
@@ -100,8 +100,7 @@ class Navbar extends React.Component {
+ className={ this.props.Dashboard.activeSection === 'jumblr' ? 'active nav-top-menu' : 'nav-top-menu' }>
this.dashboardChangeSection('jumblr') }>
Jumblr
diff --git a/react/src/components/dashboard/notifications.js b/react/src/components/dashboard/notifications.js
new file mode 100644
index 0000000..3183afd
--- /dev/null
+++ b/react/src/components/dashboard/notifications.js
@@ -0,0 +1,63 @@
+import React from 'react';
+import { translate } from '../../translate/translate';
+
+class Notifications extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ displayModal: false,
+ totalCalls: 0,
+ totalErrorCalls: 0,
+ totalSuccessCalls: 0,
+ totalPendingCalls: 0,
+ };
+ this.toggleNotificationsModal = this.toggleNotificationsModal.bind(this);
+ }
+
+ componentWillReceiveProps(props) {
+ // get total number of calls per type
+ if (this.props.Dashboard &&
+ this.props.Dashboard.guiLog) {
+ const _guiLog = this.props.Dashboard.guiLog;
+ let totalCalls = Object.keys(_guiLog).length;
+ let totalErrorCalls = 0;
+ let totalSuccessCalls = 0;
+ let totalPendingCalls = 0;
+
+ for (let timestamp in _guiLog) {
+ if (_guiLog[timestamp].status === 'error') {
+ totalErrorCalls++;
+ }
+ if (_guiLog[timestamp].status === 'success') {
+ totalSuccessCalls++;
+ }
+ if (_guiLog[timestamp].status === 'pending') {
+ totalPendingCalls++;
+ }
+ }
+
+ this.setState(Object.assign({}, this.state, {
+ totalCalls,
+ totalErrorCalls,
+ totalSuccessCalls,
+ totalPendingCalls,
+ }));
+ }
+ }
+
+ toggleNotificationsModal() {
+
+ }
+
+ render() {
+ return (
+
+ { this.state.totalSuccessCalls }
+ { this.state.totalErrorCalls }
+ { this.state.totalPendingCalls }
+
+ );
+ }
+}
+
+export default Notifications;
\ No newline at end of file
diff --git a/react/src/components/dashboard/walletsHeader.js b/react/src/components/dashboard/walletsHeader.js
index 74af1d6..510180b 100644
--- a/react/src/components/dashboard/walletsHeader.js
+++ b/react/src/components/dashboard/walletsHeader.js
@@ -6,14 +6,20 @@ import { translate } from '../../translate/translate';
class WalletsHeader extends React.Component {
render() {
if (this.props &&
- this.props.coin) {
+ this.props.activeSection) {
return (
-