From d0a7972b99e012a626fb214d6990fbfae732a6b0 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sat, 10 Jun 2017 21:29:11 +0300
Subject: [PATCH 1/4] reorganized dashboard components locations
---
.../components/dashboard/{ => about}/about.js | 0
.../dashboard/{ => atomic}/atomic.js | 4 +--
.../dashboard/{ => atomic}/atomic.render.js | 8 ++---
.../dashboard/{ => coinTile}/coinTile.js | 2 +-
.../{ => coinTile}/coinTile.render.js | 2 +-
.../dashboard/{ => coinTile}/coinTileItem.js | 4 +--
.../{ => coinTile}/coinTileItem.render.js | 0
.../components/dashboard/{ => edex}/edex.js | 0
.../dashboard/{ => jumblr}/jumblr.js | 4 +--
.../dashboard/{ => jumblr}/jumblr.render.js | 4 +--
.../dashboard/{ => loginModal}/loginModal.js | 4 +--
.../{ => loginModal}/loginModal.render.js | 2 +-
.../dashboard/{ => main}/dashboard.js | 0
.../dashboard/{ => main}/dashboard.render.js | 32 +++++++++----------
.../dashboard/{ => main}/dashboard.scss | 0
.../dashboard/{ => navbar}/navbar.js | 4 +--
.../dashboard/{ => navbar}/navbar.render.js | 2 +-
.../{ => notifications}/notifications.js | 4 +--
.../notifications.render.js | 4 +--
.../{ => receiveCoin}/receiveCoin.js | 4 +--
.../{ => receiveCoin}/receiveCoin.render.js | 2 +-
.../dashboard/{ => sendCoin}/sendCoin.js | 12 +++----
.../{ => sendCoin}/sendCoin.render.js | 4 +--
.../dashboard/{ => settings}/settings.js | 6 ++--
.../{ => settings}/settings.render.js | 8 ++---
.../dashboard/{ => syncOnly}/syncOnly.js | 6 ++--
.../{ => syncOnly}/syncOnly.render.js | 2 +-
.../{ => walletsBalance}/walletsBalance.js | 2 +-
.../walletsBalance.render.js | 2 +-
.../walletsBasiliskConnection.js | 4 +--
.../walletsBasiliskConnection.render.js | 2 +-
.../walletsBasiliskRefresh.js | 0
.../walletsBasiliskRefresh.render.js | 2 +-
.../walletsCacheData.js | 6 ++--
.../walletsCacheData.render.js | 4 +--
.../{ => walletsData}/walletsData.js | 10 +++---
.../{ => walletsData}/walletsData.render.js | 12 +++----
.../{ => walletsHeader}/walletsHeader.js | 0
.../walletsHeader.render.js | 2 +-
.../{ => walletsNative}/walletsNative.js | 0
.../walletsNative.render.js | 12 +++----
.../walletsNativeAlert.js | 0
.../walletsNativeAlert.render.js | 2 +-
.../walletsNativeBalance.js | 0
.../walletsNativeBalance.render.js | 2 +-
.../walletsNativeInfo.js | 0
.../walletsNativeInfo.render.js | 2 +-
.../walletsNativeReceive.js | 4 +--
.../walletsNativeReceive.render.js | 2 +-
.../walletsNativeSend.js | 10 +++---
.../walletsNativeSend.render.js | 2 +-
.../walletsNativeSyncProgress.js | 2 +-
.../walletsNativeSyncProgress.render.js | 2 +-
.../walletsNativeTxHistory.js | 8 ++---
.../walletsNativeTxHistory.render.js | 4 +--
.../walletsNativeTxInfo.js | 4 +--
.../walletsNativeTxInfo.render.js | 4 +--
.../dashboard/{ => walletsNav}/walletsNav.js | 4 +--
.../{ => walletsNav}/walletsNav.render.js | 2 +-
.../walletsNotariesList.js | 6 ++--
.../walletsNotariesList.render.js | 4 +--
.../{ => walletsProgress}/walletsProgress.js | 2 +-
.../walletsProgress.render.js | 2 +-
.../{ => walletsTxInfo}/walletsTxInfo.js | 4 +--
.../walletsTxInfo.render.js | 4 +--
react/src/components/main/walletMain.js | 6 ++--
react/src/styles/index.scss | 2 +-
67 files changed, 131 insertions(+), 135 deletions(-)
rename react/src/components/dashboard/{ => about}/about.js (100%)
rename react/src/components/dashboard/{ => atomic}/atomic.js (99%)
rename react/src/components/dashboard/{ => atomic}/atomic.render.js (89%)
rename react/src/components/dashboard/{ => coinTile}/coinTile.js (97%)
rename react/src/components/dashboard/{ => coinTile}/coinTile.render.js (93%)
rename react/src/components/dashboard/{ => coinTile}/coinTileItem.js (98%)
rename react/src/components/dashboard/{ => coinTile}/coinTileItem.render.js (100%)
rename react/src/components/dashboard/{ => edex}/edex.js (100%)
rename react/src/components/dashboard/{ => jumblr}/jumblr.js (77%)
rename react/src/components/dashboard/{ => jumblr}/jumblr.render.js (98%)
rename react/src/components/dashboard/{ => loginModal}/loginModal.js (94%)
rename react/src/components/dashboard/{ => loginModal}/loginModal.render.js (97%)
rename react/src/components/dashboard/{ => main}/dashboard.js (100%)
rename react/src/components/dashboard/{ => main}/dashboard.render.js (63%)
rename react/src/components/dashboard/{ => main}/dashboard.scss (100%)
rename react/src/components/dashboard/{ => navbar}/navbar.js (96%)
rename react/src/components/dashboard/{ => navbar}/navbar.render.js (98%)
rename react/src/components/dashboard/{ => notifications}/notifications.js (97%)
rename react/src/components/dashboard/{ => notifications}/notifications.render.js (98%)
rename react/src/components/dashboard/{ => receiveCoin}/receiveCoin.js (97%)
rename react/src/components/dashboard/{ => receiveCoin}/receiveCoin.render.js (98%)
rename react/src/components/dashboard/{ => sendCoin}/sendCoin.js (99%)
rename react/src/components/dashboard/{ => sendCoin}/sendCoin.render.js (99%)
rename react/src/components/dashboard/{ => settings}/settings.js (98%)
rename react/src/components/dashboard/{ => settings}/settings.render.js (99%)
rename react/src/components/dashboard/{ => syncOnly}/syncOnly.js (95%)
rename react/src/components/dashboard/{ => syncOnly}/syncOnly.render.js (98%)
rename react/src/components/dashboard/{ => walletsBalance}/walletsBalance.js (98%)
rename react/src/components/dashboard/{ => walletsBalance}/walletsBalance.render.js (97%)
rename react/src/components/dashboard/{ => walletsBasiliskConnection}/walletsBasiliskConnection.js (87%)
rename react/src/components/dashboard/{ => walletsBasiliskConnection}/walletsBasiliskConnection.render.js (97%)
rename react/src/components/dashboard/{ => walletsBasiliskRefresh}/walletsBasiliskRefresh.js (100%)
rename react/src/components/dashboard/{ => walletsBasiliskRefresh}/walletsBasiliskRefresh.render.js (92%)
rename react/src/components/dashboard/{ => walletsCacheData}/walletsCacheData.js (96%)
rename react/src/components/dashboard/{ => walletsCacheData}/walletsCacheData.render.js (88%)
rename react/src/components/dashboard/{ => walletsData}/walletsData.js (98%)
rename react/src/components/dashboard/{ => walletsData}/walletsData.render.js (96%)
rename react/src/components/dashboard/{ => walletsHeader}/walletsHeader.js (100%)
rename react/src/components/dashboard/{ => walletsHeader}/walletsHeader.render.js (97%)
rename react/src/components/dashboard/{ => walletsNative}/walletsNative.js (100%)
rename react/src/components/dashboard/{ => walletsNative}/walletsNative.render.js (68%)
rename react/src/components/dashboard/{ => walletsNativeAlert}/walletsNativeAlert.js (100%)
rename react/src/components/dashboard/{ => walletsNativeAlert}/walletsNativeAlert.render.js (84%)
rename react/src/components/dashboard/{ => walletsNativeBalance}/walletsNativeBalance.js (100%)
rename react/src/components/dashboard/{ => walletsNativeBalance}/walletsNativeBalance.render.js (96%)
rename react/src/components/dashboard/{ => walletsNativeInfo}/walletsNativeInfo.js (100%)
rename react/src/components/dashboard/{ => walletsNativeInfo}/walletsNativeInfo.render.js (97%)
rename react/src/components/dashboard/{ => walletsNativeReceive}/walletsNativeReceive.js (95%)
rename react/src/components/dashboard/{ => walletsNativeReceive}/walletsNativeReceive.render.js (98%)
rename react/src/components/dashboard/{ => walletsNativeSend}/walletsNativeSend.js (96%)
rename react/src/components/dashboard/{ => walletsNativeSend}/walletsNativeSend.render.js (99%)
rename react/src/components/dashboard/{ => walletsNativeSyncProgress}/walletsNativeSyncProgress.js (98%)
rename react/src/components/dashboard/{ => walletsNativeSyncProgress}/walletsNativeSyncProgress.render.js (93%)
rename react/src/components/dashboard/{ => walletsNativeTxHistory}/walletsNativeTxHistory.js (96%)
rename react/src/components/dashboard/{ => walletsNativeTxHistory}/walletsNativeTxHistory.render.js (97%)
rename react/src/components/dashboard/{ => walletsNativeTxInfo}/walletsNativeTxInfo.js (89%)
rename react/src/components/dashboard/{ => walletsNativeTxInfo}/walletsNativeTxInfo.render.js (97%)
rename react/src/components/dashboard/{ => walletsNav}/walletsNav.js (95%)
rename react/src/components/dashboard/{ => walletsNav}/walletsNav.render.js (97%)
rename react/src/components/dashboard/{ => walletsNotariesList}/walletsNotariesList.js (89%)
rename react/src/components/dashboard/{ => walletsNotariesList}/walletsNotariesList.render.js (93%)
rename react/src/components/dashboard/{ => walletsProgress}/walletsProgress.js (94%)
rename react/src/components/dashboard/{ => walletsProgress}/walletsProgress.render.js (96%)
rename react/src/components/dashboard/{ => walletsTxInfo}/walletsTxInfo.js (89%)
rename react/src/components/dashboard/{ => walletsTxInfo}/walletsTxInfo.render.js (96%)
diff --git a/react/src/components/dashboard/about.js b/react/src/components/dashboard/about/about.js
similarity index 100%
rename from react/src/components/dashboard/about.js
rename to react/src/components/dashboard/about/about.js
diff --git a/react/src/components/dashboard/atomic.js b/react/src/components/dashboard/atomic/atomic.js
similarity index 99%
rename from react/src/components/dashboard/atomic.js
rename to react/src/components/dashboard/atomic/atomic.js
index 4708966..d9d1f3b 100755
--- a/react/src/components/dashboard/atomic.js
+++ b/react/src/components/dashboard/atomic/atomic.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { atomic } from '../../actions/actionCreators';
-import Store from '../../store';
+import { atomic } from '../../../actions/actionCreators';
+import Store from '../../../store';
import AtomicRender from './atomic.render';
diff --git a/react/src/components/dashboard/atomic.render.js b/react/src/components/dashboard/atomic/atomic.render.js
similarity index 89%
rename from react/src/components/dashboard/atomic.render.js
rename to react/src/components/dashboard/atomic/atomic.render.js
index 7b352ad..56b35a9 100644
--- a/react/src/components/dashboard/atomic.render.js
+++ b/react/src/components/dashboard/atomic/atomic.render.js
@@ -1,9 +1,9 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
-import AddCoinOptionsCrypto from '../addcoin/addcoinOptionsCrypto';
-import AddCoinOptionsAC from '../addcoin/addcoinOptionsAC';
-import AddCoinOptionsACFiat from '../addcoin/addcoinOptionsACFiat';
+import AddCoinOptionsCrypto from '../../addcoin/addcoinOptionsCrypto';
+import AddCoinOptionsAC from '../../addcoin/addcoinOptionsAC';
+import AddCoinOptionsACFiat from '../../addcoin/addcoinOptionsACFiat';
const AtomicRender = function () {
return (
diff --git a/react/src/components/dashboard/coinTile.js b/react/src/components/dashboard/coinTile/coinTile.js
similarity index 97%
rename from react/src/components/dashboard/coinTile.js
rename to react/src/components/dashboard/coinTile/coinTile.js
index 5996841..9fcb3d1 100755
--- a/react/src/components/dashboard/coinTile.js
+++ b/react/src/components/dashboard/coinTile/coinTile.js
@@ -2,7 +2,7 @@ import React from 'react';
import {
getCoinTitle,
getModeInfo
-} from '../../util/coinHelper';
+} from '../../../util/coinHelper';
import CoinTileItem from './coinTileItem';
import CoinTileRender from './coinTile.render';
diff --git a/react/src/components/dashboard/coinTile.render.js b/react/src/components/dashboard/coinTile/coinTile.render.js
similarity index 93%
rename from react/src/components/dashboard/coinTile.render.js
rename to react/src/components/dashboard/coinTile/coinTile.render.js
index e10fb12..eaf6d0d 100644
--- a/react/src/components/dashboard/coinTile.render.js
+++ b/react/src/components/dashboard/coinTile/coinTile.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const CoinTileRender = function() {
return (
diff --git a/react/src/components/dashboard/coinTileItem.js b/react/src/components/dashboard/coinTile/coinTileItem.js
similarity index 98%
rename from react/src/components/dashboard/coinTileItem.js
rename to react/src/components/dashboard/coinTile/coinTileItem.js
index 28640b7..5b6cace 100644
--- a/react/src/components/dashboard/coinTileItem.js
+++ b/react/src/components/dashboard/coinTile/coinTileItem.js
@@ -17,8 +17,8 @@ import {
getNativeTxHistory,
getKMDBalanceTotal,
getSyncInfoNative
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import CoinTileItemRender from './coinTileItem.render';
diff --git a/react/src/components/dashboard/coinTileItem.render.js b/react/src/components/dashboard/coinTile/coinTileItem.render.js
similarity index 100%
rename from react/src/components/dashboard/coinTileItem.render.js
rename to react/src/components/dashboard/coinTile/coinTileItem.render.js
diff --git a/react/src/components/dashboard/edex.js b/react/src/components/dashboard/edex/edex.js
similarity index 100%
rename from react/src/components/dashboard/edex.js
rename to react/src/components/dashboard/edex/edex.js
diff --git a/react/src/components/dashboard/jumblr.js b/react/src/components/dashboard/jumblr/jumblr.js
similarity index 77%
rename from react/src/components/dashboard/jumblr.js
rename to react/src/components/dashboard/jumblr/jumblr.js
index 44be584..4ae03a0 100755
--- a/react/src/components/dashboard/jumblr.js
+++ b/react/src/components/dashboard/jumblr/jumblr.js
@@ -1,7 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-/*import { dashboardChangeSection, toggleAddcoinModal, logout } from '../../actions/actionCreators';
-import Store from '../../store';*/
+import { translate } from '../../../translate/translate';
import JumblrRender from './jumblr.render';
diff --git a/react/src/components/dashboard/jumblr.render.js b/react/src/components/dashboard/jumblr/jumblr.render.js
similarity index 98%
rename from react/src/components/dashboard/jumblr.render.js
rename to react/src/components/dashboard/jumblr/jumblr.render.js
index 4396dc1..ec694ca 100644
--- a/react/src/components/dashboard/jumblr.render.js
+++ b/react/src/components/dashboard/jumblr/jumblr.render.js
@@ -1,7 +1,7 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
-import WalletsHeader from './walletsHeader';
+import WalletsHeader from '../walletsHeader/walletsHeader';
const JumblrRender = function() {
return (
diff --git a/react/src/components/dashboard/loginModal.js b/react/src/components/dashboard/loginModal/loginModal.js
similarity index 94%
rename from react/src/components/dashboard/loginModal.js
rename to react/src/components/dashboard/loginModal/loginModal.js
index 629d2d3..5df7883 100755
--- a/react/src/components/dashboard/loginModal.js
+++ b/react/src/components/dashboard/loginModal/loginModal.js
@@ -2,8 +2,8 @@ import React from 'react';
import {
toggleAddcoinModal,
iguanaWalletPassphrase
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import LoginModalRender from './loginModal.render';
diff --git a/react/src/components/dashboard/loginModal.render.js b/react/src/components/dashboard/loginModal/loginModal.render.js
similarity index 97%
rename from react/src/components/dashboard/loginModal.render.js
rename to react/src/components/dashboard/loginModal/loginModal.render.js
index ecb1332..37036ca 100644
--- a/react/src/components/dashboard/loginModal.render.js
+++ b/react/src/components/dashboard/loginModal/loginModal.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const LoginModalRender = function () {
return (
diff --git a/react/src/components/dashboard/dashboard.js b/react/src/components/dashboard/main/dashboard.js
similarity index 100%
rename from react/src/components/dashboard/dashboard.js
rename to react/src/components/dashboard/main/dashboard.js
diff --git a/react/src/components/dashboard/dashboard.render.js b/react/src/components/dashboard/main/dashboard.render.js
similarity index 63%
rename from react/src/components/dashboard/dashboard.render.js
rename to react/src/components/dashboard/main/dashboard.render.js
index f2e01fe..32a36c9 100644
--- a/react/src/components/dashboard/dashboard.render.js
+++ b/react/src/components/dashboard/main/dashboard.render.js
@@ -1,21 +1,21 @@
import React from 'react';
-import Navbar from './navbar';
-import CoinTile from './coinTile';
-import EDEX from './edex';
-import WalletsBalance from './walletsBalance';
-import WalletsProgress from './walletsProgress';
-import WalletsNav from './walletsNav';
-import SendCoin from './sendCoin';
-import WalletsData from './walletsData';
-import Atomic from './atomic';
-import Jumblr from './jumblr';
-import Settings from './settings';
-import ReceiveCoin from './receiveCoin';
-import About from './about';
-import WalletsNative from './walletsNative';
-import WalletsNativeTxInfo from './walletsNativeTxInfo';
-import WalletsTxInfo from './walletsTxInfo';
+import Navbar from '../navbar/navbar';
+import CoinTile from '../coinTile/coinTile';
+import EDEX from '../edex/edex';
+import WalletsBalance from '../walletsBalance/walletsBalance';
+import WalletsProgress from '../walletsProgress/walletsProgress';
+import WalletsNav from '../walletsNav/walletsNav';
+import SendCoin from '../sendCoin/sendCoin';
+import WalletsData from '../walletsData/walletsData';
+import Atomic from '../atomic/atomic';
+import Jumblr from '../jumblr/jumblr';
+import Settings from '../settings/settings';
+import ReceiveCoin from '../receiveCoin/receiveCoin';
+import About from '../about/about';
+import WalletsNative from '../walletsNative/walletsNative';
+import WalletsNativeTxInfo from '../walletsNativeTxInfo/walletsNativeTxInfo';
+import WalletsTxInfo from '../walletsTxInfo/walletsTxInfo';
const DashboardRender = function() {
return (
diff --git a/react/src/components/dashboard/dashboard.scss b/react/src/components/dashboard/main/dashboard.scss
similarity index 100%
rename from react/src/components/dashboard/dashboard.scss
rename to react/src/components/dashboard/main/dashboard.scss
diff --git a/react/src/components/dashboard/navbar.js b/react/src/components/dashboard/navbar/navbar.js
similarity index 96%
rename from react/src/components/dashboard/navbar.js
rename to react/src/components/dashboard/navbar/navbar.js
index 6785f2a..957c0e4 100755
--- a/react/src/components/dashboard/navbar.js
+++ b/react/src/components/dashboard/navbar/navbar.js
@@ -7,8 +7,8 @@ import {
toggleSyncOnlyModal,
getSyncOnlyForks,
logout
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import NavbarRender from './navbar.render';
diff --git a/react/src/components/dashboard/navbar.render.js b/react/src/components/dashboard/navbar/navbar.render.js
similarity index 98%
rename from react/src/components/dashboard/navbar.render.js
rename to react/src/components/dashboard/navbar/navbar.render.js
index b712fc1..35415b6 100644
--- a/react/src/components/dashboard/navbar.render.js
+++ b/react/src/components/dashboard/navbar/navbar.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const NavbarRender = function() {
return (
diff --git a/react/src/components/dashboard/notifications.js b/react/src/components/dashboard/notifications/notifications.js
similarity index 97%
rename from react/src/components/dashboard/notifications.js
rename to react/src/components/dashboard/notifications/notifications.js
index 908aab5..8b3c9ae 100755
--- a/react/src/components/dashboard/notifications.js
+++ b/react/src/components/dashboard/notifications/notifications.js
@@ -1,7 +1,5 @@
import React from 'react';
-
-import { sortByDate } from '../../util/sort';
-
+import { sortByDate } from '../../../util/sort';
import {
NotificationsByTypeRender,
NotificationsModalRender,
diff --git a/react/src/components/dashboard/notifications.render.js b/react/src/components/dashboard/notifications/notifications.render.js
similarity index 98%
rename from react/src/components/dashboard/notifications.render.js
rename to react/src/components/dashboard/notifications/notifications.render.js
index f4adcb0..836ccab 100644
--- a/react/src/components/dashboard/notifications.render.js
+++ b/react/src/components/dashboard/notifications/notifications.render.js
@@ -1,8 +1,8 @@
import React from 'react';
import {
secondsToString
-} from '../../util/time';
-import { translate } from '../../translate/translate';
+} from '../../../util/time';
+import { translate } from '../../../translate/translate';
export const NotificationsByTypeRender = function(logItem, type, index) {
return (
diff --git a/react/src/components/dashboard/receiveCoin.js b/react/src/components/dashboard/receiveCoin/receiveCoin.js
similarity index 97%
rename from react/src/components/dashboard/receiveCoin.js
rename to react/src/components/dashboard/receiveCoin/receiveCoin.js
index 64b2023..1a494df 100644
--- a/react/src/components/dashboard/receiveCoin.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.js
@@ -3,8 +3,8 @@ import {
copyCoinAddress,
checkAddressBasilisk,
validateAddressBasilisk
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
AddressActionsBasiliskModeRender,
diff --git a/react/src/components/dashboard/receiveCoin.render.js b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
similarity index 98%
rename from react/src/components/dashboard/receiveCoin.render.js
rename to react/src/components/dashboard/receiveCoin/receiveCoin.render.js
index 33a2208..9a54f80 100644
--- a/react/src/components/dashboard/receiveCoin.render.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
export const AddressActionsBasiliskModeRender = function(address) {
return (
diff --git a/react/src/components/dashboard/sendCoin.js b/react/src/components/dashboard/sendCoin/sendCoin.js
similarity index 99%
rename from react/src/components/dashboard/sendCoin.js
rename to react/src/components/dashboard/sendCoin/sendCoin.js
index d98364c..6384654 100644
--- a/react/src/components/dashboard/sendCoin.js
+++ b/react/src/components/dashboard/sendCoin/sendCoin.js
@@ -1,13 +1,13 @@
import React from 'react';
-import Config from '../../config';
-import { translate } from '../../translate/translate';
+import Config from '../../../config';
+import { translate } from '../../../translate/translate';
import {
checkTimestamp
-} from '../../util/time';
+} from '../../../util/time';
import {
edexGetTxIDList,
edexRemoveTXID
-} from '../../util/cacheFormat';
+} from '../../../util/cacheFormat';
import {
resolveOpenAliasAddress,
triggerToaster,
@@ -21,8 +21,8 @@ import {
clearLastSendToResponseState,
sendToAddressStateAlt,
dexSendRawTX
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
UTXOCacheInfoRender,
SendCoinResponseRender,
diff --git a/react/src/components/dashboard/sendCoin.render.js b/react/src/components/dashboard/sendCoin/sendCoin.render.js
similarity index 99%
rename from react/src/components/dashboard/sendCoin.render.js
rename to react/src/components/dashboard/sendCoin/sendCoin.render.js
index 9672a90..80ddd6c 100644
--- a/react/src/components/dashboard/sendCoin.render.js
+++ b/react/src/components/dashboard/sendCoin/sendCoin.render.js
@@ -1,9 +1,9 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
import {
secondsElapsedToString,
secondsToString
-} from '../../util/time';
+} from '../../../util/time';
export const UTXOCacheInfoRender = function(refreshCacheData, isReadyToUpdate, waitUntilCallIsFinished, timestamp) {
return (
diff --git a/react/src/components/dashboard/settings.js b/react/src/components/dashboard/settings/settings.js
similarity index 98%
rename from react/src/components/dashboard/settings.js
rename to react/src/components/dashboard/settings/settings.js
index aba855b..7213d80 100644
--- a/react/src/components/dashboard/settings.js
+++ b/react/src/components/dashboard/settings/settings.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
import {
iguanaActiveHandle,
encryptWallet,
@@ -12,8 +12,8 @@ import {
saveAppConfig,
getAppInfo,
shepherdCli
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
AppInfoTabRender,
diff --git a/react/src/components/dashboard/settings.render.js b/react/src/components/dashboard/settings/settings.render.js
similarity index 99%
rename from react/src/components/dashboard/settings.render.js
rename to react/src/components/dashboard/settings/settings.render.js
index d4ea061..3c806ec 100644
--- a/react/src/components/dashboard/settings.render.js
+++ b/react/src/components/dashboard/settings/settings.render.js
@@ -1,8 +1,8 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-import AddCoinOptionsCrypto from '../addcoin/addcoinOptionsCrypto';
-import AddCoinOptionsAC from '../addcoin/addcoinOptionsAC';
-import AddCoinOptionsACFiat from '../addcoin/addcoinOptionsACFiat';
+import { translate } from '../../../translate/translate';
+import AddCoinOptionsCrypto from '../../addcoin/addcoinOptionsCrypto';
+import AddCoinOptionsAC from '../../addcoin/addcoinOptionsAC';
+import AddCoinOptionsACFiat from '../../addcoin/addcoinOptionsACFiat';
export const AppInfoTabRender = function() {
return (
diff --git a/react/src/components/dashboard/syncOnly.js b/react/src/components/dashboard/syncOnly/syncOnly.js
similarity index 95%
rename from react/src/components/dashboard/syncOnly.js
rename to react/src/components/dashboard/syncOnly/syncOnly.js
index 6afe42a..6db1a9f 100644
--- a/react/src/components/dashboard/syncOnly.js
+++ b/react/src/components/dashboard/syncOnly/syncOnly.js
@@ -1,13 +1,13 @@
import React from 'react';
-import { getCoinTitle } from '../../util/coinHelper';
+import { getCoinTitle } from '../../../util/coinHelper';
import {
stopInterval,
addCoin,
toggleSyncOnlyModal,
stopIguanaFork,
restartIguanaInstance
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
ProgressRender,
diff --git a/react/src/components/dashboard/syncOnly.render.js b/react/src/components/dashboard/syncOnly/syncOnly.render.js
similarity index 98%
rename from react/src/components/dashboard/syncOnly.render.js
rename to react/src/components/dashboard/syncOnly/syncOnly.render.js
index 5183c35..6206c00 100644
--- a/react/src/components/dashboard/syncOnly.render.js
+++ b/react/src/components/dashboard/syncOnly/syncOnly.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
export const ProgressRender = function (fork) {
return (
diff --git a/react/src/components/dashboard/walletsBalance.js b/react/src/components/dashboard/walletsBalance/walletsBalance.js
similarity index 98%
rename from react/src/components/dashboard/walletsBalance.js
rename to react/src/components/dashboard/walletsBalance/walletsBalance.js
index 4603765..f7784f6 100755
--- a/react/src/components/dashboard/walletsBalance.js
+++ b/react/src/components/dashboard/walletsBalance/walletsBalance.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
import WalletsBalanceRender from './walletsBalance.render';
diff --git a/react/src/components/dashboard/walletsBalance.render.js b/react/src/components/dashboard/walletsBalance/walletsBalance.render.js
similarity index 97%
rename from react/src/components/dashboard/walletsBalance.render.js
rename to react/src/components/dashboard/walletsBalance/walletsBalance.render.js
index 205c77c..2df72fc 100644
--- a/react/src/components/dashboard/walletsBalance.render.js
+++ b/react/src/components/dashboard/walletsBalance/walletsBalance.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const WalletsBalanceRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsBasiliskConnection.js b/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.js
similarity index 87%
rename from react/src/components/dashboard/walletsBasiliskConnection.js
rename to react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.js
index 402867d..fc6172b 100755
--- a/react/src/components/dashboard/walletsBasiliskConnection.js
+++ b/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { basiliskConnection } from '../../actions/actionCreators';
-import Store from '../../store';
+import { basiliskConnection } from '../../../actions/actionCreators';
+import Store from '../../../store';
import WalletsBasiliskConnectionRender from './walletsBasiliskConnection.render';
class WalletsBasiliskConnection extends React.Component {
diff --git a/react/src/components/dashboard/walletsBasiliskConnection.render.js b/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.render.js
similarity index 97%
rename from react/src/components/dashboard/walletsBasiliskConnection.render.js
rename to react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.render.js
index 0e4d65a..0cd406e 100644
--- a/react/src/components/dashboard/walletsBasiliskConnection.render.js
+++ b/react/src/components/dashboard/walletsBasiliskConnection/walletsBasiliskConnection.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const WalletsBasiliskConnectionRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsBasiliskRefresh.js b/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.js
similarity index 100%
rename from react/src/components/dashboard/walletsBasiliskRefresh.js
rename to react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.js
diff --git a/react/src/components/dashboard/walletsBasiliskRefresh.render.js b/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.render.js
similarity index 92%
rename from react/src/components/dashboard/walletsBasiliskRefresh.render.js
rename to react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.render.js
index 2e03d19..2ca1658 100644
--- a/react/src/components/dashboard/walletsBasiliskRefresh.render.js
+++ b/react/src/components/dashboard/walletsBasiliskRefresh/walletsBasiliskRefresh.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const WalletsBasiliskRefreshRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsCacheData.js b/react/src/components/dashboard/walletsCacheData/walletsCacheData.js
similarity index 96%
rename from react/src/components/dashboard/walletsCacheData.js
rename to react/src/components/dashboard/walletsCacheData/walletsCacheData.js
index 8088771..d8d8f09 100644
--- a/react/src/components/dashboard/walletsCacheData.js
+++ b/react/src/components/dashboard/walletsCacheData/walletsCacheData.js
@@ -1,7 +1,7 @@
import React from 'react';
-import { secondsToString } from '../../util/time';
-import { toggleViewCacheModal } from '../../actions/actionCreators';
-import Store from '../../store';
+import { secondsToString } from '../../../util/time';
+import { toggleViewCacheModal } from '../../../actions/actionCreators';
+import Store from '../../../store';
import { TreeNode } from 'rc-tree';
import WalletsCacheDataRender from './walletsCacheData.render';
diff --git a/react/src/components/dashboard/walletsCacheData.render.js b/react/src/components/dashboard/walletsCacheData/walletsCacheData.render.js
similarity index 88%
rename from react/src/components/dashboard/walletsCacheData.render.js
rename to react/src/components/dashboard/walletsCacheData/walletsCacheData.render.js
index e912448..bc1af5f 100644
--- a/react/src/components/dashboard/walletsCacheData.render.js
+++ b/react/src/components/dashboard/walletsCacheData/walletsCacheData.render.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-import { animation } from '../../util/rc-tree-animate';
+import { translate } from '../../../translate/translate';
+import { animation } from '../../../util/rc-tree-animate';
import { TreeNode } from 'rc-tree';
const WalletsCacheDataRender = function() {
diff --git a/react/src/components/dashboard/walletsData.js b/react/src/components/dashboard/walletsData/walletsData.js
similarity index 98%
rename from react/src/components/dashboard/walletsData.js
rename to react/src/components/dashboard/walletsData/walletsData.js
index 5274360..37e0e97 100644
--- a/react/src/components/dashboard/walletsData.js
+++ b/react/src/components/dashboard/walletsData/walletsData.js
@@ -1,7 +1,7 @@
import React from 'react';
-import Config from '../../config';
-import { translate } from '../../translate/translate';
-import { sortByDate } from '../../util/sort';
+import Config from '../../../config';
+import { translate } from '../../../translate/translate';
+import { sortByDate } from '../../../util/sort';
import {
basiliskRefresh,
basiliskConnection,
@@ -17,8 +17,8 @@ import {
deleteCacheFile,
fetchNewCacheData,
fetchUtxoCache
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
PaginationItemRender,
PaginationItemsPerPageSelectorRender,
diff --git a/react/src/components/dashboard/walletsData.render.js b/react/src/components/dashboard/walletsData/walletsData.render.js
similarity index 96%
rename from react/src/components/dashboard/walletsData.render.js
rename to react/src/components/dashboard/walletsData/walletsData.render.js
index 0a8a7c4..ee37bb3 100644
--- a/react/src/components/dashboard/walletsData.render.js
+++ b/react/src/components/dashboard/walletsData/walletsData.render.js
@@ -1,10 +1,10 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-import WalletsBasiliskRefresh from './walletsBasiliskRefresh';
-import WalletsBasiliskConnection from './walletsBasiliskConnection';
-import WalletsNotariesList from './walletsNotariesList';
-import WalletsCacheData from './walletsCacheData';
-import { secondsToString } from '../../util/time';
+import { translate } from '../../../translate/translate';
+import WalletsBasiliskRefresh from '../walletsBasiliskRefresh/walletsBasiliskRefresh';
+import WalletsBasiliskConnection from '../walletsBasiliskConnection/walletsBasiliskConnection';
+import WalletsNotariesList from '../walletsNotariesList/walletsNotariesList';
+import WalletsCacheData from '../walletsCacheData/walletsCacheData';
+import { secondsToString } from '../../../util/time';
export const PaginationItemRender = function(i) {
return (
diff --git a/react/src/components/dashboard/walletsHeader.js b/react/src/components/dashboard/walletsHeader/walletsHeader.js
similarity index 100%
rename from react/src/components/dashboard/walletsHeader.js
rename to react/src/components/dashboard/walletsHeader/walletsHeader.js
diff --git a/react/src/components/dashboard/walletsHeader.render.js b/react/src/components/dashboard/walletsHeader/walletsHeader.render.js
similarity index 97%
rename from react/src/components/dashboard/walletsHeader.render.js
rename to react/src/components/dashboard/walletsHeader/walletsHeader.render.js
index 0de50dc..6a91725 100644
--- a/react/src/components/dashboard/walletsHeader.render.js
+++ b/react/src/components/dashboard/walletsHeader/walletsHeader.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const WalletsHeaderRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsNative.js b/react/src/components/dashboard/walletsNative/walletsNative.js
similarity index 100%
rename from react/src/components/dashboard/walletsNative.js
rename to react/src/components/dashboard/walletsNative/walletsNative.js
diff --git a/react/src/components/dashboard/walletsNative.render.js b/react/src/components/dashboard/walletsNative/walletsNative.render.js
similarity index 68%
rename from react/src/components/dashboard/walletsNative.render.js
rename to react/src/components/dashboard/walletsNative/walletsNative.render.js
index 8cc220a..b94ea84 100644
--- a/react/src/components/dashboard/walletsNative.render.js
+++ b/react/src/components/dashboard/walletsNative/walletsNative.render.js
@@ -1,10 +1,10 @@
import React from 'react';
-import WalletsNativeBalance from './walletsNativeBalance';
-import WalletsNativeInfo from './walletsNativeInfo';
-import WalletsNativeReceive from './walletsNativeReceive';
-import WalletsNativeSend from './walletsNativeSend';
-import WalletsNativeSyncProgress from './walletsNativeSyncProgress';
-import WalletsNativeTxHistory from './walletsNativeTxHistory';
+import WalletsNativeBalance from '../walletsNativeBalance/walletsNativeBalance';
+import WalletsNativeInfo from '../walletsNativeInfo/walletsNativeInfo';
+import WalletsNativeReceive from '../walletsNativeReceive/walletsNativeReceive';
+import WalletsNativeSend from '../walletsNativeSend/walletsNativeSend';
+import WalletsNativeSyncProgress from '../walletsNativeSyncProgress/walletsNativeSyncProgress';
+import WalletsNativeTxHistory from '../walletsNativeTxHistory/walletsNativeTxHistory';
const WalletsNativeRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsNativeAlert.js b/react/src/components/dashboard/walletsNativeAlert/walletsNativeAlert.js
similarity index 100%
rename from react/src/components/dashboard/walletsNativeAlert.js
rename to react/src/components/dashboard/walletsNativeAlert/walletsNativeAlert.js
diff --git a/react/src/components/dashboard/walletsNativeAlert.render.js b/react/src/components/dashboard/walletsNativeAlert/walletsNativeAlert.render.js
similarity index 84%
rename from react/src/components/dashboard/walletsNativeAlert.render.js
rename to react/src/components/dashboard/walletsNativeAlert/walletsNativeAlert.render.js
index 1a5dd27..5b59c54 100644
--- a/react/src/components/dashboard/walletsNativeAlert.render.js
+++ b/react/src/components/dashboard/walletsNativeAlert/walletsNativeAlert.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const WalletsNativeAlertRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsNativeBalance.js b/react/src/components/dashboard/walletsNativeBalance/walletsNativeBalance.js
similarity index 100%
rename from react/src/components/dashboard/walletsNativeBalance.js
rename to react/src/components/dashboard/walletsNativeBalance/walletsNativeBalance.js
diff --git a/react/src/components/dashboard/walletsNativeBalance.render.js b/react/src/components/dashboard/walletsNativeBalance/walletsNativeBalance.render.js
similarity index 96%
rename from react/src/components/dashboard/walletsNativeBalance.render.js
rename to react/src/components/dashboard/walletsNativeBalance/walletsNativeBalance.render.js
index 6e3344a..3783c20 100644
--- a/react/src/components/dashboard/walletsNativeBalance.render.js
+++ b/react/src/components/dashboard/walletsNativeBalance/walletsNativeBalance.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const WalletsNativeBalanceRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsNativeInfo.js b/react/src/components/dashboard/walletsNativeInfo/walletsNativeInfo.js
similarity index 100%
rename from react/src/components/dashboard/walletsNativeInfo.js
rename to react/src/components/dashboard/walletsNativeInfo/walletsNativeInfo.js
diff --git a/react/src/components/dashboard/walletsNativeInfo.render.js b/react/src/components/dashboard/walletsNativeInfo/walletsNativeInfo.render.js
similarity index 97%
rename from react/src/components/dashboard/walletsNativeInfo.render.js
rename to react/src/components/dashboard/walletsNativeInfo/walletsNativeInfo.render.js
index bf9f26d..792f8f0 100644
--- a/react/src/components/dashboard/walletsNativeInfo.render.js
+++ b/react/src/components/dashboard/walletsNativeInfo/walletsNativeInfo.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const WalletsNativeInfoRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsNativeReceive.js b/react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.js
similarity index 95%
rename from react/src/components/dashboard/walletsNativeReceive.js
rename to react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.js
index 7cc7b4f..05e65a4 100644
--- a/react/src/components/dashboard/walletsNativeReceive.js
+++ b/react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.js
@@ -2,8 +2,8 @@ import React from 'react';
import {
copyCoinAddress,
getNewKMDAddresses
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
AddressListRender,
WalletsNativeReceiveRender
diff --git a/react/src/components/dashboard/walletsNativeReceive.render.js b/react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.render.js
similarity index 98%
rename from react/src/components/dashboard/walletsNativeReceive.render.js
rename to react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.render.js
index f172524..483df3d 100644
--- a/react/src/components/dashboard/walletsNativeReceive.render.js
+++ b/react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
export const AddressListRender = function(address, type) {
return (
diff --git a/react/src/components/dashboard/walletsNativeSend.js b/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js
similarity index 96%
rename from react/src/components/dashboard/walletsNativeSend.js
rename to react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js
index cd8e1b5..8d618cc 100644
--- a/react/src/components/dashboard/walletsNativeSend.js
+++ b/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js
@@ -1,14 +1,14 @@
import React from 'react';
-import Config from '../../config';
-import { translate } from '../../translate/translate';
-import { secondsToString } from '../../util/time';
+import Config from '../../../config';
+import { translate } from '../../../translate/translate';
+import { secondsToString } from '../../../util/time';
import {
resolveOpenAliasAddress,
triggerToaster,
sendNativeTx,
getKMDOPID
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
AddressListRender,
OASendUIRender,
diff --git a/react/src/components/dashboard/walletsNativeSend.render.js b/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.render.js
similarity index 99%
rename from react/src/components/dashboard/walletsNativeSend.render.js
rename to react/src/components/dashboard/walletsNativeSend/walletsNativeSend.render.js
index 71400f6..5754d8a 100644
--- a/react/src/components/dashboard/walletsNativeSend.render.js
+++ b/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
export const AddressListRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsNativeSyncProgress.js b/react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.js
similarity index 98%
rename from react/src/components/dashboard/walletsNativeSyncProgress.js
rename to react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.js
index 46f65c3..4eead7d 100644
--- a/react/src/components/dashboard/walletsNativeSyncProgress.js
+++ b/react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
import {
ChainActivationNotificationRender,
WalletsNativeSyncProgressRender
diff --git a/react/src/components/dashboard/walletsNativeSyncProgress.render.js b/react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.render.js
similarity index 93%
rename from react/src/components/dashboard/walletsNativeSyncProgress.render.js
rename to react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.render.js
index 149e0c9..a99cda9 100644
--- a/react/src/components/dashboard/walletsNativeSyncProgress.render.js
+++ b/react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
export const ChainActivationNotificationRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsNativeTxHistory.js b/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.js
similarity index 96%
rename from react/src/components/dashboard/walletsNativeTxHistory.js
rename to react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.js
index 2090ace..7e2f3f2 100644
--- a/react/src/components/dashboard/walletsNativeTxHistory.js
+++ b/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.js
@@ -1,8 +1,8 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-import { sortByDate } from '../../util/sort';
-import { toggleDashboardTxInfoModal } from '../../actions/actionCreators';
-import Store from '../../store';
+import { translate } from '../../../translate/translate';
+import { sortByDate } from '../../../util/sort';
+import { toggleDashboardTxInfoModal } from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
PaginationItemsPerPageSelectorRender,
PaginationRender,
diff --git a/react/src/components/dashboard/walletsNativeTxHistory.render.js b/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.render.js
similarity index 97%
rename from react/src/components/dashboard/walletsNativeTxHistory.render.js
rename to react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.render.js
index 7e37d9c..72f63a0 100644
--- a/react/src/components/dashboard/walletsNativeTxHistory.render.js
+++ b/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.render.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-import { secondsToString } from '../../util/time';
+import { translate } from '../../../translate/translate';
+import { secondsToString } from '../../../util/time';
export const PaginationItemsPerPageSelectorRender = function() {
return (
diff --git a/react/src/components/dashboard/walletsNativeTxInfo.js b/react/src/components/dashboard/walletsNativeTxInfo/walletsNativeTxInfo.js
similarity index 89%
rename from react/src/components/dashboard/walletsNativeTxInfo.js
rename to react/src/components/dashboard/walletsNativeTxInfo/walletsNativeTxInfo.js
index e498e77..39deb98 100644
--- a/react/src/components/dashboard/walletsNativeTxInfo.js
+++ b/react/src/components/dashboard/walletsNativeTxInfo/walletsNativeTxInfo.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { toggleDashboardTxInfoModal } from '../../actions/actionCreators';
-import Store from '../../store';
+import { toggleDashboardTxInfoModal } from '../../../actions/actionCreators';
+import Store from '../../../store';
class WalletsNativeTxInfo extends React.Component {
constructor(props) {
diff --git a/react/src/components/dashboard/walletsNativeTxInfo.render.js b/react/src/components/dashboard/walletsNativeTxInfo/walletsNativeTxInfo.render.js
similarity index 97%
rename from react/src/components/dashboard/walletsNativeTxInfo.render.js
rename to react/src/components/dashboard/walletsNativeTxInfo/walletsNativeTxInfo.render.js
index 0f5a2cb..6f92eca 100644
--- a/react/src/components/dashboard/walletsNativeTxInfo.render.js
+++ b/react/src/components/dashboard/walletsNativeTxInfo/walletsNativeTxInfo.render.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-import { secondsToString } from '../../util/time';
+import { translate } from '../../../translate/translate';
+import { secondsToString } from '../../../util/time';
const WalletsNativeTxInfoRender = function(txInfo) {
return (
diff --git a/react/src/components/dashboard/walletsNav.js b/react/src/components/dashboard/walletsNav/walletsNav.js
similarity index 95%
rename from react/src/components/dashboard/walletsNav.js
rename to react/src/components/dashboard/walletsNav/walletsNav.js
index 2860a48..4a48169 100644
--- a/react/src/components/dashboard/walletsNav.js
+++ b/react/src/components/dashboard/walletsNav/walletsNav.js
@@ -6,8 +6,8 @@ import {
toggleReceiveCoinForm,
toggleSendReceiveCoinForms,
toggleDashboardActiveSection
-} from '../../actions/actionCreators';
-import Store from '../../store';
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
import {
WalletsNavNoWalletRender,
WalletsNavWithWalletRender
diff --git a/react/src/components/dashboard/walletsNav.render.js b/react/src/components/dashboard/walletsNav/walletsNav.render.js
similarity index 97%
rename from react/src/components/dashboard/walletsNav.render.js
rename to react/src/components/dashboard/walletsNav/walletsNav.render.js
index 57db2c9..77218de 100644
--- a/react/src/components/dashboard/walletsNav.render.js
+++ b/react/src/components/dashboard/walletsNav/walletsNav.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
export const WalletsNavNoWalletRender = function () {
return (
diff --git a/react/src/components/dashboard/walletsNotariesList.js b/react/src/components/dashboard/walletsNotariesList/walletsNotariesList.js
similarity index 89%
rename from react/src/components/dashboard/walletsNotariesList.js
rename to react/src/components/dashboard/walletsNotariesList/walletsNotariesList.js
index 24f16e5..731b03f 100644
--- a/react/src/components/dashboard/walletsNotariesList.js
+++ b/react/src/components/dashboard/walletsNotariesList/walletsNotariesList.js
@@ -1,7 +1,7 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-import { displayNotariesModal } from '../../actions/actionCreators';
-import Store from '../../store';
+import { translate } from '../../../translate/translate';
+import { displayNotariesModal } from '../../../actions/actionCreators';
+import Store from '../../../store';
import { TreeNode } from 'rc-tree';
import {
NotariesListRender,
diff --git a/react/src/components/dashboard/walletsNotariesList.render.js b/react/src/components/dashboard/walletsNotariesList/walletsNotariesList.render.js
similarity index 93%
rename from react/src/components/dashboard/walletsNotariesList.render.js
rename to react/src/components/dashboard/walletsNotariesList/walletsNotariesList.render.js
index f1db6c5..31f6ada 100644
--- a/react/src/components/dashboard/walletsNotariesList.render.js
+++ b/react/src/components/dashboard/walletsNotariesList/walletsNotariesList.render.js
@@ -1,7 +1,7 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
import Tree, { TreeNode } from 'rc-tree';
-import { animation } from '../../util/rc-tree-animate';
+import { animation } from '../../../util/rc-tree-animate';
export const NotariesListRender = function (node, index) {
<TreeNode title={ `Node ${index}` } key={ `node-${index}` }>
diff --git a/react/src/components/dashboard/walletsProgress.js b/react/src/components/dashboard/walletsProgress/walletsProgress.js
similarity index 94%
rename from react/src/components/dashboard/walletsProgress.js
rename to react/src/components/dashboard/walletsProgress/walletsProgress.js
index f2200bf..6ddfa27 100644
--- a/react/src/components/dashboard/walletsProgress.js
+++ b/react/src/components/dashboard/walletsProgress/walletsProgress.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
import WalletsProgressRender from './walletsProgress.render';
class WalletsProgress extends React.Component {
diff --git a/react/src/components/dashboard/walletsProgress.render.js b/react/src/components/dashboard/walletsProgress/walletsProgress.render.js
similarity index 96%
rename from react/src/components/dashboard/walletsProgress.render.js
rename to react/src/components/dashboard/walletsProgress/walletsProgress.render.js
index 3591ffd..74e4214 100644
--- a/react/src/components/dashboard/walletsProgress.render.js
+++ b/react/src/components/dashboard/walletsProgress/walletsProgress.render.js
@@ -1,5 +1,5 @@
import React from 'react';
-import { translate } from '../../translate/translate';
+import { translate } from '../../../translate/translate';
const WalletsProgressRender = function () {
return (
diff --git a/react/src/components/dashboard/walletsTxInfo.js b/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js
similarity index 89%
rename from react/src/components/dashboard/walletsTxInfo.js
rename to react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js
index f90f554..0eac017 100644
--- a/react/src/components/dashboard/walletsTxInfo.js
+++ b/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { toggleDashboardTxInfoModal } from '../../actions/actionCreators';
-import Store from '../../store';
+import { toggleDashboardTxInfoModal } from '../../../actions/actionCreators';
+import Store from '../../../store';
import WalletsTxInfoRender from './walletsTxInfo.render';
class WalletsTxInfo extends React.Component {
diff --git a/react/src/components/dashboard/walletsTxInfo.render.js b/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js
similarity index 96%
rename from react/src/components/dashboard/walletsTxInfo.render.js
rename to react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js
index d27daa3..c15cf17 100644
--- a/react/src/components/dashboard/walletsTxInfo.render.js
+++ b/react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { translate } from '../../translate/translate';
-import { secondsToString } from '../../util/time';
+import { translate } from '../../../translate/translate';
+import { secondsToString } from '../../../util/time';
const WalletsTxInfoRender = function(txInfo) {
return (
diff --git a/react/src/components/main/walletMain.js b/react/src/components/main/walletMain.js
index 70f933c..fdc6868 100644
--- a/react/src/components/main/walletMain.js
+++ b/react/src/components/main/walletMain.js
@@ -2,9 +2,9 @@ import React from 'react';
import Toaster from '../toaster/toaster';
import AddCoin from '../addcoin/addcoin';
import Login from '../login/login';
-import Dashboard from '../dashboard/dashboard';
-import SyncOnly from '../dashboard/syncOnly';
-import Notifications from '../dashboard/notifications';
+import Dashboard from '../dashboard/main/dashboard';
+import SyncOnly from '../dashboard/syncOnly/syncOnly';
+import Notifications from '../dashboard/notifications/notifications';
class WalletMain extends React.Component {
render() {
diff --git a/react/src/styles/index.scss b/react/src/styles/index.scss
index 3b3c8e4..84c0948 100644
--- a/react/src/styles/index.scss
+++ b/react/src/styles/index.scss
@@ -31,6 +31,6 @@
@import '../assets/skins/orange.min.css';
@import '../../node_modules/rc-tree/assets/index.css';
@import '../components/addcoin/addcoin.scss';
-@import '../components/dashboard/dashboard.scss';
+@import '../components/dashboard/main/dashboard.scss';
@import '../components/login/login.scss';
@import '../components/overrides.scss';
\ No newline at end of file
From 5417e0ebe88b14eb1cc81606c01d28ac2892533c Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sat, 10 Jun 2017 21:43:17 +0300
Subject: [PATCH 2/4] native receive missing return in render
---
.../components/dashboard/receiveCoin/receiveCoin.render.js | 6 +++---
.../dashboard/walletsNativeReceive/walletsNativeReceive.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
index 9a54f80..c83f736 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
@@ -27,7 +27,7 @@ export const AddressActionsBasiliskModeRender = function(address) {
);
};
-export const AddressActionsNonBasiliskModeRender = function (address) {
+export const AddressActionsNonBasiliskModeRender = function(address) {
return (
<td>
<span className="label label-default">
@@ -40,7 +40,7 @@ export const AddressActionsNonBasiliskModeRender = function (address) {
);
};
-export const AddressItemRender = function (address) {
+export const AddressItemRender = function(address) {
return (
<tr key={ address.address }>
{ this.renderAddressActions(address.address) }
@@ -51,7 +51,7 @@ export const AddressItemRender = function (address) {
);
};
-export const ReceiveCoinRender = function () {
+export const ReceiveCoinRender = function() {
return (
<div>
<div className="col-xs-12 margin-top-20">
diff --git a/react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.js b/react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.js
index 05e65a4..16fb502 100644
--- a/react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.js
+++ b/react/src/components/dashboard/walletsNativeReceive/walletsNativeReceive.js
@@ -66,7 +66,7 @@ class WalletsNativeReceive extends React.Component {
if (this.props &&
this.props.ActiveCoin &&
this.props.ActiveCoin.nativeActiveSection === 'receive') {
- WalletsNativeReceiveRender.call(this);
+ return WalletsNativeReceiveRender.call(this);
}
return null;
From ac3f6285c9c3fa5f27e65bdd4f498936fe2ae285 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sun, 11 Jun 2017 12:19:32 +0300
Subject: [PATCH 3/4] removed redundant display-none class
---
.../dashboard/coinTile/coinTile.render.js | 2 +-
.../components/dashboard/main/dashboard.scss | 30 ++++++++-----------
.../dashboard/navbar/navbar.render.js | 18 +++++------
.../dashboard/receiveCoin/receiveCoin.js | 6 ++--
.../walletsData/walletsData.render.js | 2 +-
.../walletsHeader/walletsHeader.render.js | 8 ++---
.../dashboard/walletsNative/walletsNative.js | 1 -
.../dashboard/walletsNav/walletsNav.render.js | 4 +--
8 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/react/src/components/dashboard/coinTile/coinTile.render.js b/react/src/components/dashboard/coinTile/coinTile.render.js
index eaf6d0d..d4b921c 100644
--- a/react/src/components/dashboard/coinTile/coinTile.render.js
+++ b/react/src/components/dashboard/coinTile/coinTile.render.js
@@ -9,7 +9,7 @@ const CoinTileRender = function() {
<i className="icon md-chevron-right"></i>
</div>
<div className="page-aside-inner">
- <div className="search-wallet-widgets panel display-none">
+ <div className="search-wallet-widgets panel hide">
<div className="panel-heading">
<div className="panel-actions">
<div className="input-search input-group-sm">
diff --git a/react/src/components/dashboard/main/dashboard.scss b/react/src/components/dashboard/main/dashboard.scss
index 06d2aa4..c32f5ab 100755
--- a/react/src/components/dashboard/main/dashboard.scss
+++ b/react/src/components/dashboard/main/dashboard.scss
@@ -6,31 +6,27 @@
text-align: center;
}
-.display-none {
- display: none !important;
-}
-
.margin-top-30 {
margin-top: 30px;
}
-// jumblr.js
+// jumblr.js
.jumblr-header {
font-size: 24px;
text-align: center;
}
-// loginModal.js
+// loginModal.js
.color-white {
color: #fff;
}
-//navbar.js
+// navbar.js
.navbar-toolbar > li > a.padding-top-16 {
padding-top: 16px;
}
-//notifications.js
+// notifications.js
.modal-body-container {
height: 590px;
}
@@ -40,7 +36,7 @@
overflow-y: scroll;
}
-//sendCoin.js
+// sendCoin.js
.vertical-padding-10 {
padding-top: 10px;
padding-bottom: 10px;
@@ -55,7 +51,7 @@
color: #f44336;
}
-//settings.js
+// settings.js
.wallet-info-key {
font-weight: bold;
}
@@ -68,7 +64,7 @@
text-align: left;
}
-//walletsBalance.js
+// walletsBalance.js
.font-weight-600 {
font-weight: 600;
}
@@ -77,7 +73,7 @@
font-size: 22px;
}
-//walletBasiliskConnection.js
+// walletBasiliskConnection.js
.wallet-send-header {
border-radius: 3px 3px 0 0;
}
@@ -94,7 +90,7 @@
font-size: 80%;
}
-//walletsData.js
+// walletsData.js
.z-index-10 {
z-index: 10;
}
@@ -107,12 +103,12 @@
padding: 20px 0 10px 0;
}
-//walletsHeader.js
+// walletsHeader.js
.z-index-1 {
z-index: 1;
}
-//walletsNative.js
+// walletsNative.js
.background-color-white {
background-color: #fff;
}
@@ -122,12 +118,12 @@
vertical-align: middle;
}
-//walletsNativeSyncProgress.js
+// walletsNativeSyncProgress.js
.sync-progress-container {
margin: -20px 0px 10px 0px;
}
-//walletsNativeTxInfo.js
+// walletsNativeTxInfo.js
.height-170 {
height: 170px;
}
\ No newline at end of file
diff --git a/react/src/components/dashboard/navbar/navbar.render.js b/react/src/components/dashboard/navbar/navbar.render.js
index 35415b6..4a3bab3 100644
--- a/react/src/components/dashboard/navbar/navbar.render.js
+++ b/react/src/components/dashboard/navbar/navbar.render.js
@@ -30,7 +30,7 @@ const NavbarRender = function() {
<div className="navbar-container container-fluid">
<div className="collapse navbar-collapse navbar-collapse-toolbar">
<ul className="nav navbar-toolbar">
- <li className="hidden-float display-none">
+ <li className="hidden-float hide">
<a>
<i className="icon hamburger hamburger-arrow-left">
<span className="sr-only">{ translate('INDEX.TOGGLE_MENUBAR') }</span>
@@ -48,7 +48,7 @@ const NavbarRender = function() {
<i className="site-menu-icon"></i> EasyDEX
</a>
</li>
- <li className={ 'display-none ' + (this.isSectionActive('jumblr') ? 'active nav-top-menu' : 'nav-top-menu') }>
+ <li className={ 'hide ' + (this.isSectionActive('jumblr') ? 'active nav-top-menu' : 'nav-top-menu') }>
<a onClick={ () => this.dashboardChangeSection('jumblr') }>
<i className="site-menu-icon"></i> Jumblr
</a>
@@ -64,19 +64,19 @@ const NavbarRender = function() {
<a
className="pointer padding-bottom-10 padding-top-16"
onClick={ this.toggleAddCoinModal }>
- <span>
- <img src="assets/images/icons/activatecoin.png" alt={ translate('INDEX.ADD_COIN') } />
- </span>
+ <span>
+ <img src="assets/images/icons/activatecoin.png" alt={ translate('INDEX.ADD_COIN') } />
+ </span>
</a>
</li>
<li
className={ 'pointer dropdown' + (this.state.openDropMenu ? ' open' : '') }
onClick={ this.openDropMenu }>
<a className="navbar-avatar dropdown-toggle">
- <span className="avatar avatar-online">
- <img src="assets/images/iguana_profile_02.jpg" alt="iguana profile pic" />
- <i></i>
- </span>
+ <span className="avatar avatar-online">
+ <img src="assets/images/iguana_profile_02.jpg" alt="iguana profile pic" />
+ <i></i>
+ </span>
</a>
<ul className="dropdown-menu">
<li>
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.js b/react/src/components/dashboard/receiveCoin/receiveCoin.js
index 1a494df..99c5069 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.js
@@ -62,10 +62,12 @@ class ReceiveCoin extends React.Component {
for (let i = 0; i < this.props.addresses.public.length; i++) {
let address = this.props.addresses.public[i];
- if (this.isBasiliskMode() && this.hasNoAmount(address)) {
+ if (this.isBasiliskMode() &&
+ this.hasNoAmount(address)) {
address.amount = this.props.cache && this.props.cache[this.props.coin][address.address] && this.props.cache[this.props.coin][address.address].getbalance.data && this.props.cache[this.props.coin][address.address].getbalance.data.balance ? this.props.cache[this.props.coin][address.address].getbalance.data.balance : 'N/A';
}
- if (this.isBasiliskMode() && this.hasNoInterest(address)) {
+ if (this.isBasiliskMode() &&
+ this.hasNoInterest(address)) {
address.interest = this.props.cache && this.props.cache[this.props.coin][address.address] && this.props.cache[this.props.coin][address.address].getbalance.data && this.props.cache[this.props.coin][address.address].getbalance.data.interest ? this.props.cache[this.props.coin][address.address].getbalance.data.interest : 'N/A';
}
diff --git a/react/src/components/dashboard/walletsData/walletsData.render.js b/react/src/components/dashboard/walletsData/walletsData.render.js
index ee37bb3..32c2dbb 100644
--- a/react/src/components/dashboard/walletsData/walletsData.render.js
+++ b/react/src/components/dashboard/walletsData/walletsData.render.js
@@ -171,7 +171,7 @@ export const WalletsDataRender = function() {
<i className="icon fa-history"></i> { translate('INDEX.REFETCH_WALLET_DATA') }
</a>
</li>
- <li className={ 'display-none ' + (!this.state.useCache ? 'hide' : '') }>
+ <li className={ 'hide ' + (!this.state.useCache ? 'hide' : '') }>
<a onClick={ this.restartBasiliskInstance }>
<i className="icon fa-refresh"></i> Restart Basilisk Instance (unsafe!)
</a>
diff --git a/react/src/components/dashboard/walletsHeader/walletsHeader.render.js b/react/src/components/dashboard/walletsHeader/walletsHeader.render.js
index 6a91725..bf44ffd 100644
--- a/react/src/components/dashboard/walletsHeader/walletsHeader.render.js
+++ b/react/src/components/dashboard/walletsHeader/walletsHeader.render.js
@@ -14,7 +14,7 @@ const WalletsHeaderRender = function() {
<img src="assets/images/native/jumblr_header_title_logo.png" /><br /> { translate('SIDEBAR.JUMBLR_MOTTO') }
</li>
</ol>
- <div className="page-header-actions z-index-1 display-none">
+ <div className="page-header-actions z-index-1 hide">
<div id="kmd_header_button">
<button
type="button"
@@ -38,7 +38,7 @@ const WalletsHeaderRender = function() {
</ul>
</div>
- <div id="zec_header_button" className="display-none">
+ <div id="zec_header_button" className="hide">
<button
type="button"
className="bg-yellow-600 btn btn-floating white waves-effect waves-float waves-light">
@@ -69,7 +69,7 @@ const WalletsHeaderRender = function() {
</button>
</div>
- <div id="kmd_header_button" className="display-none">
+ <div id="kmd_header_button" className="hide">
<button
type="button"
className="bg-teal-500 btn btn-floating white waves-effect waves-float waves-light">
@@ -92,7 +92,7 @@ const WalletsHeaderRender = function() {
</ul>
</div>
- <div className="row no-space width-350 hidden-xs display-none">
+ <div className="row no-space width-350 hidden-xs hide">
<div className="col-xs-6">
<div className="counter">
<span className="font-weight-medium"> - BTC</span>
diff --git a/react/src/components/dashboard/walletsNative/walletsNative.js b/react/src/components/dashboard/walletsNative/walletsNative.js
index b6f5853..de9304c 100644
--- a/react/src/components/dashboard/walletsNative/walletsNative.js
+++ b/react/src/components/dashboard/walletsNative/walletsNative.js
@@ -20,7 +20,6 @@ class WalletsNative extends React.Component {
this.props.ActiveCoin.mode === 'native';
}
- // <WalletsNativeAlert {...this.props} />
render() {
if (this.isActiveCoinModeNative()) {
return WalletsNativeRender.call(this);
diff --git a/react/src/components/dashboard/walletsNav/walletsNav.render.js b/react/src/components/dashboard/walletsNav/walletsNav.render.js
index 77218de..26d79f4 100644
--- a/react/src/components/dashboard/walletsNav/walletsNav.render.js
+++ b/react/src/components/dashboard/walletsNav/walletsNav.render.js
@@ -8,8 +8,8 @@ export const WalletsNavNoWalletRender = function () {
<div className="alert alert-info alert-dismissible">
<button type="button" className="close"></button>
<span className="font-size-24 text-align-center">
- <i className="icon fa-paw"></i> { translate('INDEX.NO_WALLET_CAPS') }
- </span>
+ <i className="icon fa-paw"></i> { translate('INDEX.NO_WALLET_CAPS') }
+ </span>
<br/>
{ translate('INDEX.PLEASE_SELECT_A_WALLET') }.
</div>
From 4b7b347e462850739ea89640a8ad102fffd98492 Mon Sep 17 00:00:00 2001
From: pbca26 <pbca26@gmail.com>
Date: Sun, 11 Jun 2017 12:27:58 +0300
Subject: [PATCH 4/4] added native sync rescan progress
---
.../walletsNativeSyncProgress.js | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.js b/react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.js
index 4eead7d..2d97a40 100644
--- a/react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.js
+++ b/react/src/components/dashboard/walletsNativeSyncProgress/walletsNativeSyncProgress.js
@@ -37,7 +37,7 @@ class WalletsNativeSyncProgress extends React.Component {
if (this.props.Settings &&
this.props.Settings.debugLog) {
if (this.props.Settings.debugLog.indexOf('UpdateTip') > -1) {
- let temp = this.props.Settings.debugLog.split(' ');
+ const temp = this.props.Settings.debugLog.split(' ');
let currentBestChain;
let currentProgress;
@@ -61,6 +61,18 @@ class WalletsNativeSyncProgress extends React.Component {
`: ${Math.floor(currentBestChain * 100 / this.props.Dashboard.progress.remoteKMDNode.blocks)}% (blocks ${currentBestChain} / ${this.props.Dashboard.progress.remoteKMDNode.blocks})`
);
}
+ } else if (this.props.Settings.debugLog.indexOf('Still rescanning') > -1) {
+ const temp = this.props.Settings.debugLog.split(' ');
+
+ for (let i = 0; i < temp.length; i++) {
+ if (temp[i].indexOf('Progress=') > -1) {
+ currentProgress = Number(temp[i].replace('Progress=', '')) * 100;
+ }
+ }
+
+ return (
+ `: ${currentProgress}%`
+ );
} else {
return (
<span>...</span>