diff --git a/assets/mainWindow/css/loading.css b/assets/mainWindow/css/loading.css
index c8c97c3..8782de6 100644
--- a/assets/mainWindow/css/loading.css
+++ b/assets/mainWindow/css/loading.css
@@ -109,4 +109,9 @@ body.agamaMode {
.btn.btn-primary.btn-close-app {
margin: 0;
+}
+
+.app-closing {
+ position: relative;
+ top: 50px;
}
\ No newline at end of file
diff --git a/react/change.log b/react/change.log
index 5ee34f5..ca49259 100644
--- a/react/change.log
+++ b/react/change.log
@@ -20,6 +20,7 @@ UI:
- jumblr
- zcashparams folder check
- claim interest modal
+- renewed transactions history look
v0.2.0.21a-beta
--------------
diff --git a/react/package.json b/react/package.json
index 656d1fd..f50b05e 100644
--- a/react/package.json
+++ b/react/package.json
@@ -47,6 +47,7 @@
"react-redux": "^5.0.3",
"react-router": "^3.0.2",
"react-router-redux": "^4.0.4",
+ "react-table": "~6.5.1",
"react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.4",
"redux": "^3.6.0",
diff --git a/react/src/actions/actions/addressBalance.js b/react/src/actions/actions/addressBalance.js
index a420575..9ec636b 100644
--- a/react/src/actions/actions/addressBalance.js
+++ b/react/src/actions/actions/addressBalance.js
@@ -222,7 +222,7 @@ export function getKMDAddressesNative(coin, mode, currentAddress) {
let isNewAddr = true;
for (let x = 0; x < result.length && isNewAddr; x++) {
- for (let y=0; y < result[x].length && isNewAddr; y++) {
+ for (let y = 0; y < result[x].length && isNewAddr; y++) {
if (allAddrArray[a] === result[x][y]) {
isNewAddr = false;
}
diff --git a/react/src/actions/actions/nativeSend.js b/react/src/actions/actions/nativeSend.js
index fc3e3e2..05e8dbb 100644
--- a/react/src/actions/actions/nativeSend.js
+++ b/react/src/actions/actions/nativeSend.js
@@ -176,8 +176,8 @@ export function getKMDOPIDState(json) {
}
export function getKMDOPID(opid, coin) {
- let tmpopidOutput = '',
- ajaxDataToHex;
+ let tmpopidOutput = '';
+ let ajaxDataToHex;
if (opid === undefined) {
ajaxDataToHex = null;
diff --git a/react/src/actions/actions/walletAuth.js b/react/src/actions/actions/walletAuth.js
index 31f2332..80798ac 100644
--- a/react/src/actions/actions/walletAuth.js
+++ b/react/src/actions/actions/walletAuth.js
@@ -255,6 +255,12 @@ export function iguanaActiveHandle(getMainAddress) {
'response': json,
}));
}
+ if (!Config.iguanaLessMode &&
+ sessionStorage.getItem('IguanaActiveAccount') &&
+ JSON.parse(sessionStorage.getItem('IguanaActiveAccount')).pubkey === json.pubkey &&
+ json.status === 'unlocked') {
+ sessionStorage.setItem('IguanaActiveAccount', JSON.stringify(json));
+ }
dispatch(getMainAddress ? getMainAddressState(json) : iguanaActiveHandleState(json));
});
}
diff --git a/react/src/assets/images/support/github-icon.png b/react/src/assets/images/support/github-icon.png
new file mode 100644
index 0000000..21ebc17
Binary files /dev/null and b/react/src/assets/images/support/github-icon.png differ
diff --git a/react/src/assets/images/support/slack-icon.png b/react/src/assets/images/support/slack-icon.png
new file mode 100644
index 0000000..edf6343
Binary files /dev/null and b/react/src/assets/images/support/slack-icon.png differ
diff --git a/react/src/assets/images/support/slack-invite-icon.png b/react/src/assets/images/support/slack-invite-icon.png
new file mode 100644
index 0000000..dd38ca6
Binary files /dev/null and b/react/src/assets/images/support/slack-invite-icon.png differ
diff --git a/react/src/components/addcoin/payload.js b/react/src/components/addcoin/payload.js
index 7e727f6..e167e1d 100644
--- a/react/src/components/addcoin/payload.js
+++ b/react/src/components/addcoin/payload.js
@@ -182,6 +182,11 @@ export function startCurrencyAssetChain(confpath, coin, mode) {
let AddCoinDataPayload = {};
let tmpPendValue = 1;
let tmpIguanaRPCAuth = `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`;
+ let assetChainPorts;
+
+ try {
+ assetChainPorts = window.require('electron').remote.getCurrentWindow().assetChainPorts;
+ } catch (e) {}
if (coin !== 'BTC' &&
coin !== 'LTC' &&
@@ -424,218 +429,218 @@ export function startCurrencyAssetChain(confpath, coin, mode) {
} else {
const USDDiff = {
'netmagic': '2d8e7803',
- 'p2p': 13966,
- 'rpc': 13967
+ 'p2p': assetChainPorts.USD,
+ 'rpc': assetChainPorts.USD - 1
};
AddCoinDataPayload.USDVar = Object.assign({}, _payloadVar, USDDiff);
const CHFDiff = {
'netmagic': '59fbeb5c',
- 'p2p': 15311,
- 'rpc': 15312
+ 'p2p': assetChainPorts.CHF,
+ 'rpc': assetChainPorts.CHF - 1
};
AddCoinDataPayload.CHFVar = Object.assign({}, _payloadVar, CHFDiff);
const CADDiff = {
'netmagic': '3c212763',
- 'p2p': 8719,
- 'rpc': 8720
+ 'p2p': assetChainPorts.CAD,
+ 'rpc': assetChainPorts.CAD - 1
};
AddCoinDataPayload.CADVar = Object.assign({}, _payloadVar, CADDiff);
const BRLDiff = {
'netmagic': 'ab82d10d',
- 'p2p': 9913,
- 'rpc': 9914
+ 'p2p': assetChainPorts.BRL,
+ 'rpc': assetChainPorts.BRL - 1
};
AddCoinDataPayload.BRLVar = Object.assign({}, _payloadVar, BRLDiff);
const BGNDiff = {
'netmagic': '93056ad4',
- 'p2p': 9109,
- 'rpc': 9110
+ 'p2p': assetChainPorts.BGN,
+ 'rpc': assetChainPorts.BGN - 1
};
AddCoinDataPayload.BGNVar = Object.assign({}, _payloadVar, BGNDiff);
const AUDDiff = {
'netmagic': '07220d4e',
- 'p2p': 8044,
- 'rpc': 8045
+ 'p2p': assetChainPorts.AUD,
+ 'rpc': assetChainPorts.AUD - 1
};
AddCoinDataPayload.AUDVar = Object.assign({}, _payloadVar, AUDDiff);
const PLNDiff = {
'netmagic': '46ab3c28',
- 'p2p': 13492,
- 'rpc': 13493
+ 'p2p': assetChainPorts.PLN,
+ 'rpc': assetChainPorts.PLN - 1
};
AddCoinDataPayload.PLNVar = Object.assign({}, _payloadVar, PLNDiff);
const PHPDiff = {
'netmagic': '21535fb6',
- 'p2p': 11180,
- 'rpc': 11181
+ 'p2p': assetChainPorts.PHP,
+ 'rpc': assetChainPorts.PHP - 1
};
AddCoinDataPayload.PHPVar = Object.assign({}, _payloadVar, PHPDiff);
const NZDDiff = {
'netmagic': 'f579c9c2',
- 'p2p': 10914,
- 'rpc': 10915
+ 'p2p': assetChainPorts.NZD,
+ 'rpc': assetChainPorts.NZD - 1
};
AddCoinDataPayload.NZDVar = Object.assign({}, _payloadVar, NZDDiff);
const NOKDiff = {
'netmagic': '7082c365',
- 'p2p': 11587,
- 'rpc': 11588
+ 'p2p': assetChainPorts.NOK,
+ 'rpc': assetChainPorts.NOK - 1
};
AddCoinDataPayload.NOKVar = Object.assign({}, _payloadVar, NOKDiff);
const MYRDiff = {
'netmagic': '3e21761f',
- 'p2p': 10687,
- 'rpc': 10688
+ 'p2p': assetChainPorts.MYR,
+ 'rpc': assetChainPorts.MYR - 1
};
AddCoinDataPayload.MYRVar = Object.assign({}, _payloadVar, MYRDiff);
const MXNDiff = {
'netmagic': '304c6c12',
- 'p2p': 13969,
- 'rpc': 13970
+ 'p2p': assetChainPorts.MXN,
+ 'rpc': assetChainPorts.MXN - 1
};
AddCoinDataPayload.MXNVar = Object.assign({}, _payloadVar, MXNDiff);
const KRWDiff = {
'netmagic': 'c8706588',
- 'p2p': 14019,
- 'rpc': 14020
+ 'p2p': assetChainPorts.KRW,
+ 'rpc': assetChainPorts.KRW - 1
};
AddCoinDataPayload.KRWVar = Object.assign({}, _payloadVar, KRWDiff);
const JPYDiff = {
'netmagic': '7a55295c',
- 'p2p': 13144,
- 'rpc': 13145
+ 'p2p': assetChainPorts.JPY,
+ 'rpc': assetChainPorts.JPY - 1
};
AddCoinDataPayload.JPYVar = Object.assign({}, _payloadVar, JPYDiff);
const INRDiff = {
'netmagic': '740dfc1d',
- 'p2p': 10535,
- 'rpc': 10536
+ 'p2p': assetChainPorts.INR,
+ 'rpc': assetChainPorts.INR - 1
};
AddCoinDataPayload.INRVar = Object.assign({}, _payloadVar, INRDiff);
const ILSDiff = {
'netmagic': '605fcd58',
- 'p2p': 14637,
- 'rpc': 14638
+ 'p2p': assetChainPorts.ILS,
+ 'rpc': assetChainPorts.ILS - 1
};
AddCoinDataPayload.ILSVar = Object.assign({}, _payloadVar, ILSDiff);
const IDRDiff = {
'netmagic': 'fee513e7',
- 'p2p': 14458,
- 'rpc': 14459
+ 'p2p': assetChainPorts.IDR,
+ 'rpc': assetChainPorts.IDR - 1
};
AddCoinDataPayload.IDRVar = Object.assign({}, _payloadVar, IDRDiff);
const HKDDiff = {
'netmagic': '57269d95',
- 'p2p': 15408,
- 'rpc': 15409
+ 'p2p': assetChainPorts.HKD,
+ 'rpc': assetChainPorts.HKD - 1
};
AddCoinDataPayload.HKDVar = Object.assign({}, _payloadVar, HKDDiff);
const HUFDiff = {
'netmagic': 'a478d2af',
- 'p2p': 13698,
- 'rpc': 13699
+ 'p2p': assetChainPorts.HUF,
+ 'rpc': assetChainPorts.HUF - 1
};
AddCoinDataPayload.HUFVar = Object.assign({}, _payloadVar, HUFDiff);
const GBPDiff = {
'netmagic': '5e0ed955',
- 'p2p': 11504,
- 'rpc': 11505
+ 'p2p': assetChainPorts.GBP,
+ 'rpc': assetChainPorts.GBP - 1
};
AddCoinDataPayload.GBPVar = Object.assign({}, _payloadVar, GBPDiff);
const EURDiff = {
'netmagic': '8a3fd0bd',
- 'p2p': 8064,
- 'rpc': 8065
+ 'p2p': assetChainPorts.EUR,
+ 'rpc': assetChainPorts.EUR - 1
};
AddCoinDataPayload.EURVar = Object.assign({}, _payloadVar, EURDiff);
const DKKDiff = {
'netmagic': 'a2c2380c',
- 'p2p': 13829,
- 'rpc': 13830
+ 'p2p': assetChainPorts.DKK,
+ 'rpc': assetChainPorts.DKK - 1
};
AddCoinDataPayload.DKKVar = Object.assign({}, _payloadVar, DKKDiff);
const CNYDiff = {
'netmagic': '2a51b987',
- 'p2p': 10383,
- 'rpc': 10384
+ 'p2p': assetChainPorts.CNY,
+ 'rpc': assetChainPorts.CNY - 1
};
AddCoinDataPayload.CNYVar = Object.assign({}, _payloadVar, CNYDiff);
const ZARDiff = {
'netmagic': '920c0484',
- 'p2p': 15159,
- 'rpc': 15160
+ 'p2p': assetChainPorts.ZAR,
+ 'rpc': assetChainPorts.ZAR - 1
};
AddCoinDataPayload.ZARVar = Object.assign({}, _payloadVar, ZARDiff);
const TRYDiff = {
'netmagic': '82b9a778',
- 'p2p': 13923,
- 'rpc': 13924
+ 'p2p': assetChainPorts.TRY,
+ 'rpc': assetChainPorts.TRY - 1
};
AddCoinDataPayload.TRYVar = Object.assign({}, _payloadVar, TRYDiff);
const THBDiff = {
'netmagic': 'b58aef42',
- 'p2p': 11846,
- 'rpc': 11847
+ 'p2p': assetChainPorts.THB,
+ 'rpc': assetChainPorts.THB - 1
};
AddCoinDataPayload.THBVar = Object.assign({}, _payloadVar, THBDiff);
const SGDDiff = {
'netmagic': 'ca255b29',
- 'p2p': 14474,
- 'rpc': 14475
+ 'p2p': assetChainPorts.SGD,
+ 'rpc': assetChainPorts.SGD - 1
};
AddCoinDataPayload.SGDVar = Object.assign({}, _payloadVar, SGDDiff);
const SEKDiff = {
'netmagic': 'd95ad28b',
- 'p2p': 11446,
- 'rpc': 11447
+ 'p2p': assetChainPorts.SEK,
+ 'rpc': assetChainPorts.SEK - 1
};
AddCoinDataPayload.SEKVar = Object.assign({}, _payloadVar, SEKDiff);
const RONDiff = {
'netmagic': 'eb2c9500',
- 'p2p': 8674,
- 'rpc': 8675
+ 'p2p': assetChainPorts.RON,
+ 'rpc': assetChainPorts.RON - 1
};
AddCoinDataPayload.RONVar = Object.assign({}, _payloadVar, RONDiff);
const RUBDiff = {
'netmagic': '1b9a0eb9',
- 'p2p': 8198,
- 'rpc': 8199
+ 'p2p': assetChainPorts.RUB,
+ 'rpc': assetChainPorts.RUB - 1
};
AddCoinDataPayload.RUBVar = Object.assign({}, _payloadVar, RUBDiff);
const CZKDiff = {
'netmagic': '37f7ae5a',
- 'p2p': 9481,
- 'rpc': 9482
+ 'p2p': assetChainPorts.CZK,
+ 'rpc': assetChainPorts.CZK - 1
};
AddCoinDataPayload.CZKVar = Object.assign({}, _payloadVar, CZKDiff);
@@ -646,6 +651,11 @@ export function startCurrencyAssetChain(confpath, coin, mode) {
export function startAssetChain(confpath, coin, mode, getSuppyOnly) {
let tmpIguanaRPCAuth = `tmpIgRPCUser@${sessionStorage.getItem('IguanaRPCAuth')}`;
let tmpPendValue;
+ let assetChainPorts;
+
+ try {
+ assetChainPorts = window.require('electron').remote.getCurrentWindow().assetChainPorts;
+ } catch (e) {}
if (coin !== 'BTC' &&
coin !== 'LTC' &&
@@ -682,74 +692,74 @@ export function startAssetChain(confpath, coin, mode, getSuppyOnly) {
'SUPERNET': {
'name': 'SUPERNET',
'supply': 816061,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"SUPERNET","conf":"SUPERNET.conf","path":confpath,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":32,"newcoin":"SUPERNET","name":"SUPERNET","netmagic":"cc55d9d4","p2p":11340,"rpc":11341}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":32,"newcoin":"SUPERNET","name":"SUPERNET","netmagic":"cc55d9d4","p2p":11340,"rpc":11341})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"SUPERNET","conf":"SUPERNET.conf","path":confpath,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":32,"newcoin":"SUPERNET","name":"SUPERNET","netmagic":"cc55d9d4","p2p":assetChainPorts.SUPERNET - 1,"rpc":assetChainPorts.SUPERNET}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":32,"newcoin":"SUPERNET","name":"SUPERNET","netmagic":"cc55d9d4","p2p":assetChainPorts.SUPERNET - 1,"rpc":assetChainPorts.SUPERNET})
},
'REVS': {
'name': 'REVS',
'supply': 1300000,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"REVS","conf":"REVS.conf","path":confpath,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"REVS","name":"REVS","netmagic":"905c3498","p2p":10195,"rpc":10196}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"REVS","name":"REVS","netmagic":"905c3498","p2p":10195,"rpc":10196})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"REVS","conf":"REVS.conf","path":confpath,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"REVS","name":"REVS","netmagic":"905c3498","p2p":assetChainPorts.REVS - 1,"rpc":assetChainPorts.REVS}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"REVS","name":"REVS","netmagic":"905c3498","p2p":assetChainPorts.REVS - 1,"rpc":assetChainPorts.REVS})
},
'WLC': {
'name': 'WIRELESS',
'supply': 210000000,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"WLC","conf":"WLC.conf","path":confpath,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"WLC","name":"WIRELESS","netmagic":"62071ed3","p2p":11666,"rpc":11667}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"WLC","name":"WIRELESS","netmagic":"62071ed3","p2p":11666,"rpc":11667})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"WLC","conf":"WLC.conf","path":confpath,"RELAY":-1,"VALIDATE":0,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"WLC","name":"WIRELESS","netmagic":"62071ed3","p2p":assetChainPorts.WIRELESS - 1,"rpc":assetChainPorts.WIRELESS}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"WLC","name":"WIRELESS","netmagic":"62071ed3","p2p":assetChainPorts.WIRELESS - 1,"rpc":assetChainPorts.WIRELESS})
},
'PANGEA': {
'name': 'PANGEA',
'supply': 999999,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"PANGEA","conf":"PANGEA.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"PANGEA","name":"PANGEA","netmagic":"5fa45ae8","p2p":10073,"rpc":10074}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"PANGEA","name":"PANGEA","netmagic":"5fa45ae8","p2p":10073,"rpc":10074})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"PANGEA","conf":"PANGEA.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"PANGEA","name":"PANGEA","netmagic":"5fa45ae8","p2p":assetChainPorts.PANGEA - 1,"rpc":assetChainPorts.PANGEA}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"PANGEA","name":"PANGEA","netmagic":"5fa45ae8","p2p":assetChainPorts.PANGEA - 1,"rpc":assetChainPorts.PANGEA})
},
'DEX': {
'name': 'DEX',
'supply': 999999,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"DEX","conf":"DEX.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"DEX","name":"DEX","netmagic":"f2ae0516","p2p":9502,"rpc":9503}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"DEX","name":"DEX","netmagic":"f2ae0516","p2p":9502,"rpc":9503})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"DEX","conf":"DEX.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"DEX","name":"DEX","netmagic":"f2ae0516","p2p":assetChainPorts.DEX - 1,"rpc":assetChainPorts.DEX}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"DEX","name":"DEX","netmagic":"f2ae0516","p2p":assetChainPorts.DEX - 1,"rpc":assetChainPorts.DEX})
},
'JUMBLR': {
'name': 'JUMBLR',
'supply': 999999,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"JUMBLR","conf":"JUMBLR.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"JUMBLR","name":"JUMBLR","netmagic":"7223759e","p2p":10788,"rpc":10789}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"JUMBLR","name":"JUMBLR","netmagic":"7223759e","p2p":10788,"rpc":10789})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"JUMBLR","conf":"JUMBLR.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"JUMBLR","name":"JUMBLR","netmagic":"7223759e","p2p":assetChainPorts.JUMBLR - 1,"rpc":assetChainPorts.JUMBLR}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"JUMBLR","name":"JUMBLR","netmagic":"7223759e","p2p":assetChainPorts.JUMBLR - 1,"rpc":assetChainPorts.JUMBLR})
},
'BET': {
'name': 'BET',
'supply': 999999,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"BET","conf":"BET.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"BET","name":"BET","netmagic":"6b9e3e1b","p2p":11221,"rpc":11222}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"BET","name":"BET","netmagic":"6b9e3e1b","p2p":11221,"rpc":11222})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"BET","conf":"BET.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"BET","name":"BET","netmagic":"6b9e3e1b","p2p":assetChainPorts.BET - 1,"rpc":assetChainPorts.BET}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"BET","name":"BET","netmagic":"6b9e3e1b","p2p":assetChainPorts.BET - 1,"rpc":assetChainPorts.BET})
},
'CRYPTO': {
'name': 'CRYPTO',
'supply': 999999,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"CRYPTO","conf":"CRYPTO.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"CRYPTO","name":"CRYPTO","netmagic":"fced9e2a","p2p":10419,"rpc":10420}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"CRYPTO","name":"CRYPTO","netmagic":"fced9e2a","p2p":10419,"rpc":10420})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"CRYPTO","conf":"CRYPTO.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"CRYPTO","name":"CRYPTO","netmagic":"fced9e2a","p2p":assetChainPorts.CRYPTO - 1,"rpc":assetChainPorts.CRYPTO}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"CRYPTO","name":"CRYPTO","netmagic":"fced9e2a","p2p":assetChainPorts.CRYPTO - 1,"rpc":assetChainPorts.CRYPTO})
},
'HODL': {
'name': 'HODL',
'supply': 9999999,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"HODL","conf":"HODL.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"HODL","name":"HODL","netmagic":"9b13fb5f","p2p":8009,"rpc":8010}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"HODL","name":"HODL","netmagic":"9b13fb5f","p2p":8009,"rpc":8010})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"HODL","conf":"HODL.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"HODL","name":"HODL","netmagic":"9b13fb5f","p2p":assetChainPorts.HODL - 1,"rpc":assetChainPorts.HODL}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"HODL","name":"HODL","netmagic":"9b13fb5f","p2p":assetChainPorts.HODL - 1,"rpc":assetChainPorts.HODL})
},
'SHARK': {
'name': 'SHARK',
'supply': 1401,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"SHARK","conf":"SHARK.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"SHARK","name":"SHARK","netmagic":"54a5e30c","p2p":14103,"rpc":14104}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"SHARK","name":"SHARK","netmagic":"54a5e30c","p2p":14103,"rpc":14104})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"SHARK","conf":"SHARK.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"SHARK","name":"SHARK","netmagic":"54a5e30c","p2p":assetChainPorts.SHARK - 1,"rpc":assetChainPorts.SHARK}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"SHARK","name":"SHARK","netmagic":"54a5e30c","p2p":assetChainPorts.SHARK - 1,"rpc":assetChainPorts.SHARK})
},
'BOTS': {
'name': 'BOTS',
'supply': 999999,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"BOTS","conf":"BOTS.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"BOTS","name":"BOTS","netmagic":"5bec8cf7","p2p":10150,"rpc":10151}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"BOTS","name":"BOTS","netmagic":"5bec8cf7","p2p":10150,"rpc":10151})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"BOTS","conf":"BOTS.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"BOTS","name":"BOTS","netmagic":"5bec8cf7","p2p":assetChainPorts.BOTS - 1,"rpc":assetChainPorts.BOTS}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"BOTS","name":"BOTS","netmagic":"5bec8cf7","p2p":assetChainPorts.BOTS - 1,"rpc":assetChainPorts.BOTS})
},
'MGW': {
'name': 'MGW',
'supply': 999999,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"MGW","conf":"MGW.conf","path":confpath,"unitval":"20","zcash":1,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"MGW","name":"MGW","netmagic":"6eea5dbb","p2p":15523,"rpc":15524}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"unitval":"20","zcash":1,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"MGW","name":"MGW","netmagic":"6eea5dbb","p2p":15523,"rpc":15524})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"MGW","conf":"MGW.conf","path":confpath,"unitval":"20","zcash":1,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"MGW","name":"MGW","netmagic":"6eea5dbb","p2p":assetChainPorts.MGW - 1,"rpc":assetChainPorts.MGW}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"unitval":"20","zcash":1,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"MGW","name":"MGW","netmagic":"6eea5dbb","p2p":assetChainPorts.MGW - 1,"rpc":assetChainPorts.MGW})
},
'MVP': {
'name': 'MVP',
@@ -760,26 +770,26 @@ export function startAssetChain(confpath, coin, mode, getSuppyOnly) {
'KV': {
'name': 'KV',
'supply': 1000000,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"KV","conf":"KV.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"KV","name":"KV","netmagic":"b09a2d65","p2p":9746,"rpc":9747}) : {},
- 'AddCoinDataVar': Object.assign(_acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"KV","name":"KV","netmagic":"b09a2d65","p2p":9746,"rpc":9747})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"KV","conf":"KV.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"KV","name":"KV","netmagic":"b09a2d65","p2p":assetChainPorts.KV - 1,"rpc":assetChainPorts.KV}) : {},
+ 'AddCoinDataVar': Object.assign(_acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"KV","name":"KV","netmagic":"b09a2d65","p2p":assetChainPorts.KV - 1,"rpc":assetChainPorts.KV})
},
'CEAL': {
'name': 'CEAL',
'supply': 366666666,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"CEAL","conf":"CEAL.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"CEAL","name":"CEAL","netmagic":"09e51af8","p2p":13096,"rpc":13097}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"CEAL","name":"CEAL","netmagic":"09e51af8","p2p":13096,"rpc":13097})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"CEAL","conf":"CEAL.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"CEAL","name":"CEAL","netmagic":"09e51af8","p2p":assetChainPorts.CEAL - 1,"rpc":assetChainPorts.CEAL}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"CEAL","name":"CEAL","netmagic":"09e51af8","p2p":assetChainPorts.CEAL - 1,"rpc":assetChainPorts.CEAL})
},
'MESH': {
'name': 'MESH',
'supply': 1000007,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"MESH","conf":"MESH.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"MESH","name":"MESH","netmagic":"f0265c67","p2p":8399,"rpc":8400}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"MESH","name":"MESH","netmagic":"f0265c67","p2p":8399,"rpc":8400})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"MESH","conf":"MESH.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"MESH","name":"MESH","netmagic":"f0265c67","p2p":assetChainPorts.MESH - 1,"rpc":assetChainPorts.MESH}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"MESH","name":"MESH","netmagic":"f0265c67","p2p":assetChainPorts.MESH - 1,"rpc":assetChainPorts.MESH})
},
'COQUI': {
'name': 'COQUI',
'supply': 72000000,
- 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"COQUI","conf":"COQUI.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"COQUI","name":"COQUI","netmagic":"4cbd5ef4","p2p":14275,"rpc":14276}) : {},
- 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"COQUI","name":"COQUI","netmagic":"4cbd5ef4","p2p":14275,"rpc":14276})
+ 'AddCoinData': confpath ? Object.assign({}, _acPayloadOrigin, {"coin":"COQUI","conf":"COQUI.conf","path":confpath,"RELAY":-1,"VALIDATE":1,"startpend":4,"endpend":4,"maxpeers":8,"newcoin":"COQUI","name":"COQUI","netmagic":"4cbd5ef4","p2p":assetChainPorts.COQUI - 1,"rpc":assetChainPorts.COQUI}) : {},
+ 'AddCoinDataVar': Object.assign({}, _acPayloadOrigin, {'userpass':tmpIguanaRPCAuth,"RELAY":mode,"VALIDATE":mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"maxpeers":8,"newcoin":"COQUI","name":"COQUI","netmagic":"4cbd5ef4","p2p":assetChainPorts.COQUI - 1,"rpc":assetChainPorts.COQUI})
}
};
diff --git a/react/src/components/dashboard/main/dashboard.scss b/react/src/components/dashboard/main/dashboard.scss
index 8dfc52c..3309f01 100755
--- a/react/src/components/dashboard/main/dashboard.scss
+++ b/react/src/components/dashboard/main/dashboard.scss
@@ -133,4 +133,46 @@
// walletsNativeTxInfo.js
.height-170 {
height: 170px;
+}
+
+.rt-tr.-odd div,
+.rt-tr.-even div {
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+
+.rt-tr-group.-odd .-padRow {
+ display: none;
+}
+
+.ReactTable .rt-tfoot .rt-td {
+ text-align: center;
+}
+
+.ReactTable .rt-thead .rt-th.-sort-asc,
+.ReactTable .rt-thead .rt-td.-sort-asc,
+.ReactTable .rt-thead .rt-th.-sort-desc,
+.ReactTable .rt-thead .rt-td.-sort-desc{
+ box-shadow: none;
+}
+
+.ReactTable .rt-thead .rt-th.-sort-asc div:nth-child(1):after {
+ font-family: FontAwesome;
+ padding-left: 5px;
+ content: "\f106";
+}
+.ReactTable .rt-thead .rt-th.-sort-desc div:nth-child(1):after {
+ font-family: FontAwesome;
+ padding-left: 5px;
+ content: "\f107";
+}
+
+.rt-tr.-padRow {
+ display: none;
+}
+
+.ReactTable .-pagination,
+.ReactTable .rt-thead.-header,
+.ReactTable .rt-tfoot{
+ box-shadow: none;
}
\ No newline at end of file
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
index 038ea1c..1be4154 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
@@ -54,7 +54,7 @@ export const AddressItemRender = function(address, type) {
{ this.renderAddressActions(address.address, type) }
| { type === 'public' ? address.address : `${address.address.substring(0, 34)}...` } |
{ address.amount } |
- {!this.isNativeMode() &&
+ { !this.isNativeMode() &&
{ address.interest ? address.interest : 'N/A' } |
}
@@ -175,5 +175,4 @@ export const ReceiveCoinRender = function() {
);
}
-};
-
+};
\ No newline at end of file
diff --git a/react/src/components/dashboard/settings/settings.js b/react/src/components/dashboard/settings/settings.js
index 59e3078..ae1044d 100644
--- a/react/src/components/dashboard/settings/settings.js
+++ b/react/src/components/dashboard/settings/settings.js
@@ -79,14 +79,27 @@ class Settings extends React.Component {
this.toggleSeedInputVisibility = this.toggleSeedInputVisibility.bind(this);
this._checkForUpdateUIPromise = this._checkForUpdateUIPromise.bind(this);
this._updateUIPromise = this._updateUIPromise.bind(this);
+ this.updateTabDimensions = this.updateTabDimensions.bind(this);
+ }
+
+ updateTabDimensions() {
+ setTimeout(() => {
+ const _height = document.querySelector(`#${this.state.tabElId} .panel-collapse .panel-body`).offsetHeight;
+
+ this.setState(Object.assign({}, this.state, {
+ activeTabHeight: _height,
+ }));
+ }, 100);
}
componentWillMount() {
socket.on('patch', msg => this.updateSocketsData(msg));
+ window.addEventListener('resize', this.updateTabDimensions);
}
componentWillUnmount() {
socket.removeAllListeners('patch', msg => this.updateSocketsData(msg));
+ window.removeEventListener('resize', this.updateTabDimensions);
if (!this.state.disableWalletSpecificUI) {
document.documentElement.style.height = '100%';
@@ -115,6 +128,25 @@ class Settings extends React.Component {
}
}
+ openExternalWindow(url) {
+ const remote = window.require('electron').remote;
+ const BrowserWindow = remote.BrowserWindow;
+
+ const externalWindow = new BrowserWindow({
+ width: 1280,
+ height: 800,
+ title: 'Loading...',
+ icon: remote.getCurrentWindow().iguanaIcon,
+ });
+
+ externalWindow.loadURL(url);
+ externalWindow.webContents.on('did-finish-load', function() {
+ setTimeout(function() {
+ externalWindow.show();
+ }, 40);
+ });
+ }
+
_resetAppConfig() {
Store.dispatch(resetAppConfig());
}
diff --git a/react/src/components/dashboard/settings/settings.render.js b/react/src/components/dashboard/settings/settings.render.js
index 065cfc4..96ea400 100644
--- a/react/src/components/dashboard/settings/settings.render.js
+++ b/react/src/components/dashboard/settings/settings.render.js
@@ -12,7 +12,7 @@ export const AppUpdateTabRender = function() {
onClick={ () => this.openTab('AppUpdate', 10) }>
this.openTab('Support', 11) }>
+
+
+
+
+
+
this.openExternalWindow('http://support.supernet.org') }>
+
+
Support tickets
+
support.supernet.org
+
+
+
+
this.openExternalWindow('https://sprnt.slack.com') }>
+
+
Slack
+
sprnt.slack.com
+
+
+
+
this.openExternalWindow('http://slackinvite.supernet.org') }>
+
+
Get Slack invite
+
slackinvite.supernet.org
+
+
+
+
this.openExternalWindow('https://github.com/SuperNETorg/Agama') }>
+
+
Github
+
github.com/SuperNETorg/Agama
+
+
+
+
+
+
+
+
{
+ if (!canPrevious) return;
+ this.changePage(page - 1)
+ }}
+ disabled={!canPrevious}>
+ {this.props.previousText}
+
+
+
+
+ {this.props.pageText}{' '}
+ {showPageJump
+ ?
+
+ {
+ const val = e.target.value;
+ this.changePage(val - 1);
+ }}
+ value={this.state.page === '' ? '' : this.state.page + 1}
+ onBlur={this.applyPage}
+ onKeyPress={e => {
+ if (e.which === 13 || e.keyCode === 13) {
+ this.applyPage();
+ }
+ }} />
+
+ :
+
+ {page + 1}
+ }{' '}
+ {this.props.ofText}{' '}
+ {pages || 1}
+
+ { showPageSizeOptions &&
+
+
+
+ }
+
+
+ {
+ if (!canNext) return;
+ this.changePage(page + 1);
+ }}
+ disabled={!canNext}>
+ {this.props.nextText}
+
+
+
- | { translate('INDEX.LOADING_HISTORY') }... |
-
- );
+ if (this.state.itemsList === 'loading' ||
+ this.state.itemsList.length == 0) {
+ if (this.isFullySynced()) {
+ return (
+
+ | { translate('INDEX.LOADING_HISTORY') }... |
+
+ );
+ } else {
+ return (
+
+ | Synchronization is in progress... |
+
+ );
+ }
} else if (this.state.itemsList === 'no data') {
return (
| { translate('INDEX.NO_DATA') } |
);
- } else {
- if (this.state.itemsList &&
- this.state.itemsList.length &&
- this.state.itemsList !== 'no data') {
- return this.state.itemsList.map((tx, index) =>
- TxHistoryListRender.call(
- this,
- tx,
- index
- )
- );
- }
+ } else if (this.state.itemsList) {
+ return TxHistoryListRender.call(this);
}
+
+ return null;
}
- updateAddressSelection(address, type, amount) {
+ onPageSizeChange(pageSize, pageIndex) {
+ this.setState(Object.assign({}, this.state, {
+ pageSize: pageSize,
+ showPagination: this.state.itemsList && this.state.itemsList.length >= defaultPageSize,
+ }))
+ }
+
+ updateAddressSelection(address) {
Store.dispatch(changeActiveAddress(address));
this.setState(Object.assign({}, this.state, {
currentAddress: address,
addressSelectorOpen: false,
- activePage: 1,
}));
if (this.props.ActiveCoin.mode === 'basilisk') {
@@ -490,31 +467,19 @@ class WalletsData extends React.Component {
}));
}
- renderAddress(tx) {
- if (!tx.address) {
- return (
-
- { translate('DASHBOARD.ZADDR_NOT_LISTED') }
-
- );
- }
-
- return tx.address;
- }
-
renderAddressByType(type) {
const _addresses = this.props.ActiveCoin.addresses;
+ const _coin = this.props.ActiveCoin.coin;
if (_addresses &&
_addresses[type] &&
_addresses[type].length) {
let items = [];
const _cache = this.props.ActiveCoin.cache;
- const _coin = this.props.ActiveCoin.coin;
for (let i = 0; i < _addresses[type].length; i++) {
const address = _addresses[type][i].address;
- let _amount = address.amount;
+ let _amount = _addresses[type][i].amount;
if (this.props.ActiveCoin.mode === 'basilisk') {
_amount = _cache && _cache[_coin] && _cache[_coin][address] && _cache[_coin][address].getbalance && _cache[_coin][address].getbalance.data && _cache[_coin][address].getbalance.data.balance ? _cache[_coin][address].getbalance.data.balance : 'N/A';
@@ -525,32 +490,28 @@ class WalletsData extends React.Component {
}
items.push(
-
- this.updateAddressSelection(address, type, _amount) }>
-
- [ { _amount } { _coin } ] { address }
-
-
-
+ AddressItemRender.call(this, address, type, _amount, _coin)
);
}
return items;
- } else {
- return null;
+ } else if (this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] && this.props.ActiveCoin.mode === 'basilisk') {
+ const address = this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin];
+
+ return AddressItemRender.call(this, address, type, null, _coin);
}
+
+ return null;
}
- hasPublicAdresses() {
+ hasPublicAddresses() {
return this.props.ActiveCoin.addresses &&
this.props.ActiveCoin.addresses.public &&
this.props.ActiveCoin.addresses.public.length;
}
renderAddressAmount() {
- if (this.hasPublicAdresses()) {
+ if (this.hasPublicAddresses()) {
const _addresses = this.props.ActiveCoin.addresses;
const _cache = this.props.ActiveCoin.cache;
const _coin = this.props.ActiveCoin.coin;
@@ -568,7 +529,13 @@ class WalletsData extends React.Component {
return _amount;
} else {
const address = _addresses.public[i].address;
- let _amount = _cache && _cache[_coin] && _cache[_coin][address] && _cache[_coin][address].getbalance.data && _cache[_coin][address].getbalance.data.balance ? _cache[_coin][address].getbalance.data.balance : 'N/A';
+ let _amount;
+
+ if (this.props.ActiveCoin.mode === 'basilisk') {
+ _amount = _cache && _cache[_coin] && _cache[_coin][address] && _cache[_coin][address].getbalance.data && _cache[_coin][address].getbalance.data.balance ? _cache[_coin][address].getbalance.data.balance : 'N/A';
+ } else {
+ _amount = _addresses.public[i].amount;
+ }
if (_amount !== 'N/A') {
_amount = formatValue('round', _amount, -6);
@@ -596,22 +563,54 @@ class WalletsData extends React.Component {
);
} else {
return (
- - { translate('KMD_NATIVE.SELECT_ADDRESS') } -
+ Filter by address
);
}
}
- renderAddressList() {
- if (this.props.Dashboard &&
+ shouldDisplayAddressList() {
+ if (this.props.ActiveCoin.mode === 'basilisk') {
+ return this.props.Dashboard &&
this.props.Dashboard.activeHandle &&
- this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] &&
- this.props.ActiveCoin.mode === 'basilisk') {
+ this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin];
+ }
+ }
+
+ renderAddressList() {
+ if (this.shouldDisplayAddressList()) {
return AddressListRender.call(this);
} else {
return null;
}
}
+ onSearchTermChange(newSearchTerm) {
+ this.setState(Object.assign({}, this.state, {
+ searchTerm: newSearchTerm,
+ filteredItemsList: this.filterTransactions(this.state.itemsList, newSearchTerm)
+ }));
+ }
+
+ filterTransactions(txList, searchTerm) {
+ return txList.filter(tx => this.filterTransaction(tx, searchTerm));
+ }
+
+ filterTransaction(tx, term) {
+ if (!term) {
+ return true;
+ }
+
+ return this.contains(tx.address, term)
+ || this.contains(tx.confirmations, term)
+ || this.contains(tx.amount, term)
+ || this.contains(tx.type, term)
+ || this.contains(secondsToString(tx.blocktime || tx.timestamp || tx.time), term);
+ }
+
+ contains(value, property) {
+ return (value + '').indexOf(property) !== -1;
+ }
+
isActiveCoinMode(coinMode) {
return this.props.ActiveCoin.mode === coinMode;
}
diff --git a/react/src/components/dashboard/walletsData/walletsData.render.js b/react/src/components/dashboard/walletsData/walletsData.render.js
index 97167ec..ba83ece 100644
--- a/react/src/components/dashboard/walletsData/walletsData.render.js
+++ b/react/src/components/dashboard/walletsData/walletsData.render.js
@@ -4,109 +4,58 @@ import WalletsBasiliskRefresh from '../walletsBasiliskRefresh/walletsBasiliskRef
import WalletsBasiliskConnection from '../walletsBasiliskConnection/walletsBasiliskConnection';
import WalletsNotariesList from '../walletsNotariesList/walletsNotariesList';
import WalletsCacheData from '../walletsCacheData/walletsCacheData';
-import { secondsToString } from '../../../util/time';
+import ReactTable from 'react-table';
+import TablePaginationRenderer from './pagination';
import { formatValue } from '../../../util/formatValue';
import Config from '../../../config';
-// TODO: clean basilisk dropdown menu
-
-export const PaginationItemRender = function(i) {
+export const AddressTypeRender = function() {
return (
-
- this.updateCurrentPage(i + 1) : null }>{ i + 1 }
-
+
+
+ { translate('IAPI.PUBLIC_SM') }
+
+
);
};
-export const PaginationItemsPerPageSelectorRender = function() {
+export const TransactionDetailRender = function(transactionIndex) {
return (
-
-
-
+
);
};
-export const PaginationRender = function(paginationFrom, paginationTo) {
- const disableNextBtn = this.state.activePage >= Math.floor(this.props.ActiveCoin.txhistory.length / this.state.itemsPerPage);
+export const AddressRender = function(tx) {
+ if (!tx.address) {
+ return (
+
+
+
+ { translate('DASHBOARD.ZADDR_NOT_LISTED') }
+
+
+ );
+ }
- return (
-
-
-
- { translate('INDEX.SHOWING') }
- { paginationFrom }
- { translate('INDEX.TO_ALT') }
- { paginationTo }
- { translate('INDEX.OF') }
- { this.props.ActiveCoin.txhistory.length }
- { translate('INDEX.ENTRIES_SM') }
-
-
-
-
- { this.isNativeMode() ?
- |
-
- { translate('IAPI.PUBLIC_SM') }
-
- |
- :
- null
- }
- { this.renderTxType(tx.category || tx.type) } |
- { tx.confirmations } |
- { Config.roundValues &&
- { formatValue('round', tx.amount, -6) || translate('DASHBOARD.UNKNOWN') } |
- }
- { !Config.roundValues &&
- { tx.amount || translate('DASHBOARD.UNKNOWN') } |
- }
- { secondsToString(tx.blocktime || tx.timestamp || tx.time) } |
- { tx.address } |
- { this.renderAddress(tx) } |
-
-
- |
-
+
+ this.updateAddressSelection(address) }>
+
+ [ { amount } { coin } ] { address }
+
+
+
);
};
@@ -121,7 +70,7 @@ export const AddressListRender = function() {
@@ -143,6 +100,86 @@ export const AddressListRender = function() {
}
};
+export const TxTypeRender = function(category) {
+ if (category === 'send' ||
+ category === 'sent') {
+ return (
+
+ { translate('DASHBOARD.OUT') }
+
+ );
+ }
+ if (category === 'receive' ||
+ category === 'received') {
+ return (
+
+ { translate('DASHBOARD.IN') }
+
+ );
+ }
+ if (category === 'generate') {
+ return (
+
+ { translate('DASHBOARD.MINED') }
+
+ );
+ }
+ if (category === 'immature') {
+ return (
+
+ { translate('DASHBOARD.IMMATURE') }
+
+ );
+ }
+ if (category === 'unknown') {
+ return (
+
+ { translate('DASHBOARD.UNKNOWN') }
+
+ );
+ }
+};
+
+export const TxAmountRender = function(tx) {
+ let _amountNegative;
+
+ if ((tx.category === 'send' ||
+ tx.category === 'sent') ||
+ (tx.type === 'send' ||
+ tx.type === 'sent')) {
+ _amountNegative = -1;
+ } else {
+ _amountNegative = 1;
+ }
+
+ if (Config.roundValues) {
+ return (
+ { formatValue('round', tx.amount, -6) * _amountNegative || translate('DASHBOARD.UNKNOWN') }
+ );
+ }
+
+ return (
+ { tx.amount * _amountNegative || translate('DASHBOARD.UNKNOWN') }
+ );
+};
+
+export const TxHistoryListRender = function() {
+ return (
+ this.onPageSizeChange(pageSize, pageIndex) } />
+ );
+};
+
export const WalletsDataRender = function() {
return (
@@ -156,18 +193,20 @@ export const WalletsDataRender = function() {
+ { this.props.ActiveCoin.mode === 'basilisk' &&
+
+
+ { translate('SEND.PROCESSING_REQ') }: { this.state.currentStackLength } / { this.state.totalStackLength }
+
+
+ }
-
+
-
-
- { translate('SEND.PROCESSING_REQ') }: { this.state.currentStackLength } / { this.state.totalStackLength }
-
-
{ !this.isNativeMode() ?
{ translate('INDEX.TRANSACTION_HISTORY') }
-
-
- { this.renderAddressList() }
-
-
-
-
- { this.renderPaginationItemsPerPageSelector() }
-
-
-
-
+
+ { this.shouldDisplayAddressList() &&
+
+ { this.renderAddressList() }
-
+ }
+ { this.props.ActiveCoin.txhistory !== 'loading' &&
+
+ this.onSearchTermChange(e.target.value) }
+ placeholder="Search" />
+
+ }
-
-
-
- { this.isNativeMode() ?
- | { translate('INDEX.TYPE') } |
- :
- null
- }
- { translate('INDEX.DIRECTION') } |
- { translate('INDEX.CONFIRMATIONS') } |
- { translate('INDEX.AMOUNT') } |
- { translate('INDEX.TIME') } |
- { translate('INDEX.DEST_ADDRESS') } |
- { translate('INDEX.TX_DETAIL') } |
-
-
-
- { this.renderTxHistoryList() }
-
-
-
- { this.isNativeMode() ?
- | { translate('INDEX.TYPE') } |
- :
- null
- }
- { translate('INDEX.DIRECTION') } |
- { translate('INDEX.CONFIRMATIONS') } |
- { translate('INDEX.AMOUNT') } |
- { translate('INDEX.TIME') } |
- { translate('INDEX.DEST_ADDRESS') } |
- { translate('INDEX.TX_DETAIL') } |
-
-
-
+ { this.renderTxHistoryList() }
- { this.renderPagination() }
diff --git a/react/src/components/dashboard/walletsNative/walletsNative.render.js b/react/src/components/dashboard/walletsNative/walletsNative.render.js
index e9202c2..deacd2f 100644
--- a/react/src/components/dashboard/walletsNative/walletsNative.render.js
+++ b/react/src/components/dashboard/walletsNative/walletsNative.render.js
@@ -14,7 +14,7 @@ const WalletsNativeRender = function() {
id="easydex-header-div"
className="background-color-white"
style={ this.getCoinStyle('transparent') }>
-
+
-
{ this.getCoinStyle('title') &&
diff --git a/react/src/components/dashboard/walletsNav/walletsNav.render.js b/react/src/components/dashboard/walletsNav/walletsNav.render.js
index b17f82d..58e7cf1 100644
--- a/react/src/components/dashboard/walletsNav/walletsNav.render.js
+++ b/react/src/components/dashboard/walletsNav/walletsNav.render.js
@@ -27,7 +27,7 @@ export const WalletsNavWithWalletRender = function() {
className={ 'page-header page-header-bordered header-easydex padding-bottom-' + (this.state.nativeOnly ? '40 page-header--native' : '20') }
id="header-dashboard"
style={{ marginBottom: this.props.ActiveCoin.mode === 'basilisk' ? '30px' : (this.state.nativeOnly ? '30px' : '0') }}>
-
+
{ translate('INDEX.MY') } { this.props && this.props.ActiveCoin ? this.props.ActiveCoin.coin : '-' } { translate('INDEX.ADDRESS') }:
{ this.props && this.props.Dashboard && this.props.Dashboard.activeHandle ? this.props.Dashboard.activeHandle[this.props.ActiveCoin.coin] : '-' }