Skip to content
This repository was archived by the owner on May 16, 2024. It is now read-only.

Commit 7639449

Browse files
begonaalvarezdcaposseleZuievrajivshah3sadjy
authored
Feat: Update UI to IOTA 2.0 DevNet (#27)
* wip * Fix issues * add output type filter * wip * wip * update electron * update node * replace remote module * wip * wip * clean up electron.js * wip * Fix bug * wip * integrate asset info fetching * clean up comments * disable logging * Feat update lib (#17) * wip * Fix issues * add output type filter * wip * wip * update electron * update node * replace remote module * wip * wip * clean up electron.js * Fix bug * clean up comments * disable logging * fix build (#20) * update styles on main screen * update h2 color and app bg color * fix apiRegistryClient unhandled exception * Build new homepage and confirmation page * update primary and secondary buttons * responsive layout * remove buttons hover and focus * animate drops in landing * Add Maximize / minimize features * does every window button need to be wrapped in an ElectronHelper component? * Update inputs background * add hexagon to landing page and tweka responsive from mobile to 4k * Set API and API ASSET REGISTRY endpoints * Check is Electron just once on window buttons * prevent image from being dragged * Improve landing page responsive styles * Add manual-desktop workflow * update homepage logo and header logo * use new API endpoint * Position & style landing page spinner and * prevent homepage from showing after after settings or delete screens * Revert "prevent homepage from showing after after settings or delete screens" This reverts commit 6ac04fc. * Check whether wallet has been loaded to show homepage or not * Update Electron storage directory name * tweak homepage styles * Add missing brackets * Hide api Registry Endpoint from Settings in production mode * Tidy up code * align Edit & Delete buttons horizontally in Assets card * Swap Smybol - Name -Color assets position * Truncate asset color string * Fine tune homepage CSS * remove webkit CSS from previous commit * fix drop css * check name & symbol length on asset create/update * update workflows to name the files "nectar" * Update readme to nectar * Update naming to nectar * Update version to v0.7.0 * Always display landing node notification message * Improve wallet tables UI * Small landing CSS retouch * Update API endpoint * remove commented code * rebuild spinners remove position attributes from Spinner component and set those in parent divs * avoid wallet centering and keep aligned to top * Add missing img alts * "show message on copy address" * "Catch and display forbidden strings error" * "improve copy to clipboard code" * replace Nectar Wallet and nectar Wallet with Nectar DevNet Wallet * Restart timer on every click to copy address to clipboard * Rewrite Balance to Balances * update nectar wallet to nectar devnet wallet * clear interval on componentWillUnmount and avoid fullscreen variable for maximize window * Centralize variables to avoid code duplication * Rename all to IOTA 2.0 DevNet Wallet * fix app names typos * add missing colon * update version * Add macOS notarization script and config * Remove manual action * adding signature vars and steps * Allow builds to be manually triggered * Don't fail fast * Fix working directory for AppImage signing * Fix actions with new names * fix actions * update product name * Add mac app icon Co-authored-by: capossele <[email protected]> Co-authored-by: Diego <[email protected]> Co-authored-by: Rajiv Shah <[email protected]> Co-authored-by: sadjy <[email protected]>
1 parent 2e75b93 commit 7639449

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1689
-368
lines changed

‎.github/workflows/desktop.yaml‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,23 @@ on:
88
- "src/**"
99
- ".github/workflows/desktop.yaml"
1010
- "package.json"
11+
workflow_dispatch:
12+
inputs:
13+
logLevel:
14+
description: 'Log level'
15+
required: true
16+
default: 'warning'
17+
tags:
18+
description: 'Test scenario tags'
19+
1120
jobs:
1221
build:
1322
#runs-on: ubuntu-18.04
1423
runs-on: ${{ matrix.os }}
1524
strategy:
1625
matrix:
1726
os: [ubuntu-18.04, macos-10.15, windows-2019]
27+
fail-fast: false
1828

1929
steps:
2030
- uses: actions/checkout@v2
@@ -31,16 +41,40 @@ jobs:
3141

3242
- name: Packaging Electron app - Windows
3343
run: npm run package-win
44+
env:
45+
CSC_LINK: ${{ secrets.WIN_CERT_BASE64 }}
46+
CSC_KEY_PASSWORD: ${{ secrets.WIN_CERT_PASSWORD }}
3447
if: matrix.os == 'windows-2019'
3548

3649
- name: Packaging Electron app - MacOs
3750
run: npm run package-mac
51+
env:
52+
CSC_LINK: ${{ secrets.MAC_CERT_BASE64 }}
53+
CSC_KEY_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
54+
POLLEN_APPLE_ID: ${{ secrets.APPLE_ID }}
55+
POLLEN_APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
3856
if: matrix.os == 'macos-10.15'
3957

4058
- name: Packaging Electron app - Linux
4159
run: npm run package-linux
4260
if: matrix.os == 'ubuntu-18.04'
4361

62+
- name: Import GPG key (Linux)
63+
run: |
64+
echo "$GPG_PRIVATE_KEY" | base64 -d > /tmp/private.key && \
65+
echo "$GPG_PASSPHRASE" | gpg --batch --yes --passphrase-fd 0 --import /tmp/private.key
66+
env:
67+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
68+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
69+
if: matrix.os == 'ubuntu-18.04'
70+
71+
- name: Sign AppImage (Linux)
72+
run: echo $GPG_PASSPHRASE | gpg --pinentry-mode loopback --batch --passphrase-fd 0 --armor --detach-sign --default-key [email protected] iota-devnet-wallet-*.AppImage
73+
working-directory: out
74+
env:
75+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
76+
if: matrix.os == 'ubuntu-18.04'
77+
4478
- name: get version
4579
id: package-version
4680
uses: notiz-dev/github-action-json-property@release
@@ -50,19 +84,19 @@ jobs:
5084

5185
- uses: actions/upload-artifact@v2
5286
with:
53-
name: pollen-wallet-win-${{ steps.package-version.outputs.prop}}
54-
path: out/pollen-wallet-${{ steps.package-version.outputs.prop}}.exe
87+
name: iota-devnet-wallet-win-${{ steps.package-version.outputs.prop}}
88+
path: out/iota-devnet-wallet-${{ steps.package-version.outputs.prop}}.exe
5589
if: matrix.os == 'windows-2019'
5690

5791
- uses: actions/upload-artifact@v2
5892
with:
59-
name: pollen-wallet-mac-${{ steps.package-version.outputs.prop}}
60-
path: out/pollen-wallet-${{ steps.package-version.outputs.prop}}.dmg
93+
name: iota-devnet-wallet-mac-${{ steps.package-version.outputs.prop}}
94+
path: out/iota-devnet-wallet-${{ steps.package-version.outputs.prop}}.dmg
6195
if: matrix.os == 'macos-10.15'
6296

6397
- uses: actions/upload-artifact@v2
6498
with:
65-
name: pollen-wallet-linux-${{ steps.package-version.outputs.prop}}
99+
name: iota-devnet-wallet-linux-${{ steps.package-version.outputs.prop}}
66100
path: |
67-
out/pollen-wallet-${{ steps.package-version.outputs.prop}}.AppImage
101+
out/iota-devnet-wallet-${{ steps.package-version.outputs.prop}}.AppImage
68102
if: matrix.os == 'ubuntu-18.04'

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v0.7.0
4+
5+
Update UI to Nectar branding
6+
37
## v0.6.2
48

59
Add Asset Registry support

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
# IOTA Pollen GUI Wallet
1+
# IOTA 2.0 DevNet GUI Wallet
22

3-
IOTA Pollen wallet GUI, a lightweight wallet for the test Pollen network.
3+
IOTA 2.0 DevNet GUI Wallet, a lightweight wallet for the IOTA 2.0 DevNet network.
44

5-
<span style="color:#bb0000">The wallet is configured by default to connect to a node running on your local machine. You must either run a local node or change the settings to connect to a remote node [See settings](#settings).</span>
5+
**Disclaimer** - This wallet is intended to demonstrate how to communicate with the IOTA 2.0 DevNet network, your seed is **NOT** stored securely.
66

7-
**Disclaimer** - This wallet is intended to demonstrate how to communicate with the Pollen network, your seed is **NOT** stored securely.
8-
9-
![Pollen Wallet](images/pollen-wallet.png)
7+
![IOTA 2.0 DevNet Wallet](images/devnet-wallet.png)
108

119
## Building
1210

@@ -37,6 +35,8 @@ npm run package-win
3735
npm run package-mac
3836
```
3937

38+
For local development, set the environment variable `MACOS_SKIP_NOTARIZATION=true` (or `MACOS_SKIP_NOTARISATION`).
39+
4040
### Linux
4141

4242
```shell
@@ -45,6 +45,6 @@ npm run package-linux
4545

4646
## Settings
4747

48-
By default the application is configured to access a `GoShimmer` nodes API running on your local machine at `http://127.0.0.1:8080`. To make it communicate with another node you can change the endpoint in the settings page.
48+
By default the application is configured to access a `GoShimmer` nodes API at `http://nodes.nectar.iota.cafe`. To make it communicate with another node you can change the endpoint in the settings page.
4949

50-
![Pollen Wallet](images/pollen-settings.png)
50+
![IOTA 2.0 DevNet Wallet](images/devnet-settings.png)

‎entitlements.mac.plist‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
6+
<true/>
7+
<key>com.apple.security.files.user-selected.read-write</key>
8+
<true/>
9+
</dict>
10+
</plist>

‎images/devnet-settings.png‎

13.4 KB
Loading

‎images/devnet-wallet.png‎

29.8 KB
Loading

‎images/pollen-settings.png‎

-33.1 KB
Binary file not shown.

‎images/pollen-wallet.png‎

-189 KB
Binary file not shown.

‎package-lock.json‎

Lines changed: 42 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "pollen-wallet",
3-
"description": "IOTA Pollen Wallet",
4-
"version": "0.6.2",
2+
"name": "iota-devnet-wallet",
3+
"description": "IOTA 2.0 DevNet Wallet",
4+
"version": "0.7.0",
55
"author": "Martyn Janes <[email protected]>",
66
"repository": {
77
"type": "git",
@@ -58,6 +58,7 @@
5858
"cross-env": "^7.0.3",
5959
"electron": "^12.0.7",
6060
"electron-builder": "^22.11.4",
61+
"electron-notarize": "^1.0.0",
6162
"husky": "^6.0.0",
6263
"node-sass": "^6.0.0",
6364
"sass-lint": "^1.13.1",
@@ -72,8 +73,8 @@
7273
"homepage": "./",
7374
"main": "./public/electron.js",
7475
"build": {
75-
"productName": "IOTA Pollen Wallet",
76-
"artifactName": "pollen-wallet-${version}.${ext}",
76+
"productName": "IOTA DevNet Wallet",
77+
"artifactName": "iota-devnet-wallet-${version}.${ext}",
7778
"copyright": "IOTA Foundation",
7879
"directories": {
7980
"output": "./out"
@@ -90,8 +91,23 @@
9091
"node_modules/blakejs/**/*.js"
9192
],
9293
"appId": "org.iota.pollen-wallet",
94+
"afterSign": "./scripts/notarize.macos.js",
9395
"win": {
9496
"icon": "./public/logo.png"
97+
},
98+
"mac": {
99+
"entitlements": "./entitlements.mac.plist",
100+
"entitlementsInherit": "./entitlements.mac.plist",
101+
"hardenedRuntime": true,
102+
"gatekeeperAssess": false,
103+
"asarUnpack": [
104+
"**/*.node"
105+
],
106+
"icon": "./public/icon.icns"
107+
},
108+
"dmg": {
109+
"title": "${productName}",
110+
"sign": false
95111
}
96112
}
97113
}

0 commit comments

Comments
 (0)