diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 95048cf06..eb2488673 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -3,12 +3,11 @@ _Before filing a new issue, please **provide the following information**._ > I'm running: > > - **Parity client version**: 0.0.0 -> - **Parity UI version**: 0.0.0 +> - **EnergyWeb UI version**: 0.0.0 > - **Operating system**: Windows / MacOS / Linux > - **Installed via**: installer / snap / binaries / from source > - **Fully synchronized**: no / yes -> - **Network**: ethereum / ropsten / kovan / ... -> - **I tried to restart both Parity UI and Parity Ethereum client**: no / yes +> - **I tried to restart both EnergyWeb UI and Parity Ethereum client**: no / yes _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._ diff --git a/assets/icon/EWF-Brandmark-white1024px.png b/assets/icon/EWF-Brandmark-white1024px.png new file mode 100644 index 000000000..6ea83ef48 Binary files /dev/null and b/assets/icon/EWF-Brandmark-white1024px.png differ diff --git a/assets/icon/EWF-Brandmark-white512px.png b/assets/icon/EWF-Brandmark-white512px.png new file mode 100644 index 000000000..fcc4b5311 Binary files /dev/null and b/assets/icon/EWF-Brandmark-white512px.png differ diff --git a/electron/config.json b/electron/config.json index 57a5891c2..abe8af1cc 100644 --- a/electron/config.json +++ b/electron/config.json @@ -1,11 +1,11 @@ { - "appId": "io.parity.ui", + "appId": "io.ewf.ui", "directories": { "buildResources": "./" }, "linux": { "category": "Utility", - "icon": "./assets/icon/small-white-512x512.png", + "icon": "./assets/icon/EWF-Brandmark-white512px.png", "target": [ "AppImage", "snap", @@ -15,7 +15,7 @@ }, "mac": { "category": "public.app-category.productivity", - "icon": "./assets/icon/small-white-512x512.png", + "icon": "./assets/icon/EWF-Brandmark-white512px.png", "target": [ "pkg" ] @@ -29,11 +29,11 @@ "allowAnywhere": false, "allowCurrentUserHome": false }, - "productName": "Parity UI", + "productName": "EnergyWeb UI", "publish": "github", "win": { - "icon": "./assets/icon/small-white-512x512.png", - "publisherName": "Parity Technologies (UK) Ltd.", + "icon": "./assets/icon/EWF-Brandmark-white512px.png", + "publisherName": "Energy Web DevHub GmbH", "target": "nsis" } } \ No newline at end of file diff --git a/electron/index.js b/electron/index.js index 8667384a8..2689e3a57 100644 --- a/electron/index.js +++ b/electron/index.js @@ -161,7 +161,7 @@ function createWindow () { const sanitizedUrl = details.url.replace(/'/, ''); if (!webContents.isDestroyed()) { - webContents.executeJavaScript(`console.warn('Parity UI blocked a request to access ${sanitizedUrl}')`); + webContents.executeJavaScript(`console.warn('EnergyWeb UI blocked a request to access ${sanitizedUrl}')`); } callback({ cancel: true }); diff --git a/electron/installers/windows/installer.nsh b/electron/installers/windows/installer.nsh index 1d718cd85..e7d57dc47 100644 --- a/electron/installers/windows/installer.nsh +++ b/electron/installers/windows/installer.nsh @@ -2,9 +2,9 @@ ; https://www.electron.build/configuration/nsis#how-do-change-the-default-installation-directory-to-custom !macro preInit SetRegView 64 - WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI" - WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI" + WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\EnergyWeb UI" + WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\EnergyWeb UI" SetRegView 32 - WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI" - WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI" + WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\EnergyWeb UI" + WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\EnergyWeb UI" !macroend diff --git a/package-lock.json b/package-lock.json index 9b1e27b36..e623d5385 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "parity-ui", - "version": "0.4.2", + "name": "energyweb-ui", + "version": "0.4.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 10efd25e5..b13cfe19c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "parity-ui", - "version": "0.4.2", - "description": "The Electron app for Parity UI", + "name": "energyweb-ui", + "version": "0.4.3", + "description": "The Electron app for EnergyWeb UI", "main": ".build/electron.js", "jsnext:main": ".build/electron.js", "author": { @@ -22,7 +22,9 @@ }, "keywords": [ "Ethereum", - "Parity" + "Parity", + "EWF", + "Tobalaba" ], "parity": { "channel": "v1.11.11" diff --git a/scripts/parity-ui.desktop b/scripts/parity-ui.desktop index adbc33c25..6b6580828 100644 --- a/scripts/parity-ui.desktop +++ b/scripts/parity-ui.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Encoding=UTF-8 -Name=parity-ui -Comment=The Electron app for Parity UI -Exec=parity-ui +Name=energyweb-ui +Comment=The Electron app for EnergyWeb UI +Exec=energyweb-ui Terminal=true diff --git a/src/Connection/connection.js b/src/Connection/connection.js index 05b81b314..b3e16c530 100644 --- a/src/Connection/connection.js +++ b/src/Connection/connection.js @@ -275,7 +275,7 @@ class Connection extends Component {