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/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/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/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](assets/images/cryptologo/supernet.png)
+
Support tickets
+
support.supernet.org
+
+
+
+
this.openExternalWindow('https://sprnt.slack.com') }>
+
![Slack](assets/images/support/slack-icon.png)
+
Slack
+
sprnt.slack.com
+
+
+
+
this.openExternalWindow('http://slackinvite.supernet.org') }>
+
![Slack invite](assets/images/support/slack-invite-icon.png)
+
Get Slack invite
+
slackinvite.supernet.org
+
+
+
+
this.openExternalWindow('https://github.com/SuperNETorg/Agama') }>
+
![Github](assets/images/support/github-icon.png)
+
Github
+
github.com/SuperNETorg/Agama
+
+
+
+
+
+
diff --git a/react/src/components/dashboard/walletsProgress/walletsProgress.render.js b/react/src/components/dashboard/walletsProgress/walletsProgress.render.js
index 6208677..0305aa1 100644
--- a/react/src/components/dashboard/walletsProgress/walletsProgress.render.js
+++ b/react/src/components/dashboard/walletsProgress/walletsProgress.render.js
@@ -76,7 +76,6 @@ export const WalletsProgressRender = function() {