one more removal

This reverts commit 3429e0a8e9.

.github/workflows/audit.yml

@@ -1,36 +0,0 @@
-name: Daily security audit
-
-on: workflow_dispatch
-jobs:
-  security_audit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-  notification:
-    if: ${{ failure() }}
-    needs: security_audit
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v2
-      - name: Keybase - Node Install
-        run: npm install
-        working-directory: .github/workflows/support-files
-      - name: Keybase - Send Notification
-        env:
-          NYM_NOTIFICATION_KIND: nightly
-          NYM_PROJECT_NAME: "Nym daily audit"
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-          GIT_BRANCH: "${GITHUB_REF##*/}"
-          KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
-          KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
-          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBTECH_TEAM }}"
-          KEYBASE_NYM_CHANNEL: "test"
-        uses: docker://keybaseio/client:stable-node
-        with:
-          args: .github/workflows/support-files/notifications/entry_point.sh

.github/workflows/nightly_build_on_dispatch.yml

@@ -166,8 +166,8 @@ jobs:
           GIT_BRANCH: "${GITHUB_REF##*/}"
           KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
           KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
-          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMTECH_TEAM }}"
-          KEYBASE_NYM_CHANNEL: "test"
+          KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
+          KEYBASE_NYM_CHANNEL: "ci-nightly"
           IS_SUCCESS: "${{ env.WORKFLOW_CONCLUSION == 'success' }}"
         uses: docker://keybaseio/client:stable-node
         with:

.github/workflows/nym-release-publish.yml

@@ -45,4 +45,3 @@ jobs:
             target/release/nym-socks5-client
             target/release/nym-validator-api
             target/release/nym-network-requester
-            target/release/nym-network-statistics

.github/workflows/nym_wallet.yml

@@ -51,12 +51,12 @@ jobs:
 
       - name: Install dependencies
         run: yarn install
-        working-directory: nym-wallet/wallet-ui-tests
+        working-directory: nym-wallet/webdriver
 
       - name: Remove existing user datafile
         uses: JesseTG/rm@v1.0.2
         with:
-          path: nym-wallet/wallet-ui-tests/common/user-data.json
+          path: nym-wallet/webdriver/common/data/user-data.json
 
       - name: Create user data json file
         id: create-json
@@ -64,7 +64,7 @@ jobs:
         with:
           name: "user-data.json"
           json: ${{ secrets.WALLET_USERDATA }}
-          dir: "nym-wallet/wallet-ui-tests/common/"
+          dir: "nym-wallet/webdriver/common/data/"
 
       - name: Install tauri-driver
         uses: actions-rs/cargo@v1
@@ -73,5 +73,5 @@ jobs:
           args: tauri-driver
 
       - name: Launch tests
-        run: xvfb-run yarn test
-        working-directory: nym-wallet/wallet-ui-tests
+        run: xvfb-run yarn test:runall
+        working-directory: nym-wallet/webdriver

CHANGELOG.md

@@ -2,16 +2,8 @@
 
 Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
 
-### Changed
-
-- validator-client: made `fee` argument optional for `execute` and `execute_multiple` ([#1541])
-
-[#1541]: https://github.com/nymtech/nym/pull/1541
-
-
-## [nym-binaries-1.0.2](https://github.com/nymtech/nym/tree/nym-binaries-1.0.2)
+## [Unreleased]
 
 ### Added
 
@@ -33,7 +25,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - validator-client: add `denom` argument and add simple test for querying an account balance
 - gateway, validator-api: Checks for coconut credential double spending attempts, taking the coconut bandwidth contract as source of truth ([#1457])
 - coconut-bandwidth-contract: Record the state of a coconut credential; create specific proposal for releasing funds ([#1457])
-- inclusion-probability: add simulator for active set inclusion probability
+- add validator-client script rust binary /tools/validator-client-scripts
 
 ### Fixed
 
@@ -46,7 +38,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - validator: fixed local docker-compose setup to work on Apple M1 ([#1329])
 - explorer-api: listen out for SIGTERM and SIGQUIT too, making it play nicely as a system service ([#1482]).
 - network-requester: fix filter for suffix-only domains ([#1487])
-- validator-api: listen out for SIGTERM and SIGQUIT too, making it play nicely as a system service ([#1496]).
 
 ### Changed
 
@@ -61,8 +52,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - multisig-contract: Limit the proposal creating functionality to one address (coconut-bandwidth-contract address) ([#1457])
 - All binaries and cosmwasm blobs are configured at runtime now; binaries are configured using environment variables or .env files and contracts keep the configuration parameters in storage ([#1463])
 - gateway, network-statistics: include gateway id in the sent statistical data ([#1478])
-- network explorer: tweak how active set probability is shown ([#1503])
-- validator-api: rewarder set update fails without panicking on possible nymd queries ([#1520])
 
 
 [#1249]: https://github.com/nymtech/nym/pull/1249
@@ -89,9 +78,90 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#1478]: https://github.com/nymtech/nym/pull/1478
 [#1482]: https://github.com/nymtech/nym/pull/1482
 [#1487]: https://github.com/nymtech/nym/pull/1487
-[#1496]: https://github.com/nymtech/nym/pull/1496
-[#1503]: https://github.com/nymtech/nym/pull/1503
-[#1520]: https://github.com/nymtech/nym/pull/1520
+
+## [nym-connect-v1.0.1](https://github.com/nymtech/nym/tree/nym-connect-v1.0.1) (2022-07-22)
+
+### Added
+
+- nym-connect: initial proof-of-concept of a UI around the socks5 client was added
+- nym-connect: add ability to select network requester and gateway ([#1427])
+- nym-connect: add ability to export gateway keys as JSON
+- nym-connect: add auto updater
+
+### Changed
+
+- nym-connect: reuse config id instead of creating a new id on each connection
+
+[#1427]: https://github.com/nymtech/nym/pull/1427
+
+## [nym-wallet-v1.0.7](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.7) (2022-07-11)
+
+- wallet: dark mode
+- wallet: when simulating gas costs, an automatic adjustment is being used ([#1388]).
+
+[#1388]: https://github.com/nymtech/nym/pull/1388
+
+## [nym-contracts-v1.0.1](https://github.com/nymtech/nym/tree/nym-contracts-v1.0.1) (2022-06-22)
+
+### Added
+
+- mixnet-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
+- mixnet-contract: Replace all naked `-` with `saturating_sub`.
+- mixnet-contract: Added staking_supply field to ContractStateParams.
+- mixnet-contract: Added a query to get MixnodeBond by identity key ([#1369]).
+- mixnet-contract: Added a query to get GatewayBond by identity key ([#1369]).
+- vesting-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
+- vesting-contract: Added limit to the amount of tokens one can pledge ([#1331])
+
+### Fixed
+
+- mixnet-contract: `estimated_delegator_reward` calculation ([#1284])
+- mixnet-contract: delegator and operator rewards use lambda and sigma instead of lambda_ticked and sigma_ticked ([#1284])
+- mixnet-contract: removed `expect` in `query_delegator_reward` and queries containing invalid proxy address should now return a more human-readable error ([#1257])
+- mixnet-contract: replaced integer division with fixed for performance calculations ([#1284])
+- mixnet-contract: Under certain circumstances nodes could not be unbonded ([#1255](https://github.com/nymtech/nym/issues/1255)) ([#1258])
+- mixnet-contract: Using correct staking supply when distributing rewards. ([#1373])
+- vesting-contract: replaced `checked_sub` with `saturating_sub` to fix the underflow in `get_vesting_tokens` ([#1275])
+
+
+[#1255]: https://github.com/nymtech/nym/pull/1255
+[#1257]: https://github.com/nymtech/nym/pull/1257
+[#1258]: https://github.com/nymtech/nym/pull/1258
+[#1275]: https://github.com/nymtech/nym/pull/1275
+[#1284]: https://github.com/nymtech/nym/pull/1284
+[#1292]: https://github.com/nymtech/nym/pull/1292
+[#1331]: https://github.com/nymtech/nym/pull/1331
+[#1369]: https://github.com/nymtech/nym/pull/1369
+[#1373]: https://github.com/nymtech/nym/pull/1373
+
+## [nym-wallet-v1.0.6](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.6) (2022-06-21)
+
+- wallet: undelegating now uses either the mixnet or vesting contract, or both, depending on how delegations were made
+- wallet: redeeming and compounding now uses both the mixnet and vesting contract
+- wallet: the wallet backend learned how to archive wallet files
+- wallet: add ENABLE_QA_MODE environment variable to enable QA mode on built wallet
+
+## [nym-wallet-v1.0.5](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.5) (2022-06-14)
+
+- wallet: add simple CLI tool for decrypting and recovering the wallet file.
+- wallet: added support for multiple accounts ([#1265])
+- wallet: compound and claim reward endpoints for operators and delegators ([#1302])
+- wallet: require password to switch accounts
+- wallet: the wallet backend learned how to keep track of validator name, either hardcoded or by querying the status endpoint.
+- wallet: new delegation and rewards UI
+- wallet: show version in nav bar
+- wallet: contract admin route put back
+- wallet: staking_supply field to StateParams
+- wallet: show transaction hash for redeeming or compounding rewards
+
+[#1265]: https://github.com/nymtech/nym/pull/1265
+[#1302]: https://github.com/nymtech/nym/pull/1302
+
+## [nym-wallet-v1.0.4](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.4) (2022-05-04)
+
+### Changed
+
+- all: the default behaviour of validator client is changed to use `broadcast_sync` and poll for transaction inclusion instead of using `broadcast_commit` to deal with timeouts ([#1246])
 
 ## [v1.0.1](https://github.com/nymtech/nym/tree/v1.0.1) (2022-05-04)
 
@@ -124,10 +194,77 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 [Full Changelog](https://github.com/nymtech/nym/compare/nym-wallet-v1.0.3...nym-binaries-1.0.0)
 
+## [nym-wallet-v1.0.3](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.3) (2022-04-25)
+
+[Full Changelog](https://github.com/nymtech/nym/compare/nym-binaries-1.0.0-rc.2...nym-wallet-v1.0.3)
+
+**Fixed bugs:**
+
+- \[Issue\] Wallet 1.0.2 cannot send NYM tokens from a DelayedVestingAccount [\#1215](https://github.com/nymtech/nym/issues/1215)
+- Main README not showing properly with GitHub dark mode [\#1211](https://github.com/nymtech/nym/issues/1211)
+
+**Merged pull requests:**
+
+- Bugfix - wallet undelegation for vesting accounts [\#1220](https://github.com/nymtech/nym/pull/1220) ([mmsinclair](https://github.com/mmsinclair))
+- Bugfix/delegation reconcile [\#1219](https://github.com/nymtech/nym/pull/1219) ([jstuczyn](https://github.com/jstuczyn))
+- Bugfix/query proxied pending delegations [\#1218](https://github.com/nymtech/nym/pull/1218) ([jstuczyn](https://github.com/jstuczyn))
+- Using custom gas multiplier in the wallet [\#1217](https://github.com/nymtech/nym/pull/1217) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/vesting accounts support [\#1216](https://github.com/nymtech/nym/pull/1216) ([jstuczyn](https://github.com/jstuczyn))
+- Release/1.0.0 rc.2 [\#1214](https://github.com/nymtech/nym/pull/1214) ([jstuczyn](https://github.com/jstuczyn))
+- chore: fix dark mode rendering [\#1212](https://github.com/nymtech/nym/pull/1212) ([pwnfoo](https://github.com/pwnfoo))
+- Feature/spend coconut [\#1210](https://github.com/nymtech/nym/pull/1210) ([neacsu](https://github.com/neacsu))
+- Bugfix/unique sphinx key [\#1207](https://github.com/nymtech/nym/pull/1207) ([jstuczyn](https://github.com/jstuczyn))
+- Add cache read and write timeouts [\#1206](https://github.com/nymtech/nym/pull/1206) ([durch](https://github.com/durch))
+- Additional, more informative routes [\#1204](https://github.com/nymtech/nym/pull/1204) ([durch](https://github.com/durch))
+- Feature/aggregated econ dynamics explorer endpoint [\#1203](https://github.com/nymtech/nym/pull/1203) ([jstuczyn](https://github.com/jstuczyn))
+- Debugging validator [\#1198](https://github.com/nymtech/nym/pull/1198) ([durch](https://github.com/durch))
+- wallet: expose additional validator configuration functionality to the frontend [\#1195](https://github.com/nymtech/nym/pull/1195) ([octol](https://github.com/octol))
+- Update rewarding validator address [\#1193](https://github.com/nymtech/nym/pull/1193) ([durch](https://github.com/durch))
+- Crypto part of the Groth's NIDKG [\#1182](https://github.com/nymtech/nym/pull/1182) ([jstuczyn](https://github.com/jstuczyn))
+- fix unbond page [\#1180](https://github.com/nymtech/nym/pull/1180) ([tommyv1987](https://github.com/tommyv1987))
+- Type safe bounds [\#1179](https://github.com/nymtech/nym/pull/1179) ([durch](https://github.com/durch))
+- Fix delegation paging [\#1174](https://github.com/nymtech/nym/pull/1174) ([durch](https://github.com/durch))
+- Update binaries to rc version [\#1172](https://github.com/nymtech/nym/pull/1172) ([tommyv1987](https://github.com/tommyv1987))
+- Bump ansi-regex from 4.1.0 to 4.1.1 in /docker/typescript\_client/upload\_contract [\#1171](https://github.com/nymtech/nym/pull/1171) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [nym-binaries-1.0.0-rc.2](https://github.com/nymtech/nym/tree/nym-binaries-1.0.0-rc.2) (2022-04-15)
 
 [Full Changelog](https://github.com/nymtech/nym/compare/nym-wallet-v1.0.2...nym-binaries-1.0.0-rc.2)
 
+## [nym-wallet-v1.0.2](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.2) (2022-04-05)
+
+[Full Changelog](https://github.com/nymtech/nym/compare/nym-wallet-v1.0.1...nym-wallet-v1.0.2)
+
+**Merged pull requests:**
+
+- Wallet 1.0.2 visual tweaks [\#1197](https://github.com/nymtech/nym/pull/1197) ([mmsinclair](https://github.com/mmsinclair))
+- Password for wallet with routes [\#1196](https://github.com/nymtech/nym/pull/1196) ([fmtabbara](https://github.com/fmtabbara))
+- Add auto-updater to Nym Wallet [\#1194](https://github.com/nymtech/nym/pull/1194) ([mmsinclair](https://github.com/mmsinclair))
+- Fix clippy warnings for beta toolchain [\#1191](https://github.com/nymtech/nym/pull/1191) ([octol](https://github.com/octol))
+- wallet: expose validator urls to the frontend [\#1190](https://github.com/nymtech/nym/pull/1190) ([octol](https://github.com/octol))
+- wallet: add test for decrypting stored wallet file [\#1189](https://github.com/nymtech/nym/pull/1189) ([octol](https://github.com/octol))
+- Fix clippy warnings [\#1188](https://github.com/nymtech/nym/pull/1188) ([octol](https://github.com/octol))
+- Password for wallet with routes [\#1187](https://github.com/nymtech/nym/pull/1187) ([mmsinclair](https://github.com/mmsinclair))
+- wallet: add validate\_mnemonic [\#1186](https://github.com/nymtech/nym/pull/1186) ([octol](https://github.com/octol))
+- wallet: support removing accounts from the wallet file [\#1185](https://github.com/nymtech/nym/pull/1185) ([octol](https://github.com/octol))
+- Feature/adding discord [\#1184](https://github.com/nymtech/nym/pull/1184) ([gala1234](https://github.com/gala1234))
+- wallet: config backend for validator selection [\#1183](https://github.com/nymtech/nym/pull/1183) ([octol](https://github.com/octol))
+- Add storybook to wallet [\#1178](https://github.com/nymtech/nym/pull/1178) ([mmsinclair](https://github.com/mmsinclair))
+- wallet: connection test nymd and api urls independently [\#1170](https://github.com/nymtech/nym/pull/1170) ([octol](https://github.com/octol))
+- wallet: wire up account storage [\#1153](https://github.com/nymtech/nym/pull/1153) ([octol](https://github.com/octol))
+- Feature/signature on deposit [\#1151](https://github.com/nymtech/nym/pull/1151) ([neacsu](https://github.com/neacsu))
+
+## [nym-wallet-v1.0.1](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.1) (2022-04-05)
+
+[Full Changelog](https://github.com/nymtech/nym/compare/nym-binaries-1.0.0-rc.1...nym-wallet-v1.0.1)
+
+**Closed issues:**
+
+- Check enabling bbbc simultaneously with open access. Estimate what it would take to make this the default compilation target. [\#1175](https://github.com/nymtech/nym/issues/1175)
+- Get coconut credential for deposited tokens [\#1138](https://github.com/nymtech/nym/issues/1138)
+- Make payments lazy [\#1135](https://github.com/nymtech/nym/issues/1135)
+- Uptime on node selection for sets [\#1049](https://github.com/nymtech/nym/issues/1049)
+
 ## [nym-binaries-1.0.0-rc.1](https://github.com/nymtech/nym/tree/nym-binaries-1.0.0-rc.1) (2022-03-28)
 
 [Full Changelog](https://github.com/nymtech/nym/compare/nym-wallet-v1.0.0...nym-binaries-1.0.0-rc.1)
@@ -206,6 +343,108 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - feature/pedersen-commitments [\#1048](https://github.com/nymtech/nym/pull/1048) ([danielementary](https://github.com/danielementary))
 - Feature/reuse init owner [\#970](https://github.com/nymtech/nym/pull/970) ([neacsu](https://github.com/neacsu))
 
+## [nym-wallet-v1.0.0](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.0) (2022-02-03)
+
+[Full Changelog](https://github.com/nymtech/nym/compare/v0.12.1...nym-wallet-v1.0.0)
+
+**Implemented enhancements:**
+
+- \[Feature Request\] Please enable registration without need for Telegram account [\#1016](https://github.com/nymtech/nym/issues/1016)
+- Fast mixnode launch with a pre-built ISO + VM software [\#1001](https://github.com/nymtech/nym/issues/1001)
+
+**Fixed bugs:**
+
+- \[Issue\] [\#1000](https://github.com/nymtech/nym/issues/1000)
+- \[Issue\] `nym-client` requires multiple attempts to run a server [\#869](https://github.com/nymtech/nym/issues/869)
+- De-'float'-ing `Interval` \(`Display` impl + `serde`\) [\#1065](https://github.com/nymtech/nym/pull/1065) ([jstuczyn](https://github.com/jstuczyn))
+- display client address on wallet creation [\#1058](https://github.com/nymtech/nym/pull/1058) ([fmtabbara](https://github.com/fmtabbara))
+
+**Closed issues:**
+
+- Rewarded set inclusion probability API endpoint [\#1037](https://github.com/nymtech/nym/issues/1037)
+- Update cw-storage-plus to 0.11  [\#1032](https://github.com/nymtech/nym/issues/1032)
+- Change `u128` fields in `RewardEstimationResponse` to `u64` [\#1029](https://github.com/nymtech/nym/issues/1029)
+- Test out the mainnet Gravity Bridge [\#1006](https://github.com/nymtech/nym/issues/1006)
+- Add vesting contract interface to nym-wallet [\#959](https://github.com/nymtech/nym/issues/959)
+- Mixnode crash [\#486](https://github.com/nymtech/nym/issues/486)
+
+**Merged pull requests:**
+
+- create custom urls for mainnet [\#1095](https://github.com/nymtech/nym/pull/1095) ([fmtabbara](https://github.com/fmtabbara))
+- Wallet signing on MacOS [\#1093](https://github.com/nymtech/nym/pull/1093) ([mmsinclair](https://github.com/mmsinclair))
+- Fix rust 2018 idioms warnings [\#1092](https://github.com/nymtech/nym/pull/1092) ([octol](https://github.com/octol))
+- Prevent contract overwriting [\#1090](https://github.com/nymtech/nym/pull/1090) ([durch](https://github.com/durch))
+- Logout operation [\#1087](https://github.com/nymtech/nym/pull/1087) ([jstuczyn](https://github.com/jstuczyn))
+- Update to rust edition 2021 everywhere [\#1086](https://github.com/nymtech/nym/pull/1086) ([octol](https://github.com/octol))
+- Tag contract errors, and print out lines for easier QA [\#1084](https://github.com/nymtech/nym/pull/1084) ([durch](https://github.com/durch))
+- Feature/flexible vesting + utility queries [\#1083](https://github.com/nymtech/nym/pull/1083) ([durch](https://github.com/durch))
+- Bump @openzeppelin/contracts from 4.3.1 to 4.4.2 in /contracts/basic-bandwidth-generation [\#1082](https://github.com/nymtech/nym/pull/1082) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nth-check from 2.0.0 to 2.0.1 in /clients/native/examples/js-examples/websocket [\#1081](https://github.com/nymtech/nym/pull/1081) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump url-parse from 1.5.1 to 1.5.4 in /clients/native/examples/js-examples/websocket [\#1080](https://github.com/nymtech/nym/pull/1080) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump follow-redirects from 1.14.1 to 1.14.7 in /clients/native/examples/js-examples/websocket [\#1079](https://github.com/nymtech/nym/pull/1079) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nanoid from 3.1.23 to 3.2.0 in /clients/native/examples/js-examples/websocket [\#1078](https://github.com/nymtech/nym/pull/1078) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Setup basic test for mixnode stats reporting [\#1077](https://github.com/nymtech/nym/pull/1077) ([octol](https://github.com/octol))
+- Make wallet\_address mandatory for mixnode init [\#1076](https://github.com/nymtech/nym/pull/1076) ([octol](https://github.com/octol))
+- Tidy nym-mixnode module visibility [\#1075](https://github.com/nymtech/nym/pull/1075) ([octol](https://github.com/octol))
+- Feature/wallet login with password [\#1074](https://github.com/nymtech/nym/pull/1074) ([fmtabbara](https://github.com/fmtabbara))
+- Add trait to mock client dependency in DelayForwarder [\#1073](https://github.com/nymtech/nym/pull/1073) ([octol](https://github.com/octol))
+- Bump rust-version to latest stable for nym-mixnode [\#1072](https://github.com/nymtech/nym/pull/1072) ([octol](https://github.com/octol))
+- Fixes CI for our wasm build [\#1069](https://github.com/nymtech/nym/pull/1069) ([jstuczyn](https://github.com/jstuczyn))
+- Add @octol as codeowner [\#1068](https://github.com/nymtech/nym/pull/1068) ([octol](https://github.com/octol))
+- set-up inclusion probability [\#1067](https://github.com/nymtech/nym/pull/1067) ([fmtabbara](https://github.com/fmtabbara))
+- Feature/wasm client [\#1066](https://github.com/nymtech/nym/pull/1066) ([neacsu](https://github.com/neacsu))
+- Changed bech32\_prefix from punk to nymt [\#1064](https://github.com/nymtech/nym/pull/1064) ([jstuczyn](https://github.com/jstuczyn))
+- Bump nanoid from 3.1.30 to 3.2.0 in /testnet-faucet [\#1063](https://github.com/nymtech/nym/pull/1063) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nanoid from 3.1.30 to 3.2.0 in /nym-wallet [\#1062](https://github.com/nymtech/nym/pull/1062) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Rework vesting contract storage [\#1061](https://github.com/nymtech/nym/pull/1061) ([durch](https://github.com/durch))
+- Mixnet Contract constants extraction [\#1060](https://github.com/nymtech/nym/pull/1060) ([jstuczyn](https://github.com/jstuczyn))
+- fix: make explorer footer year dynamic [\#1059](https://github.com/nymtech/nym/pull/1059) ([martinyung](https://github.com/martinyung))
+- Add mnemonic just on creation, to display it [\#1057](https://github.com/nymtech/nym/pull/1057) ([neacsu](https://github.com/neacsu))
+- Network Explorer: updates to API and UI to show the active set [\#1056](https://github.com/nymtech/nym/pull/1056) ([mmsinclair](https://github.com/mmsinclair))
+- Made contract addresses for query NymdClient construction optional [\#1055](https://github.com/nymtech/nym/pull/1055) ([jstuczyn](https://github.com/jstuczyn))
+- Introduced RPC query for total token supply [\#1053](https://github.com/nymtech/nym/pull/1053) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/tokio console [\#1052](https://github.com/nymtech/nym/pull/1052) ([durch](https://github.com/durch))
+- Implemented beta clippy lint recommendations [\#1051](https://github.com/nymtech/nym/pull/1051) ([jstuczyn](https://github.com/jstuczyn))
+- add new function to update profit percentage [\#1050](https://github.com/nymtech/nym/pull/1050) ([fmtabbara](https://github.com/fmtabbara))
+- Upgrade Clap and use declarative argument parsing for nym-mixnode [\#1047](https://github.com/nymtech/nym/pull/1047) ([octol](https://github.com/octol))
+- Feature/additional bond validation [\#1046](https://github.com/nymtech/nym/pull/1046) ([fmtabbara](https://github.com/fmtabbara))
+- Fix clippy on relevant lints [\#1044](https://github.com/nymtech/nym/pull/1044) ([neacsu](https://github.com/neacsu))
+- Bump shelljs from 0.8.4 to 0.8.5 in /contracts/basic-bandwidth-generation [\#1043](https://github.com/nymtech/nym/pull/1043) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Endpoint for rewarded set inclusion probabilities [\#1042](https://github.com/nymtech/nym/pull/1042) ([durch](https://github.com/durch))
+- Bump follow-redirects from 1.14.4 to 1.14.7 in /contracts/basic-bandwidth-generation [\#1041](https://github.com/nymtech/nym/pull/1041) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump follow-redirects from 1.14.5 to 1.14.7 in /testnet-faucet [\#1040](https://github.com/nymtech/nym/pull/1040) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Feature/node settings update [\#1036](https://github.com/nymtech/nym/pull/1036) ([fmtabbara](https://github.com/fmtabbara))
+- Migrate to cw-storage-plus 0.11.1 [\#1035](https://github.com/nymtech/nym/pull/1035) ([durch](https://github.com/durch))
+- Bump @openzeppelin/contracts from 4.4.1 to 4.4.2 in /contracts/basic-bandwidth-generation [\#1034](https://github.com/nymtech/nym/pull/1034) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Feature/configurable wallet [\#1033](https://github.com/nymtech/nym/pull/1033) ([neacsu](https://github.com/neacsu))
+- Feature/downcast reward estimation [\#1031](https://github.com/nymtech/nym/pull/1031) ([durch](https://github.com/durch))
+- Wallet UI updates [\#1028](https://github.com/nymtech/nym/pull/1028) ([fmtabbara](https://github.com/fmtabbara))
+- Remove migration code [\#1027](https://github.com/nymtech/nym/pull/1027) ([neacsu](https://github.com/neacsu))
+- Chore/stricter dependency requirements [\#1025](https://github.com/nymtech/nym/pull/1025) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/validator api client endpoints [\#1024](https://github.com/nymtech/nym/pull/1024) ([jstuczyn](https://github.com/jstuczyn))
+- Updated cosmrs to 0.4.1 [\#1023](https://github.com/nymtech/nym/pull/1023) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/testnet deploy scripts [\#1022](https://github.com/nymtech/nym/pull/1022) ([mfahampshire](https://github.com/mfahampshire))
+- Changed wallet's client to a full validator client [\#1021](https://github.com/nymtech/nym/pull/1021) ([jstuczyn](https://github.com/jstuczyn))
+- Fix 404 link [\#1020](https://github.com/nymtech/nym/pull/1020) ([RiccardoMasutti](https://github.com/RiccardoMasutti))
+- Feature/additional mixnode endpoints [\#1019](https://github.com/nymtech/nym/pull/1019) ([jstuczyn](https://github.com/jstuczyn))
+- Introduced denom check when trying to withdraw vested coins [\#1018](https://github.com/nymtech/nym/pull/1018) ([jstuczyn](https://github.com/jstuczyn))
+- Add network defaults for qa [\#1017](https://github.com/nymtech/nym/pull/1017) ([neacsu](https://github.com/neacsu))
+- Feature/expanded events [\#1015](https://github.com/nymtech/nym/pull/1015) ([jstuczyn](https://github.com/jstuczyn))
+- update frontend to use new profit update api [\#1014](https://github.com/nymtech/nym/pull/1014) ([fmtabbara](https://github.com/fmtabbara))
+- Feature/node state endpoint [\#1013](https://github.com/nymtech/nym/pull/1013) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/hourly set updates [\#1012](https://github.com/nymtech/nym/pull/1012) ([durch](https://github.com/durch))
+- Feature/remove unused profit margin [\#1011](https://github.com/nymtech/nym/pull/1011) ([neacsu](https://github.com/neacsu))
+- Feature/explorer node status [\#1010](https://github.com/nymtech/nym/pull/1010) ([jstuczyn](https://github.com/jstuczyn))
+- Use serial integer instead of random [\#1009](https://github.com/nymtech/nym/pull/1009) ([durch](https://github.com/durch))
+- Feature/configure profit [\#1008](https://github.com/nymtech/nym/pull/1008) ([neacsu](https://github.com/neacsu))
+- Feature/fix gateway sign [\#1004](https://github.com/nymtech/nym/pull/1004) ([neacsu](https://github.com/neacsu))
+- Fix clippy [\#1003](https://github.com/nymtech/nym/pull/1003) ([neacsu](https://github.com/neacsu))
+- Update wallet version [\#998](https://github.com/nymtech/nym/pull/998) ([tommyv1987](https://github.com/tommyv1987))
+- Fix wallet build instructions [\#997](https://github.com/nymtech/nym/pull/997) ([tommyv1987](https://github.com/tommyv1987))
+- Make the separation between testnet-mode and erc20 bandwidth mode clearer [\#994](https://github.com/nymtech/nym/pull/994) ([neacsu](https://github.com/neacsu))
+- Bump @openzeppelin/contracts from 3.4.0 to 4.4.1 in /contracts/basic-bandwidth-generation [\#983](https://github.com/nymtech/nym/pull/983) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Feature/implicit runtime [\#973](https://github.com/nymtech/nym/pull/973) ([jstuczyn](https://github.com/jstuczyn))
+- Differentiate staking and ownership [\#961](https://github.com/nymtech/nym/pull/961) ([durch](https://github.com/durch))
 
 ## [v0.12.1](https://github.com/nymtech/nym/tree/v0.12.1) (2021-12-23)
 

Cargo.toml

@@ -22,23 +22,22 @@ members = [
     "clients/native",
     "clients/native/websocket-requests",
     "clients/socks5",
-    "common/bandwidth-claim-contract",
     "common/client-libs/gateway-client",
     "common/client-libs/mixnet-client",
     "common/client-libs/validator-client",
+    "common/credential-storage",
     "common/coconut-interface",
     "common/config",
+    "common/credentials",
+    "common/crypto",
+    "common/crypto/dkg",
+    "common/execute",
+    "common/bandwidth-claim-contract",
     "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
     "common/cosmwasm-smart-contracts/contracts-common",
     "common/cosmwasm-smart-contracts/mixnet-contract",
     "common/cosmwasm-smart-contracts/multisig-contract",
     "common/cosmwasm-smart-contracts/vesting-contract",
-    "common/credential-storage",
-    "common/credentials",
-    "common/crypto",
-    "common/crypto/dkg",
-    "common/execute",
-    "common/inclusion-probability",
     "common/mixnode-common",
     "common/network-defaults",
     "common/nonexhaustive-delayqueue",
@@ -54,9 +53,9 @@ members = [
     "common/nymsphinx/params",
     "common/nymsphinx/types",
     "common/pemstore",
+    "common/statistics",
     "common/socks5/proxy-helpers",
     "common/socks5/requests",
-    "common/statistics",
     "common/task",
     "common/topology",
     "common/types",
@@ -69,7 +68,8 @@ members = [
     "service-providers/network-statistics",
     "validator-api",
     "validator-api/validator-api-requests",
-    "tools/ts-rs-cli"
+    "tools/ts-rs-cli",
+    "tools/validator-client-scripts"
 ]
 
 default-members = [
@@ -77,7 +77,6 @@ default-members = [
     "clients/socks5",
     "gateway",
     "service-providers/network-requester",
-    "service-providers/network-statistics",
     "mixnode",
     "validator-api",
     "explorer-api",

Makefile

@@ -69,6 +69,9 @@ build-wallet:
 build-connect:
 	cargo build --manifest-path nym-connect/Cargo.toml --workspace
 
+build-validator-scripts:
+	cargo build --release --manifest-path tools/validator-client-scripts/Cargo.toml
+
 fmt-main:
 	cargo fmt --all
 

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.0.2"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"

clients/native/src/commands/mod.rs

@@ -3,6 +3,7 @@
 
 use crate::client::config::{Config, SocketType};
 use clap::{Parser, Subcommand};
+use url::Url;
 
 #[cfg(not(feature = "coconut"))]
 pub(crate) const DEFAULT_ETH_ENDPOINT: &str =
@@ -96,17 +97,28 @@ pub(crate) async fn execute(args: &Cli) {
     }
 }
 
+fn parse_validators(raw: &str) -> Vec<Url> {
+    raw.split(',')
+        .map(|raw_validator| {
+            raw_validator
+                .trim()
+                .parse()
+                .expect("one of the provided validator api urls is invalid")
+        })
+        .collect()
+}
+
 pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
     if let Some(raw_validators) = args.validators {
         config
             .get_base_mut()
-            .set_custom_validator_apis(config::parse_validators(&raw_validators));
+            .set_custom_validator_apis(parse_validators(&raw_validators));
     } else if std::env::var(network_defaults::var_names::CONFIGURED).is_ok() {
         let raw_validators = std::env::var(network_defaults::var_names::API_VALIDATOR)
             .expect("api validator not set");
         config
             .get_base_mut()
-            .set_custom_validator_apis(config::parse_validators(&raw_validators));
+            .set_custom_validator_apis(parse_validators(&raw_validators));
     }
 
     if args.disable_socket {

clients/native/src/commands/run.rs

@@ -82,7 +82,7 @@ fn version_check(cfg: &Config) -> bool {
     if binary_version == config_version {
         true
     } else {
-        warn!("The native-client binary has different version than what is specified in config file! {} and {}", binary_version, config_version);
+        warn!("The mixnode binary has different version than what is specified in config file! {} and {}", binary_version, config_version);
         if is_minor_version_compatible(binary_version, config_version) {
             info!("but they are still semver compatible. However, consider running the `upgrade` command");
             true

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.0.2"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"

clients/socks5/src/commands/mod.rs

@@ -3,7 +3,7 @@
 
 use crate::client::config::Config;
 use clap::{Parser, Subcommand};
-use config::parse_validators;
+use url::Url;
 
 pub mod init;
 pub(crate) mod run;
@@ -96,6 +96,17 @@ pub(crate) async fn execute(args: &Cli) {
     }
 }
 
+pub fn parse_validators(raw: &str) -> Vec<Url> {
+    raw.split(',')
+        .map(|raw_validator| {
+            raw_validator
+                .trim()
+                .parse()
+                .expect("one of the provided validator api urls is invalid")
+        })
+        .collect()
+}
+
 pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
     if let Some(raw_validators) = args.validators {
         config

clients/socks5/src/lib.rs

@@ -2,4 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod client;
+// This is only used as we reach into the init functions in nym-connect. We need to refactor the
+// init functions so that nym-connect can just call the same init function as the regular socks5
+// client.
+#[allow(unused)]
+pub mod commands;
 pub mod socks;

common/client-libs/validator-client/src/nymd/mod.rs

@@ -893,7 +893,7 @@ impl<C> NymdClient<C> {
         &self,
         contract_address: &AccountId,
         msg: &M,
-        fee: Option<Fee>,
+        fee: Fee,
         memo: impl Into<String> + Send + 'static,
         funds: Vec<Coin>,
     ) -> Result<ExecuteResult, NymdError>
@@ -901,7 +901,6 @@ impl<C> NymdClient<C> {
         C: SigningCosmWasmClient + Sync,
         M: ?Sized + Serialize + Sync,
     {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         self.client
             .execute(self.address(), contract_address, msg, fee, memo, funds)
             .await
@@ -911,7 +910,7 @@ impl<C> NymdClient<C> {
         &self,
         contract_address: &AccountId,
         msgs: I,
-        fee: Option<Fee>,
+        fee: Fee,
         memo: impl Into<String> + Send + 'static,
     ) -> Result<ExecuteResult, NymdError>
     where
@@ -919,7 +918,6 @@ impl<C> NymdClient<C> {
         I: IntoIterator<Item = (M, Vec<Coin>)> + Send,
         M: Serialize,
     {
-        let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         self.client
             .execute_multiple(self.address(), contract_address, msgs, fee, memo)
             .await

common/config/src/lib.rs

@@ -88,14 +88,3 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
             .map_err(|toml_err| io::Error::new(io::ErrorKind::Other, toml_err))
     }
 }
-
-pub fn parse_validators(raw: &str) -> Vec<url::Url> {
-    raw.split(',')
-        .map(|raw_validator| {
-            raw_validator
-                .trim()
-                .parse()
-                .expect("one of the provided validator api urls is invalid")
-        })
-        .collect()
-}

common/cosmwasm-smart-contracts/coconut-bandwidth-contract/src/spend_credential.rs

@@ -37,7 +37,7 @@ impl SpendCredentialData {
     }
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub enum SpendCredentialStatus {
     InProgress,
     Spent,

common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs

@@ -213,7 +213,7 @@ pub enum QueryMsg {
     },
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub struct MigrateMsg {
     pub mixnet_denom: String,
@@ -226,7 +226,7 @@ impl MigrateMsg {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct NodeToRemove {
     owner: String,
     proxy: Option<String>,

common/inclusion-probability/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "inclusion-probability"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-rand = "0.8.5"
-thiserror = "1.0.32"

common/inclusion-probability/src/error.rs

@@ -1,9 +0,0 @@
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("The list of cumulative stake was unexpectedly empty")]
-    EmptyListCumulStake,
-    #[error("Sample point was unexpectedly out of bounds")]
-    SamplePointOutOfBounds,
-    #[error("Norm computation failed on different size arrarys")]
-    NormDifferenceSizeArrays,
-}

common/inclusion-probability/src/lib.rs

@@ -1,278 +0,0 @@
-//! Active set inclusion probability simulator
-
-use error::Error;
-
-mod error;
-
-const TOLERANCE_L2_NORM: f64 = 1e-4;
-const TOLERANCE_MAX_NORM: f64 = 1e-3;
-
-pub struct SelectionProbability {
-    pub active_set_probability: Vec<f64>,
-    pub reserve_set_probability: Vec<f64>,
-    pub samples: u32,
-    pub delta_l2: f64,
-    pub delta_max: f64,
-}
-
-pub fn simulate_selection_probability_mixnodes(
-    list_stake_for_mixnodes: &[u64],
-    active_set_size: usize,
-    reserve_set_size: usize,
-    max_samples: u32,
-) -> Result<SelectionProbability, Error> {
-    // Total number of existing (registered) nodes
-    let num_mixnodes = list_stake_for_mixnodes.len();
-
-    // Cumulative stake ordered by node index
-    let list_cumul = cumul_sum(list_stake_for_mixnodes);
-
-    // The computed probabilities
-    let mut active_set_probability = vec![0.0; num_mixnodes];
-    let mut reserve_set_probability = vec![0.0; num_mixnodes];
-
-    // Number sufficiently large to have a good approximation of selection probability
-    let mut samples = 0;
-    let mut delta_l2;
-    let mut delta_max;
-    let mut rng = rand::thread_rng();
-
-    loop {
-        samples += 1;
-        let mut sample_active_mixnodes = Vec::new();
-        let mut sample_reserve_mixnodes = Vec::new();
-        let mut list_cumul_temp = list_cumul.clone();
-
-        let active_set_probability_previous = active_set_probability.clone();
-
-        // Select the active nodes for the epoch (hour)
-        while sample_active_mixnodes.len() < active_set_size {
-            let candidate = sample_candidate(&list_cumul_temp, &mut rng)?;
-
-            if !sample_active_mixnodes.contains(&candidate) {
-                sample_active_mixnodes.push(candidate);
-                remove_mixnode_from_cumul_stake(candidate, &mut list_cumul_temp);
-            }
-        }
-
-        // Select the reserve nodes for the epoch (hour)
-        while sample_reserve_mixnodes.len() < reserve_set_size {
-            let candidate = sample_candidate(&list_cumul_temp, &mut rng)?;
-
-            if !sample_reserve_mixnodes.contains(&candidate)
-                && !sample_active_mixnodes.contains(&candidate)
-            {
-                sample_reserve_mixnodes.push(candidate);
-                remove_mixnode_from_cumul_stake(candidate, &mut list_cumul_temp);
-            }
-        }
-
-        // Sum up nodes being in active or reserve set
-        for active_mixnodes in sample_active_mixnodes {
-            active_set_probability[active_mixnodes] += 1.0;
-        }
-        for reserve_mixnodes in sample_reserve_mixnodes {
-            reserve_set_probability[reserve_mixnodes] += 1.0;
-        }
-
-        // Convergence critera only on active set.
-        // We devide by samples to get the average, that is not really part of the delta
-        // computation.
-        delta_l2 = l2_diff(&active_set_probability, &active_set_probability_previous)?
-            / f64::from(samples);
-        delta_max = max_diff(&active_set_probability, &active_set_probability_previous)?
-            / f64::from(samples);
-        if samples > 10 && delta_l2 < TOLERANCE_L2_NORM && delta_max < TOLERANCE_MAX_NORM
-            || samples >= max_samples
-        {
-            break;
-        }
-    }
-
-    active_set_probability
-        .iter_mut()
-        .for_each(|x| *x /= f64::from(samples));
-    reserve_set_probability
-        .iter_mut()
-        .for_each(|x| *x /= f64::from(samples));
-
-    Ok(SelectionProbability {
-        active_set_probability,
-        reserve_set_probability,
-        samples,
-        delta_l2,
-        delta_max,
-    })
-}
-
-// Compute the cumulative sum
-fn cumul_sum<'a>(list: impl IntoIterator<Item = &'a u64>) -> Vec<u64> {
-    let mut list_cumul = Vec::new();
-    let mut cumul = 0;
-    for entry in list {
-        cumul += entry;
-        list_cumul.push(cumul);
-    }
-    list_cumul
-}
-
-fn sample_candidate(list_cumul: &[u64], rng: &mut rand::rngs::ThreadRng) -> Result<usize, Error> {
-    use rand::distributions::{Distribution, Uniform};
-    let uniform = Uniform::from(0..*list_cumul.last().ok_or(Error::EmptyListCumulStake)?);
-    let r = uniform.sample(rng);
-
-    let candidate = list_cumul
-        .iter()
-        .enumerate()
-        .find(|(_, x)| *x >= &r)
-        .ok_or(Error::SamplePointOutOfBounds)?
-        .0;
-
-    Ok(candidate)
-}
-
-// Update list of cumulative stake to reflect eliminating the picked node
-fn remove_mixnode_from_cumul_stake(candidate: usize, list_cumul_stake: &mut [u64]) {
-    let prob_candidate = if candidate == 0 {
-        list_cumul_stake[0]
-    } else {
-        list_cumul_stake[candidate] - list_cumul_stake[candidate - 1]
-    };
-
-    for cumul in list_cumul_stake.iter_mut().skip(candidate) {
-        *cumul -= prob_candidate;
-    }
-}
-
-// Compute the difference in l2-norm
-fn l2_diff(v1: &[f64], v2: &[f64]) -> Result<f64, Error> {
-    if v1.len() != v2.len() {
-        return Err(Error::NormDifferenceSizeArrays);
-    }
-    Ok(v1
-        .iter()
-        .zip(v2)
-        .map(|(&i1, &i2)| (i1 - i2).powi(2))
-        .sum::<f64>()
-        .sqrt())
-}
-
-// Compute the difference in max-norm
-fn max_diff(v1: &[f64], v2: &[f64]) -> Result<f64, Error> {
-    if v1.len() != v2.len() {
-        return Err(Error::NormDifferenceSizeArrays);
-    }
-    Ok(v1
-        .iter()
-        .zip(v2)
-        .map(|(x, y)| (x - y).abs())
-        .fold(f64::NEG_INFINITY, f64::max))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn compute_cumul_sum() {
-        let v = cumul_sum(&vec![1, 2, 3]);
-        assert_eq!(v, &[1, 3, 6]);
-    }
-
-    #[test]
-    fn remove_mixnode_from_cumul() {
-        let mut cumul_stake = vec![1, 2, 3, 4, 5, 6];
-        remove_mixnode_from_cumul_stake(3, &mut cumul_stake);
-        assert_eq!(cumul_stake, &[1, 2, 3, 3, 4, 5]);
-    }
-
-    #[test]
-    fn max_norm() {
-        let v1 = vec![1.0, 2.0, 3.0];
-        let v2 = vec![2.0, 4.0, -6.0];
-        assert!((max_diff(&v1, &v2).unwrap() - 9.0).abs() < f64::EPSILON);
-    }
-
-    #[test]
-    fn ls_norm() {
-        let v1 = vec![1.0, 2.0, 3.0];
-        let v2 = vec![2.0, 3.0, -2.0];
-        assert!((l2_diff(&v1, &v2).unwrap() - 5.196_152_422_706_632).abs() < 1e2 * f64::EPSILON);
-    }
-
-    // Replicate the results from the Python simulation code in https://github.com/nymtech/team-core/issues/114
-    #[test]
-    fn replicate_python_simulation() {
-        let active_set_size = 4;
-        let standby_set_size = 1;
-
-        // this has to contain the total stake per node
-        let list_mix = vec![
-            100, 100, 3000, 500_000, 100, 10, 10, 10, 10, 10, 30000, 500, 200, 52345,
-        ];
-
-        let max_samples = 100_000;
-
-        let SelectionProbability {
-            active_set_probability,
-            reserve_set_probability,
-            samples,
-            delta_l2,
-            delta_max,
-        } = simulate_selection_probability_mixnodes(
-            &list_mix,
-            active_set_size,
-            standby_set_size,
-            max_samples,
-        )
-        .unwrap();
-
-        // These values comes from running the python simulator for a very long time
-        let expected_active_set_probability = vec![
-            0.025_070_8,
-            0.025_073_2,
-            0.744_117,
-            0.999_999,
-            0.025_000_2,
-            0.002_524_4,
-            0.002_527_8,
-            0.002_528_6,
-            0.002_569_6,
-            0.002_513_6,
-            0.994,
-            0.125_482_8,
-            0.050_279_8,
-            0.998_313_2,
-        ];
-        // The same check is used in the convergence criterion, and hence should be reflected in
-        // `delta_max` too.
-        assert!(
-            max_diff(&active_set_probability, &expected_active_set_probability).unwrap() < 1e-2
-        );
-
-        let expected_reserve_set_probability = vec![
-            0.076_392_4,
-            0.076_499,
-            0.204_893_6,
-            1e-06,
-            0.076_278_8,
-            0.007_720_6,
-            0.007_673,
-            0.007_700_2,
-            0.007_669_4,
-            0.007_731_2,
-            0.005_789_4,
-            0.368_465_6,
-            0.151_537_2,
-            0.001_648_6,
-        ];
-        assert!(
-            max_diff(&reserve_set_probability, &expected_reserve_set_probability).unwrap() < 1e-2
-        );
-
-        // We converge around 20_000, add another 500 for some slack due to random values
-        assert!(samples < 20_500);
-        assert!(delta_l2 < TOLERANCE_L2_NORM);
-        assert!(delta_max < TOLERANCE_MAX_NORM);
-    }
-}

common/network-defaults/src/mainnet.rs

@@ -24,7 +24,7 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
     hex_literal::hex!("0000000000000000000000000000000000000000");
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";
 
-pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "https://mainnet-stats.nymte.ch:8090/";
+pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "http://127.0.0.1:8090";
 pub const NYMD_VALIDATOR: &str = "https://rpc.nyx.nodes.guru/";
 pub const API_VALIDATOR: &str = "https://validator.nymtech.net/api/";
 pub(crate) fn validators() -> Vec<ValidatorDetails> {

common/types/src/currency.rs

@@ -507,7 +507,7 @@ mod test {
 
         for (expected, raw_display) in values {
             let coin = DecCoin {
-                denom: Network::MAINNET.mix_denom().display,
+                denom: Network::MAINNET.mix_denom().display.into(),
                 amount: raw_display.parse().unwrap(),
             };
             let base = reg.attempt_convert_to_base_coin(coin).unwrap();

contracts/CHANGELOG.md

@@ -1,32 +0,0 @@
-## [nym-contracts-v1.0.1](https://github.com/nymtech/nym/tree/nym-contracts-v1.0.1) (2022-06-22)
-
-### Added
-
-- mixnet-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
-- mixnet-contract: Replace all naked `-` with `saturating_sub`.
-- mixnet-contract: Added staking_supply field to ContractStateParams.
-- mixnet-contract: Added a query to get MixnodeBond by identity key ([#1369]).
-- mixnet-contract: Added a query to get GatewayBond by identity key ([#1369]).
-- vesting-contract: Added ClaimOperatorReward and ClaimDelegatorReward messages ([#1292])
-- vesting-contract: Added limit to the amount of tokens one can pledge ([#1331])
-
-### Fixed
-
-- mixnet-contract: `estimated_delegator_reward` calculation ([#1284])
-- mixnet-contract: delegator and operator rewards use lambda and sigma instead of lambda_ticked and sigma_ticked ([#1284])
-- mixnet-contract: removed `expect` in `query_delegator_reward` and queries containing invalid proxy address should now return a more human-readable error ([#1257])
-- mixnet-contract: replaced integer division with fixed for performance calculations ([#1284])
-- mixnet-contract: Under certain circumstances nodes could not be unbonded ([#1255](https://github.com/nymtech/nym/issues/1255)) ([#1258])
-- mixnet-contract: Using correct staking supply when distributing rewards. ([#1373])
-- vesting-contract: replaced `checked_sub` with `saturating_sub` to fix the underflow in `get_vesting_tokens` ([#1275])
-
-
-[#1255]: https://github.com/nymtech/nym/pull/1255
-[#1257]: https://github.com/nymtech/nym/pull/1257
-[#1258]: https://github.com/nymtech/nym/pull/1258
-[#1275]: https://github.com/nymtech/nym/pull/1275
-[#1284]: https://github.com/nymtech/nym/pull/1284
-[#1292]: https://github.com/nymtech/nym/pull/1292
-[#1331]: https://github.com/nymtech/nym/pull/1331
-[#1369]: https://github.com/nymtech/nym/pull/1369
-[#1373]: https://github.com/nymtech/nym/pull/1373

contracts/mixnet/src/queued_migrations.rs

@@ -18,6 +18,7 @@ pub fn migrate_config_from_env(
     #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
     pub struct OldContractState {
         pub owner: Addr,
+        pub mix_denom: String,
         pub rewarding_validator_address: Addr,
         pub params: ContractStateParams,
     }

contracts/vesting/src/vesting/account/mod.rs

@@ -101,9 +101,10 @@ impl Account {
         }
     }
 
-    /// Returns the index of the next vesting period. Unless the current time is somehow in the past or vesting has not started yet.
-    /// In case vesting is over it will always return NUM_VESTING_PERIODS.
     pub fn get_current_vesting_period(&self, block_time: Timestamp) -> Period {
+        // Returns the index of the next vesting period. Unless the current time is somehow in the past or vesting has not started yet.
+        // In case vesting is over it will always return NUM_VESTING_PERIODS.
+
         if block_time.seconds() < self.periods.first().unwrap().start_time {
             Period::Before
         } else if self.periods.last().unwrap().end_time() < block_time {

envs/mainnet.env

@@ -15,6 +15,6 @@ BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 MULTISIG_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 REWARDING_VALIDATOR_ADDRESS=n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy
-STATISTICS_SERVICE_DOMAIN_ADDRESS="https://mainnet-stats.nymte.ch:8090"
+STATISTICS_SERVICE_DOMAIN_ADDRESS="http://127.0.0.1:8090"
 NYMD_VALIDATOR="https://rpc.nyx.nodes.guru/"
 API_VALIDATOR="https://validator.nymtech.net/api/"

explorer/.env.prod

@@ -1,6 +1,5 @@
 EXPLORER_API_URL=https://explorer.nymtech.net/api/v1
 VALIDATOR_API_URL=https://validator.nymtech.net
-VALIDATOR_URL=https://rpc.nyx.nodes.guru
 BIG_DIPPER_URL=https://blocks.nymtech.net
 CURRENCY_DENOM=unym
 CURRENCY_STAKING_DENOM=unyx

explorer/.env.qa

@@ -1,6 +1,5 @@
 EXPLORER_API_URL=https://qa-explorer.nymtech.net/api/v1
-VALIDATOR_API_URL=https://qa-validator-api.nymtech.net
-VALIDATOR_URL=https://qa-validator.nymtech.net
+VALIDATOR_API_URL=https://qa-validator.nymtech.net
 BIG_DIPPER_URL=https://qa-blocks.nymtech.net
-CURRENCY_DENOM=unym
-CURRENCY_STAKING_DENOM=unyx
+CURRENCY_DENOM=unymt
+CURRENCY_STAKING_DENOM=unyxt

explorer/src/api/constants.ts

@@ -1,7 +1,6 @@
 // master APIs
 export const API_BASE_URL = process.env.EXPLORER_API_URL;
 export const VALIDATOR_API_BASE_URL = process.env.VALIDATOR_API_URL;
-export const VALIDATOR_URL = process.env.VALIDATOR_URL;
 export const BIG_DIPPER = process.env.BIG_DIPPER_URL;
 
 // specific API routes
@@ -10,7 +9,7 @@ export const MIXNODE_PING = `${API_BASE_URL}/ping`;
 export const MIXNODES_API = `${API_BASE_URL}/mix-nodes`;
 export const MIXNODE_API = `${API_BASE_URL}/mix-node`;
 export const GATEWAYS_API = `${VALIDATOR_API_BASE_URL}/api/v1/gateways`;
-export const VALIDATORS_API = `${VALIDATOR_URL}/validators`;
+export const VALIDATORS_API = `${VALIDATOR_API_BASE_URL}/validators`;
 export const BLOCK_API = `${VALIDATOR_API_BASE_URL}/block`;
 export const COUNTRY_DATA_API = `${API_BASE_URL}/countries`;
 export const UPTIME_STORY_API = `${VALIDATOR_API_BASE_URL}/api/v1/status/mixnode`; // add ID then '/history' to this.

explorer/src/components/Filters/Filters.tsx

@@ -6,6 +6,7 @@ import {
   DialogContent,
   DialogActions,
   DialogTitle,
+  IconButton,
   Slider,
   Typography,
   Box,
@@ -24,9 +25,7 @@ import { useIsMobile } from '../../hooks/useIsMobile';
 const FilterItem = ({
   label,
   id,
-  tooltipInfo,
   value,
-  isSmooth,
   marks,
   scale,
   min,
@@ -37,13 +36,12 @@ const FilterItem = ({
 }) => (
   <Box sx={{ p: 2 }}>
     <Typography gutterBottom>{label}</Typography>
-    <Typography fontSize={12}>{tooltipInfo}</Typography>
     <Slider
       value={value}
       onChange={(e: Event, newValue: number | number[]) => onChange(id, newValue as number[])}
-      valueLabelDisplay={isSmooth ? 'auto' : 'off'}
+      valueLabelDisplay="off"
       marks={marks}
-      step={isSmooth ? 1 : null}
+      step={null}
       scale={scale}
       min={min}
       max={max}
@@ -52,7 +50,7 @@ const FilterItem = ({
 );
 
 export const Filters = () => {
-  const { filterMixnodes, fetchMixnodes, mixnodes } = useMainContext();
+  const { filterMixnodes, fetchMixnodes } = useMainContext();
   const { status } = useParams<{ status: MixnodeStatusWithAll | undefined }>();
   const isMobile = useIsMobile();
 
@@ -129,26 +127,19 @@ export const Filters = () => {
         <Alert
           severity="info"
           variant={isMobile ? 'standard' : 'outlined'}
-          sx={{ color: (t) => t.palette.info.light }}
           action={
             <Button size="small" onClick={onClearFilters}>
-              CLEAR FILTERS
+              Clear
             </Button>
           }
+          sx={{ width: 300 }}
         >
-          {mixnodes?.data?.length} mixnodes matched your criteria
+          Filters applied
         </Alert>
       </Snackbar>
-      <Button
-        size="large"
-        variant="text"
-        color="inherit"
-        endIcon={<Tune />}
-        onClick={handleToggleShowFilters}
-        sx={{ textTransform: 'none' }}
-      >
-        Advanced filters
-      </Button>
+      <IconButton size="large" onClick={handleToggleShowFilters}>
+        <Tune />
+      </IconButton>
       <Dialog open={showFilters} onClose={handleToggleShowFilters} maxWidth="md" fullWidth>
         <DialogTitle>Mixnode filters</DialogTitle>
         <DialogContent dividers>

explorer/src/components/Filters/filterSchema.ts

@@ -5,7 +5,6 @@ export const generateFilterSchema = (upperSaturationValue?: number) => ({
     label: 'Profit margin (%)',
     id: EnumFilterKey.profitMargin,
     value: [0, 100],
-    isSmooth: true,
     marks: [
       { label: '0', value: 0 },
       { label: '10', value: 10 },
@@ -19,8 +18,6 @@ export const generateFilterSchema = (upperSaturationValue?: number) => ({
       { label: '90', value: 90 },
       { label: '100', value: 100 },
     ],
-    tooltipInfo:
-      'As a delegator you want to chose nodes with lower profit margin, meaning more payout for their delegators',
   },
   stakeSaturation: {
     label: 'Stake saturation (%)',
@@ -46,29 +43,65 @@ export const generateFilterSchema = (upperSaturationValue?: number) => ({
       },
     ],
     max: upperSaturationValue,
-    tooltipInfo: "Select nodes with <100% saturation. Any additional stake above 100% saturation won't get rewards",
   },
-  routingScore: {
-    label: 'Routing score (%)',
-    id: EnumFilterKey.routingScore,
-    value: [0, 100],
+  stake: {
+    label: 'Stake (NYM)',
+    id: EnumFilterKey.stake,
+    value: [20, 90],
+    min: 20,
+    max: 90,
     marks: [
-      { label: '0', value: 0 },
-      { label: '10', value: 10 },
-      { label: '20', value: 20 },
-      { label: '30', value: 30 },
-      { label: '40', value: 40 },
-      { label: '50', value: 50 },
-      { label: '60', value: 60 },
-      { label: '70', value: 70 },
-      { label: '80', value: 80 },
-      { label: '90', value: 90 },
-      { label: '100', value: 100 },
+      {
+        value: 0,
+        label: '1',
+      },
+      {
+        value: 10,
+        label: '10',
+      },
+      {
+        value: 20,
+        label: '100',
+      },
+      {
+        value: 30,
+        label: '1k',
+      },
+      {
+        value: 40,
+        label: '10k',
+      },
+      {
+        value: 50,
+        label: '100k',
+      },
+      {
+        value: 60,
+        label: '1M',
+      },
+      {
+        value: 70,
+        label: '10M',
+      },
+      {
+        value: 80,
+        label: '100M',
+      },
+      {
+        value: 90,
+        label: '1B',
+      },
     ],
-    tooltipInfo: 'The higher the routing score the better the performance of the node and so its rewards',
   },
 });
 
+const formatStakeValuesToMinorDenom = ([value_1, value_2]: number[]) => {
+  const lowerValue = 10 ** (value_1 / 10) * 1_000_000;
+  const upperValue = 10 ** (value_2 / 10) * 1_000_000;
+
+  return [lowerValue, upperValue];
+};
+
 const formatStakeSaturationValues = ([value_1, value_2]: number[]) => {
   const lowerValue = value_1 / 100;
   const upperValue = value_2 / 100;
@@ -77,7 +110,7 @@ const formatStakeSaturationValues = ([value_1, value_2]: number[]) => {
 };
 
 export const formatOnSave = (filters: TFilters) => ({
-  routingScore: filters.routingScore.value,
+  stake: formatStakeValuesToMinorDenom(filters.stake.value),
   profitMargin: filters.profitMargin.value,
   stakeSaturation: formatStakeSaturationValues(filters.stakeSaturation.value),
 });

explorer/src/context/main.tsx

@@ -102,8 +102,8 @@ export const MainContextProvider: React.FC = ({ children }) => {
         m.mix_node.profit_margin_percent <= filters.profitMargin[1] &&
         m.stake_saturation >= filters.stakeSaturation[0] &&
         m.stake_saturation <= filters.stakeSaturation[1] &&
-        m.avg_uptime >= filters.routingScore[0] &&
-        m.avg_uptime <= filters.routingScore[1],
+        +m.pledge_amount.amount + +m.total_delegation.amount >= filters.stake[0] &&
+        +m.pledge_amount.amount + +m.total_delegation.amount <= filters.stake[1],
     );
     setMixnodes({ data: filtered, isLoading: false });
   };

explorer/src/typeDefs/filters.ts

@@ -4,19 +4,17 @@ import { Mark } from '@mui/base';
 export enum EnumFilterKey {
   profitMargin = 'profitMargin',
   stakeSaturation = 'stakeSaturation',
-  routingScore = 'routingScore',
+  stake = 'stake',
 }
 
 export type TFilterItem = {
   label: string;
   id: EnumFilterKey;
   value: number[];
-  isSmooth?: boolean;
   marks: Mark[];
   min?: number;
   max?: number;
   scale?: (value: number) => number;
-  tooltipInfo?: string;
 };
 
 export type TFilters = { [key in EnumFilterKey]: TFilterItem };

gateway/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-gateway"
-version = "1.0.2"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Mixnet Gateway"
 edition = "2021"

gateway/src/commands/mod.rs

@@ -6,11 +6,11 @@ use std::{process, str::FromStr};
 use crate::{config::Config, Cli};
 use clap::Subcommand;
 use colored::Colorize;
-use config::parse_validators;
 use crypto::bech32_address_validation;
 use network_defaults::var_names::{
     API_VALIDATOR, BECH32_PREFIX, CONFIGURED, NYMD_VALIDATOR, STATISTICS_SERVICE_DOMAIN_ADDRESS,
 };
+use url::Url;
 
 pub(crate) mod init;
 pub(crate) mod node_details;
@@ -69,6 +69,17 @@ pub(crate) async fn execute(args: Cli) {
     }
 }
 
+fn parse_validators(raw: &str) -> Vec<Url> {
+    raw.split(',')
+        .map(|raw_validator| {
+            raw_validator
+                .trim()
+                .parse()
+                .expect("one of the provided validator api urls is invalid")
+        })
+        .collect()
+}
+
 pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
     let mut was_host_overridden = false;
     if let Some(host) = args.host {

mixnode/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-mixnode"
-version = "1.0.2"
+version = "1.0.1"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

mixnode/src/commands/mod.rs

@@ -6,11 +6,9 @@ use std::process;
 use crate::{config::Config, Cli};
 use clap::Subcommand;
 use colored::Colorize;
-use config::{
-    defaults::var_names::{API_VALIDATOR, BECH32_PREFIX, CONFIGURED},
-    parse_validators,
-};
+use config::defaults::var_names::{API_VALIDATOR, BECH32_PREFIX, CONFIGURED};
 use crypto::bech32_address_validation;
+use url::Url;
 
 mod describe;
 mod init;
@@ -63,6 +61,17 @@ pub(crate) async fn execute(args: Cli) {
     }
 }
 
+fn parse_validators(raw: &str) -> Vec<Url> {
+    raw.split(',')
+        .map(|raw_validator| {
+            raw_validator
+                .trim()
+                .parse()
+                .expect("one of the provided validator api urls is invalid")
+        })
+        .collect()
+}
+
 fn override_config(mut config: Config, args: OverrideConfig) -> Config {
     let mut was_host_overridden = false;
     if let Some(host) = args.host {

nym-connect/CHANGELOG.md

@@ -1,14 +0,0 @@
-## [nym-connect-v1.0.1](https://github.com/nymtech/nym/tree/nym-connect-v1.0.1) (2022-07-22)
-
-### Added
-
-- nym-connect: initial proof-of-concept of a UI around the socks5 client was added
-- nym-connect: add ability to select network requester and gateway ([#1427])
-- nym-connect: add ability to export gateway keys as JSON
-- nym-connect: add auto updater
-
-### Changed
-
-- nym-connect: reuse config id instead of creating a new id on each connection
-
-[#1427]: https://github.com/nymtech/nym/pull/1427

nym-connect/Cargo.lock

@@ -3436,7 +3436,7 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.0.2"
+version = "1.0.1"
 dependencies = [
  "clap",
  "client-core",

nym-connect/src-tauri/src/config/mod.rs

@@ -7,7 +7,7 @@ use tokio::sync::RwLock;
 
 use client_core::config::Config as BaseConfig;
 use config_common::NymConfig;
-use nym_socks5::client::config::Config as Socks5Config;
+use nym_socks5::{client::config::Config as Socks5Config, commands::parse_validators};
 
 use crate::{
     error::{BackendError, Result},
@@ -134,11 +134,10 @@ pub async fn init_socks5_config(provider_address: String, chosen_gateway_id: Str
     config
         .get_base_mut()
         .with_eth_private_key(DEFAULT_ETH_PRIVATE_KEY);
-
     if let Ok(raw_validators) = std::env::var(config_common::defaults::var_names::API_VALIDATOR) {
         config
             .get_base_mut()
-            .set_custom_validator_apis(config_common::parse_validators(&raw_validators));
+            .set_custom_validator_apis(parse_validators(&raw_validators));
     }
 
     let gateway = setup_gateway(

nym-wallet/.env.sample

@@ -1 +1 @@
-ADMIN_ADDRESS={\"MAINNET\":[],\"SANDBOX\":[],\"QA\":[\"n1c8te4wlc25re97qw5nh8urtpek494zqx30lza2\",\"n177krl498arsfupd2p9097kwfmuf07lkj6crmj9\"]}
+ADMIN_ADDRESS={"MAINNET":[],"SANDBOX":[],"QA":["n1c8te4wlc25re97qw5nh8urtpek494zqx30lza2","n177krl498arsfupd2p9097kwfmuf07lkj6crmj9"]}

nym-wallet/CHANGELOG.md

@@ -1,213 +0,0 @@
-## [nym-wallet-v1.0.8](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.0.8) (2022-08-11)
-
-- wallet: new bonding flow and screen for bonded node
-- wallet: compound and redeem functionalities for operator rewards
-- wallet: a few minor touch ups and bug fixes 
-
-
-## [nym-wallet-v1.0.7](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.7) (2022-07-11)
-
-- wallet: dark mode
-- wallet: when simulating gas costs, an automatic adjustment is being used ([#1388]).
-
-[#1388]: https://github.com/nymtech/nym/pull/1388
-
-
-## [nym-wallet-v1.0.6](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.6) (2022-06-21)
-
-- wallet: undelegating now uses either the mixnet or vesting contract, or both, depending on how delegations were made
-- wallet: redeeming and compounding now uses both the mixnet and vesting contract
-- wallet: the wallet backend learned how to archive wallet files
-- wallet: add ENABLE_QA_MODE environment variable to enable QA mode on built wallet
-
-## [nym-wallet-v1.0.5](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.5) (2022-06-14)
-
-- wallet: add simple CLI tool for decrypting and recovering the wallet file.
-- wallet: added support for multiple accounts ([#1265])
-- wallet: compound and claim reward endpoints for operators and delegators ([#1302])
-- wallet: require password to switch accounts
-- wallet: the wallet backend learned how to keep track of validator name, either hardcoded or by querying the status endpoint.
-- wallet: new delegation and rewards UI
-- wallet: show version in nav bar
-- wallet: contract admin route put back
-- wallet: staking_supply field to StateParams
-- wallet: show transaction hash for redeeming or compounding rewards
-
-[#1265]: https://github.com/nymtech/nym/pull/1265
-[#1302]: https://github.com/nymtech/nym/pull/1302
-
-## [nym-wallet-v1.0.4](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.4) (2022-05-04)
-
-### Changed
-
-- all: the default behaviour of validator client is changed to use `broadcast_sync` and poll for transaction inclusion instead of using `broadcast_commit` to deal with timeouts ([#1246])
-
-## [nym-wallet-v1.0.3](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.3) (2022-04-25)
-
-[Full Changelog](https://github.com/nymtech/nym/compare/nym-binaries-1.0.0-rc.2...nym-wallet-v1.0.3)
-
-**Fixed bugs:**
-
-- \[Issue\] Wallet 1.0.2 cannot send NYM tokens from a DelayedVestingAccount [\#1215](https://github.com/nymtech/nym/issues/1215)
-- Main README not showing properly with GitHub dark mode [\#1211](https://github.com/nymtech/nym/issues/1211)
-
-**Merged pull requests:**
-
-- Bugfix - wallet undelegation for vesting accounts [\#1220](https://github.com/nymtech/nym/pull/1220) ([mmsinclair](https://github.com/mmsinclair))
-- Bugfix/delegation reconcile [\#1219](https://github.com/nymtech/nym/pull/1219) ([jstuczyn](https://github.com/jstuczyn))
-- Bugfix/query proxied pending delegations [\#1218](https://github.com/nymtech/nym/pull/1218) ([jstuczyn](https://github.com/jstuczyn))
-- Using custom gas multiplier in the wallet [\#1217](https://github.com/nymtech/nym/pull/1217) ([jstuczyn](https://github.com/jstuczyn))
-- Feature/vesting accounts support [\#1216](https://github.com/nymtech/nym/pull/1216) ([jstuczyn](https://github.com/jstuczyn))
-- Release/1.0.0 rc.2 [\#1214](https://github.com/nymtech/nym/pull/1214) ([jstuczyn](https://github.com/jstuczyn))
-- chore: fix dark mode rendering [\#1212](https://github.com/nymtech/nym/pull/1212) ([pwnfoo](https://github.com/pwnfoo))
-- Feature/spend coconut [\#1210](https://github.com/nymtech/nym/pull/1210) ([neacsu](https://github.com/neacsu))
-- Bugfix/unique sphinx key [\#1207](https://github.com/nymtech/nym/pull/1207) ([jstuczyn](https://github.com/jstuczyn))
-- Add cache read and write timeouts [\#1206](https://github.com/nymtech/nym/pull/1206) ([durch](https://github.com/durch))
-- Additional, more informative routes [\#1204](https://github.com/nymtech/nym/pull/1204) ([durch](https://github.com/durch))
-- Feature/aggregated econ dynamics explorer endpoint [\#1203](https://github.com/nymtech/nym/pull/1203) ([jstuczyn](https://github.com/jstuczyn))
-- Debugging validator [\#1198](https://github.com/nymtech/nym/pull/1198) ([durch](https://github.com/durch))
-- wallet: expose additional validator configuration functionality to the frontend [\#1195](https://github.com/nymtech/nym/pull/1195) ([octol](https://github.com/octol))
-- Update rewarding validator address [\#1193](https://github.com/nymtech/nym/pull/1193) ([durch](https://github.com/durch))
-- Crypto part of the Groth's NIDKG [\#1182](https://github.com/nymtech/nym/pull/1182) ([jstuczyn](https://github.com/jstuczyn))
-- fix unbond page [\#1180](https://github.com/nymtech/nym/pull/1180) ([tommyv1987](https://github.com/tommyv1987))
-- Type safe bounds [\#1179](https://github.com/nymtech/nym/pull/1179) ([durch](https://github.com/durch))
-- Fix delegation paging [\#1174](https://github.com/nymtech/nym/pull/1174) ([durch](https://github.com/durch))
-- Update binaries to rc version [\#1172](https://github.com/nymtech/nym/pull/1172) ([tommyv1987](https://github.com/tommyv1987))
-- Bump ansi-regex from 4.1.0 to 4.1.1 in /docker/typescript\_client/upload\_contract [\#1171](https://github.com/nymtech/nym/pull/1171) ([dependabot[bot]](https://github.com/apps/dependabot))
-
-## [nym-wallet-v1.0.2](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.2) (2022-04-05)
-
-[Full Changelog](https://github.com/nymtech/nym/compare/nym-wallet-v1.0.1...nym-wallet-v1.0.2)
-
-**Merged pull requests:**
-
-- Wallet 1.0.2 visual tweaks [\#1197](https://github.com/nymtech/nym/pull/1197) ([mmsinclair](https://github.com/mmsinclair))
-- Password for wallet with routes [\#1196](https://github.com/nymtech/nym/pull/1196) ([fmtabbara](https://github.com/fmtabbara))
-- Add auto-updater to Nym Wallet [\#1194](https://github.com/nymtech/nym/pull/1194) ([mmsinclair](https://github.com/mmsinclair))
-- Fix clippy warnings for beta toolchain [\#1191](https://github.com/nymtech/nym/pull/1191) ([octol](https://github.com/octol))
-- wallet: expose validator urls to the frontend [\#1190](https://github.com/nymtech/nym/pull/1190) ([octol](https://github.com/octol))
-- wallet: add test for decrypting stored wallet file [\#1189](https://github.com/nymtech/nym/pull/1189) ([octol](https://github.com/octol))
-- Fix clippy warnings [\#1188](https://github.com/nymtech/nym/pull/1188) ([octol](https://github.com/octol))
-- Password for wallet with routes [\#1187](https://github.com/nymtech/nym/pull/1187) ([mmsinclair](https://github.com/mmsinclair))
-- wallet: add validate\_mnemonic [\#1186](https://github.com/nymtech/nym/pull/1186) ([octol](https://github.com/octol))
-- wallet: support removing accounts from the wallet file [\#1185](https://github.com/nymtech/nym/pull/1185) ([octol](https://github.com/octol))
-- Feature/adding discord [\#1184](https://github.com/nymtech/nym/pull/1184) ([gala1234](https://github.com/gala1234))
-- wallet: config backend for validator selection [\#1183](https://github.com/nymtech/nym/pull/1183) ([octol](https://github.com/octol))
-- Add storybook to wallet [\#1178](https://github.com/nymtech/nym/pull/1178) ([mmsinclair](https://github.com/mmsinclair))
-- wallet: connection test nymd and api urls independently [\#1170](https://github.com/nymtech/nym/pull/1170) ([octol](https://github.com/octol))
-- wallet: wire up account storage [\#1153](https://github.com/nymtech/nym/pull/1153) ([octol](https://github.com/octol))
-- Feature/signature on deposit [\#1151](https://github.com/nymtech/nym/pull/1151) ([neacsu](https://github.com/neacsu))
-
-## [nym-wallet-v1.0.1](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.1) (2022-04-05)
-
-[Full Changelog](https://github.com/nymtech/nym/compare/nym-binaries-1.0.0-rc.1...nym-wallet-v1.0.1)
-
-**Closed issues:**
-
-- Check enabling bbbc simultaneously with open access. Estimate what it would take to make this the default compilation target. [\#1175](https://github.com/nymtech/nym/issues/1175)
-- Get coconut credential for deposited tokens [\#1138](https://github.com/nymtech/nym/issues/1138)
-- Make payments lazy [\#1135](https://github.com/nymtech/nym/issues/1135)
-- Uptime on node selection for sets [\#1049](https://github.com/nymtech/nym/issues/1049)
-
-## [nym-wallet-v1.0.0](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.0) (2022-02-03)
-
-[Full Changelog](https://github.com/nymtech/nym/compare/v0.12.1...nym-wallet-v1.0.0)
-
-**Implemented enhancements:**
-
-- \[Feature Request\] Please enable registration without need for Telegram account [\#1016](https://github.com/nymtech/nym/issues/1016)
-- Fast mixnode launch with a pre-built ISO + VM software [\#1001](https://github.com/nymtech/nym/issues/1001)
-
-**Fixed bugs:**
-
-- \[Issue\] [\#1000](https://github.com/nymtech/nym/issues/1000)
-- \[Issue\] `nym-client` requires multiple attempts to run a server [\#869](https://github.com/nymtech/nym/issues/869)
-- De-'float'-ing `Interval` \(`Display` impl + `serde`\) [\#1065](https://github.com/nymtech/nym/pull/1065) ([jstuczyn](https://github.com/jstuczyn))
-- display client address on wallet creation [\#1058](https://github.com/nymtech/nym/pull/1058) ([fmtabbara](https://github.com/fmtabbara))
-
-**Closed issues:**
-
-- Rewarded set inclusion probability API endpoint [\#1037](https://github.com/nymtech/nym/issues/1037)
-- Update cw-storage-plus to 0.11  [\#1032](https://github.com/nymtech/nym/issues/1032)
-- Change `u128` fields in `RewardEstimationResponse` to `u64` [\#1029](https://github.com/nymtech/nym/issues/1029)
-- Test out the mainnet Gravity Bridge [\#1006](https://github.com/nymtech/nym/issues/1006)
-- Add vesting contract interface to nym-wallet [\#959](https://github.com/nymtech/nym/issues/959)
-- Mixnode crash [\#486](https://github.com/nymtech/nym/issues/486)
-
-**Merged pull requests:**
-
-- create custom urls for mainnet [\#1095](https://github.com/nymtech/nym/pull/1095) ([fmtabbara](https://github.com/fmtabbara))
-- Wallet signing on MacOS [\#1093](https://github.com/nymtech/nym/pull/1093) ([mmsinclair](https://github.com/mmsinclair))
-- Fix rust 2018 idioms warnings [\#1092](https://github.com/nymtech/nym/pull/1092) ([octol](https://github.com/octol))
-- Prevent contract overwriting [\#1090](https://github.com/nymtech/nym/pull/1090) ([durch](https://github.com/durch))
-- Logout operation [\#1087](https://github.com/nymtech/nym/pull/1087) ([jstuczyn](https://github.com/jstuczyn))
-- Update to rust edition 2021 everywhere [\#1086](https://github.com/nymtech/nym/pull/1086) ([octol](https://github.com/octol))
-- Tag contract errors, and print out lines for easier QA [\#1084](https://github.com/nymtech/nym/pull/1084) ([durch](https://github.com/durch))
-- Feature/flexible vesting + utility queries [\#1083](https://github.com/nymtech/nym/pull/1083) ([durch](https://github.com/durch))
-- Bump @openzeppelin/contracts from 4.3.1 to 4.4.2 in /contracts/basic-bandwidth-generation [\#1082](https://github.com/nymtech/nym/pull/1082) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump nth-check from 2.0.0 to 2.0.1 in /clients/native/examples/js-examples/websocket [\#1081](https://github.com/nymtech/nym/pull/1081) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump url-parse from 1.5.1 to 1.5.4 in /clients/native/examples/js-examples/websocket [\#1080](https://github.com/nymtech/nym/pull/1080) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump follow-redirects from 1.14.1 to 1.14.7 in /clients/native/examples/js-examples/websocket [\#1079](https://github.com/nymtech/nym/pull/1079) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump nanoid from 3.1.23 to 3.2.0 in /clients/native/examples/js-examples/websocket [\#1078](https://github.com/nymtech/nym/pull/1078) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Setup basic test for mixnode stats reporting [\#1077](https://github.com/nymtech/nym/pull/1077) ([octol](https://github.com/octol))
-- Make wallet\_address mandatory for mixnode init [\#1076](https://github.com/nymtech/nym/pull/1076) ([octol](https://github.com/octol))
-- Tidy nym-mixnode module visibility [\#1075](https://github.com/nymtech/nym/pull/1075) ([octol](https://github.com/octol))
-- Feature/wallet login with password [\#1074](https://github.com/nymtech/nym/pull/1074) ([fmtabbara](https://github.com/fmtabbara))
-- Add trait to mock client dependency in DelayForwarder [\#1073](https://github.com/nymtech/nym/pull/1073) ([octol](https://github.com/octol))
-- Bump rust-version to latest stable for nym-mixnode [\#1072](https://github.com/nymtech/nym/pull/1072) ([octol](https://github.com/octol))
-- Fixes CI for our wasm build [\#1069](https://github.com/nymtech/nym/pull/1069) ([jstuczyn](https://github.com/jstuczyn))
-- Add @octol as codeowner [\#1068](https://github.com/nymtech/nym/pull/1068) ([octol](https://github.com/octol))
-- set-up inclusion probability [\#1067](https://github.com/nymtech/nym/pull/1067) ([fmtabbara](https://github.com/fmtabbara))
-- Feature/wasm client [\#1066](https://github.com/nymtech/nym/pull/1066) ([neacsu](https://github.com/neacsu))
-- Changed bech32\_prefix from punk to nymt [\#1064](https://github.com/nymtech/nym/pull/1064) ([jstuczyn](https://github.com/jstuczyn))
-- Bump nanoid from 3.1.30 to 3.2.0 in /testnet-faucet [\#1063](https://github.com/nymtech/nym/pull/1063) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump nanoid from 3.1.30 to 3.2.0 in /nym-wallet [\#1062](https://github.com/nymtech/nym/pull/1062) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Rework vesting contract storage [\#1061](https://github.com/nymtech/nym/pull/1061) ([durch](https://github.com/durch))
-- Mixnet Contract constants extraction [\#1060](https://github.com/nymtech/nym/pull/1060) ([jstuczyn](https://github.com/jstuczyn))
-- fix: make explorer footer year dynamic [\#1059](https://github.com/nymtech/nym/pull/1059) ([martinyung](https://github.com/martinyung))
-- Add mnemonic just on creation, to display it [\#1057](https://github.com/nymtech/nym/pull/1057) ([neacsu](https://github.com/neacsu))
-- Network Explorer: updates to API and UI to show the active set [\#1056](https://github.com/nymtech/nym/pull/1056) ([mmsinclair](https://github.com/mmsinclair))
-- Made contract addresses for query NymdClient construction optional [\#1055](https://github.com/nymtech/nym/pull/1055) ([jstuczyn](https://github.com/jstuczyn))
-- Introduced RPC query for total token supply [\#1053](https://github.com/nymtech/nym/pull/1053) ([jstuczyn](https://github.com/jstuczyn))
-- Feature/tokio console [\#1052](https://github.com/nymtech/nym/pull/1052) ([durch](https://github.com/durch))
-- Implemented beta clippy lint recommendations [\#1051](https://github.com/nymtech/nym/pull/1051) ([jstuczyn](https://github.com/jstuczyn))
-- add new function to update profit percentage [\#1050](https://github.com/nymtech/nym/pull/1050) ([fmtabbara](https://github.com/fmtabbara))
-- Upgrade Clap and use declarative argument parsing for nym-mixnode [\#1047](https://github.com/nymtech/nym/pull/1047) ([octol](https://github.com/octol))
-- Feature/additional bond validation [\#1046](https://github.com/nymtech/nym/pull/1046) ([fmtabbara](https://github.com/fmtabbara))
-- Fix clippy on relevant lints [\#1044](https://github.com/nymtech/nym/pull/1044) ([neacsu](https://github.com/neacsu))
-- Bump shelljs from 0.8.4 to 0.8.5 in /contracts/basic-bandwidth-generation [\#1043](https://github.com/nymtech/nym/pull/1043) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Endpoint for rewarded set inclusion probabilities [\#1042](https://github.com/nymtech/nym/pull/1042) ([durch](https://github.com/durch))
-- Bump follow-redirects from 1.14.4 to 1.14.7 in /contracts/basic-bandwidth-generation [\#1041](https://github.com/nymtech/nym/pull/1041) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump follow-redirects from 1.14.5 to 1.14.7 in /testnet-faucet [\#1040](https://github.com/nymtech/nym/pull/1040) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Feature/node settings update [\#1036](https://github.com/nymtech/nym/pull/1036) ([fmtabbara](https://github.com/fmtabbara))
-- Migrate to cw-storage-plus 0.11.1 [\#1035](https://github.com/nymtech/nym/pull/1035) ([durch](https://github.com/durch))
-- Bump @openzeppelin/contracts from 4.4.1 to 4.4.2 in /contracts/basic-bandwidth-generation [\#1034](https://github.com/nymtech/nym/pull/1034) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Feature/configurable wallet [\#1033](https://github.com/nymtech/nym/pull/1033) ([neacsu](https://github.com/neacsu))
-- Feature/downcast reward estimation [\#1031](https://github.com/nymtech/nym/pull/1031) ([durch](https://github.com/durch))
-- Wallet UI updates [\#1028](https://github.com/nymtech/nym/pull/1028) ([fmtabbara](https://github.com/fmtabbara))
-- Remove migration code [\#1027](https://github.com/nymtech/nym/pull/1027) ([neacsu](https://github.com/neacsu))
-- Chore/stricter dependency requirements [\#1025](https://github.com/nymtech/nym/pull/1025) ([jstuczyn](https://github.com/jstuczyn))
-- Feature/validator api client endpoints [\#1024](https://github.com/nymtech/nym/pull/1024) ([jstuczyn](https://github.com/jstuczyn))
-- Updated cosmrs to 0.4.1 [\#1023](https://github.com/nymtech/nym/pull/1023) ([jstuczyn](https://github.com/jstuczyn))
-- Feature/testnet deploy scripts [\#1022](https://github.com/nymtech/nym/pull/1022) ([mfahampshire](https://github.com/mfahampshire))
-- Changed wallet's client to a full validator client [\#1021](https://github.com/nymtech/nym/pull/1021) ([jstuczyn](https://github.com/jstuczyn))
-- Fix 404 link [\#1020](https://github.com/nymtech/nym/pull/1020) ([RiccardoMasutti](https://github.com/RiccardoMasutti))
-- Feature/additional mixnode endpoints [\#1019](https://github.com/nymtech/nym/pull/1019) ([jstuczyn](https://github.com/jstuczyn))
-- Introduced denom check when trying to withdraw vested coins [\#1018](https://github.com/nymtech/nym/pull/1018) ([jstuczyn](https://github.com/jstuczyn))
-- Add network defaults for qa [\#1017](https://github.com/nymtech/nym/pull/1017) ([neacsu](https://github.com/neacsu))
-- Feature/expanded events [\#1015](https://github.com/nymtech/nym/pull/1015) ([jstuczyn](https://github.com/jstuczyn))
-- update frontend to use new profit update api [\#1014](https://github.com/nymtech/nym/pull/1014) ([fmtabbara](https://github.com/fmtabbara))
-- Feature/node state endpoint [\#1013](https://github.com/nymtech/nym/pull/1013) ([jstuczyn](https://github.com/jstuczyn))
-- Feature/hourly set updates [\#1012](https://github.com/nymtech/nym/pull/1012) ([durch](https://github.com/durch))
-- Feature/remove unused profit margin [\#1011](https://github.com/nymtech/nym/pull/1011) ([neacsu](https://github.com/neacsu))
-- Feature/explorer node status [\#1010](https://github.com/nymtech/nym/pull/1010) ([jstuczyn](https://github.com/jstuczyn))
-- Use serial integer instead of random [\#1009](https://github.com/nymtech/nym/pull/1009) ([durch](https://github.com/durch))
-- Feature/configure profit [\#1008](https://github.com/nymtech/nym/pull/1008) ([neacsu](https://github.com/neacsu))
-- Feature/fix gateway sign [\#1004](https://github.com/nymtech/nym/pull/1004) ([neacsu](https://github.com/neacsu))
-- Fix clippy [\#1003](https://github.com/nymtech/nym/pull/1003) ([neacsu](https://github.com/neacsu))
-- Update wallet version [\#998](https://github.com/nymtech/nym/pull/998) ([tommyv1987](https://github.com/tommyv1987))
-- Fix wallet build instructions [\#997](https://github.com/nymtech/nym/pull/997) ([tommyv1987](https://github.com/tommyv1987))
-- Make the separation between testnet-mode and erc20 bandwidth mode clearer [\#994](https://github.com/nymtech/nym/pull/994) ([neacsu](https://github.com/neacsu))
-- Bump @openzeppelin/contracts from 3.4.0 to 4.4.1 in /contracts/basic-bandwidth-generation [\#983](https://github.com/nymtech/nym/pull/983) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Feature/implicit runtime [\#973](https://github.com/nymtech/nym/pull/973) ([jstuczyn](https://github.com/jstuczyn))
-- Differentiate staking and ownership [\#961](https://github.com/nymtech/nym/pull/961) ([durch](https://github.com/durch))

nym-wallet/Cargo.lock

@@ -3055,7 +3055,7 @@ dependencies = [
 
 [[package]]
 name = "nym_wallet"
-version = "1.0.8"
+version = "1.0.7"
 dependencies = [
  "aes-gcm",
  "argon2 0.3.4",
@@ -3273,17 +3273,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.3",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -3300,19 +3290,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec 1.8.0",
- "windows-sys",
-]
-
 [[package]]
 name = "password-hash"
 version = "0.3.2"
@@ -4573,15 +4550,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "signature"
 version = "1.3.2"
@@ -4667,9 +4635,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "state"
-version = "0.5.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
+checksum = "87cf4f5369e6d3044b5e365c9690f451516ac8f0954084622b49ea3fde2f6de5"
 dependencies = [
  "loom",
 ]
@@ -4688,7 +4656,7 @@ checksum = "33994d0838dc2d152d17a62adf608a869b5e846b65b389af7f3dbc1de45c5b26"
 dependencies = [
  "lazy_static",
  "new_debug_unreachable",
- "parking_lot 0.11.2",
+ "parking_lot",
  "phf_shared 0.10.0",
  "precomputed-hash",
  "serde",
@@ -4870,7 +4838,7 @@ dependencies = [
  "ndk-glue",
  "ndk-sys",
  "objc",
- "parking_lot 0.11.2",
+ "parking_lot",
  "raw-window-handle",
  "scopeguard",
  "serde",
@@ -5273,9 +5241,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "once_cell",
- "parking_lot 0.12.1",
  "pin-project-lite",
- "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "winapi",
@@ -5932,11 +5898,11 @@ version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b749ebd2304aa012c5992d11a25d07b406bdbe5f79d371cb7a918ce501a19eb0"
 dependencies = [
- "windows_aarch64_msvc 0.30.0",
- "windows_i686_gnu 0.30.0",
- "windows_i686_msvc 0.30.0",
- "windows_x86_64_gnu 0.30.0",
- "windows_x86_64_msvc 0.30.0",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
@@ -5949,31 +5915,12 @@ dependencies = [
  "windows_reader",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_gen"
 version = "0.30.0"
@@ -5990,24 +5937,12 @@ version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_macros"
 version = "0.30.0"
@@ -6038,24 +5973,12 @@ version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "winreg"
 version = "0.7.0"

nym-wallet/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym_wallet"
-version = "1.0.8"
+version = "1.0.7"
 description = "Nym Native Wallet"
 authors = ["Nym Technologies SA"]
 license = ""
@@ -32,14 +32,14 @@ log = "0.4"
 once_cell = "1.7.2"
 pretty_env_logger = "0.4"
 rand = "0.6.5"
-reqwest = {version = "0.11.9", features = ["json"] }
+reqwest = "0.11.9"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 strum = { version = "0.23", features = ["derive"] }
 tauri = { version = "=1.0.0-rc.2", features = ["clipboard-all", "shell-open", "updater", "window-maximize"] }
 tendermint-rpc = "0.23.0"
 thiserror = "1.0"
-tokio = { version = "1.10", features = ["full"] }
+tokio = { version = "1.10", features = ["sync", "time"] }
 toml = "0.5.8"
 url = "2.2"
 

nym-wallet/src-tauri/src/main.rs

@@ -58,8 +58,6 @@ fn main() {
             mixnet::bond::unbond_gateway,
             mixnet::bond::unbond_mixnode,
             mixnet::bond::update_mixnode,
-            mixnet::bond::get_number_of_mixnode_delegators,
-            mixnet::bond::get_mix_node_description,
             mixnet::delegate::delegate_to_mixnode,
             mixnet::delegate::get_delegator_rewards,
             mixnet::delegate::get_pending_delegation_events,

nym-wallet/src-tauri/src/operations/mixnet/bond.rs

@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use crate::error::BackendError;
 use crate::state::WalletState;
 use crate::{Gateway, MixNode};
@@ -7,18 +5,8 @@ use nym_types::currency::DecCoin;
 use nym_types::gateway::GatewayBond;
 use nym_types::mixnode::MixNodeBond;
 use nym_types::transaction::TransactionExecuteResult;
-use reqwest::Error as ReqwestError;
-use serde::{Deserialize, Serialize};
 use validator_client::nymd::{Coin, Fee};
 
-#[derive(Debug, Serialize, Deserialize)]
-pub struct NodeDescription {
-    name: String,
-    description: String,
-    link: String,
-    location: String,
-}
-
 #[tauri::command]
 pub async fn bond_gateway(
     gateway: Gateway,
@@ -210,51 +198,3 @@ pub async fn get_operator_rewards(
     );
     Ok(display_coin)
 }
-
-#[tauri::command]
-pub async fn get_number_of_mixnode_delegators(
-    identity: String,
-    state: tauri::State<'_, WalletState>,
-) -> Result<usize, BackendError> {
-    let guard = state.read().await;
-    let client = guard.current_client()?;
-    let paged_delegations = client
-        .nymd
-        .get_mix_delegations_paged(identity, None, Some(20))
-        .await?;
-
-    Ok(paged_delegations.delegations.len())
-}
-
-async fn fetch_mix_node_description(
-    host: &str,
-    port: u16,
-) -> Result<NodeDescription, ReqwestError> {
-    let milli_second = Duration::from_millis(1000);
-    let client = reqwest::Client::builder().timeout(milli_second).build()?;
-    let response = client
-        .get(format!("http://{}:{}/description", host, port))
-        .send()
-        .await;
-
-    match response {
-        Ok(res) => {
-            let json = res.json::<NodeDescription>().await;
-            match json {
-                Ok(json) => Ok(json),
-                Err(e) => Err(e),
-            }
-        }
-        Err(e) => Err(e),
-    }
-}
-
-#[tauri::command]
-pub async fn get_mix_node_description(
-    host: &str,
-    port: u16,
-) -> Result<NodeDescription, BackendError> {
-    fetch_mix_node_description(host, port)
-        .await
-        .map_err(|e| BackendError::ReqwestError { source: e })
-}

nym-wallet/src-tauri/src/wallet_storage/test-data/saved-wallet-1.0.4.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "accounts": [
+    {
+      "id": "default",
+      "account": {
+        "ciphertext": "cq5w4W5ex5eFFRcqLG+824XyUAUoYmrRY3NGw/rue6/mLoQKQE/07+BxzRuKjyYFasC1HBPg41KJwp2IY+/7+80rB9aXPpaKVLUcG9U40qgCw66WhgxTrXOnrt5toefpSTBL7f9N/PVwpuumfAgD9CS0ioB7/9Qoea7nYKkextGX15ex26B/ndQddvUkQ4gx+Vq7OLymv4l+nkdZ2nKMja349zd/BjnzPBB68/iIjyYlivVjtQ7FRbvpNRj6Mjg4905wGlO7bTpkw+RGiaGK4pK8fTWz8gAKr8GYoXPD",
+        "salt": "SPVGdbVyoEayD4ZzM4I+Jg==",
+        "iv": "tjpn/tRjD1gty+fQ"
+      }
+    }
+  ]
+}

nym-wallet/src-tauri/src/wallet_storage/test-data/saved-wallet-1.0.5.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "accounts": [
+    {
+      "id": "default",
+      "account": {
+        "ciphertext": "3MDgoU2i5QMc9r80yPeq2AMk5wpkke0tXum5NsOE5NcFciF+aHLQW0dvXbGszap1y3nN4+YZD3cgGrmtKh/cChqRGJDkniaxdf3XPHh9RkiWXw2KSHHeyGrFY0INJeiky1ZtUFhWhopcHJWSnfCmVC15YFpnM5xOKpITjHAFhGt98MaYR+mS+3zoUFrjYbaZRh2TR2lFWsbR8YU1uaTYqJZ1HX1PBCub6aS3vjQm0Fwa+hAtR/gMymXJc5qtruTO4NbqYtMj3Z9eIgoVB+56SLAXlIF1Uo1pjvV0mx1hWNNiIc10ujF/wl/nnKF6icOcmrfm9XhOtsvUYBsE/wAIJZw3LKXgSX+hJbOl+zLAwJZK1xiL8n/nM1IJZDn+Wu6z0OzRaj9S7T16+brMw1oaqjk56saM8n5z725fizJj+ur6gnPBWnoyHPaCHgHdB2PKQNY0ZlwRM6dVncRaEWQDLAboyMq3FXxK9UbusNcDFpYw6bdnuJlNVf6y9yxwyvkUrt5YtgfkLyoW42z1PVtVWsV9P8eE/A/tnYjXf34xvba3K8Y1/3DTi7uuydNrSR/XhA+pevz68VWCbY+j746Yi8Lz7altePphkjfJAezodobKvMplXzqInopIWNovyemw/+1E7WZbkQIOAXg1WC1+Y/df+dffRGuGRdDerfRLmA5XLej1M/wE3WQ7b9KwlAo6XJ4hnQKwyDCqYP/ButBXW1AOnnZpCq59gGbiccZJsTMZB4OP95yFPgz8//IeDgma2PDixVmDEp0SGHhN7dlSoNa5eoglblqzJu/TcTA6jmQFA3ef0GiA3QzBjmyB4bz0bFybh8XA1brVIVlsjRwXb3/UYaVqsP6Hy1QDUpZofXIJs5lK0hUd0ECdaNFXXgHd25ifPocp09WLFyK92H6i3ABDZ7pu3b4lTUt6kHt6LTVsKkyylmYf2iMHnCcmfy4uxGTXxRjPjMgKL8pd++OZ3q62jLBuoTjgdj6pccwDvD+NYQ2FFeHmBzxyTLqUyKltYiyFlJHWLKOcXyeDHzRhHic+e/wn3VhM3NdrvtqYWA9m72Ye1L1I7VX7KatGurG6CeiFiY5xHxxpLT7dF0fJ7uxRye4JnRyYQuU7iK72qCKjgYjwjCIha4qPi5Q/x6S+uVe7yX5Eb73L3eB+IlkyW9wPHmSOcE4GpbMU96tK8xoxT0T9eQlj050GDnJ/oI2XHfZTs1bIxsjfZqW03g==",
+        "salt": "wXR3RnPmsoA3ncrixIvaUw==",
+        "iv": "/Zjn1OXsLJhA43n/"
+      }
+    }
+  ]
+}

nym-wallet/src-tauri/src/wallet_storage/test-data/saved-wallet.json

@@ -0,0 +1,21 @@
+{
+  "version": 1,
+  "accounts": [
+    {
+      "id": "first",
+      "account": {
+        "ciphertext": "icnpxLmr/H7FIIOaEf7DYNLuM6uhh7poEppXpYCllQD33TjY+8eLtVvhEQmjX60IQeFOd+1JCcrHa2B12vlBAYlfM4gBxA6d2ZJ8+Dw/vNvBNyChiyUx2euV3vPGOs22r/XDBsmEeF40XZcXftQZa2kzYaPnkbP+eiMOIWkcY4FYOEHwx5SxT4VBPZIrVTC3iDalJLWybVbbw/Bc2zbzEXI1ckg4Ccydj95SMil9BiyDpALfZqwlai7I97S+BjmcVxSCsYqFjTkRUHVMjrEr7fWHKU4DIOM=",
+        "salt": "CtnbfkxTybqz0U4cPHW2jQ==",
+        "iv": "77ZROU6dAMttEWwS"
+      }
+    },
+    {
+      "id": "second",
+      "account": {
+        "ciphertext": "nsqZHdQFlskglc5izKgnr8sBwdMmd82h2Rnjdos9EUca3cqkUdFYEjZDsK8OGR3GZ9alLTNt/1U97Rvvr2HPAWbzl23FW2YXaLTA6yj6ZwQK5w0MYE061NYbcxNHuzT9f5aQWkGULAk4RWb5t8eUX7y/NdJr3tA5xuGOLhooTfBB98/4RpupDsYGZp1DPC/GMFppOA3GmKs9bacZm805Bhfq5mwhXab1SjJQpFHMHisCMhxo/oLqulKML1tQMetBdqDTjJmPpdUnd1mi",
+        "salt": "J2TMLjKv4dkZ/kXso9FGhg==",
+        "iv": "CTqqoMa4LetvBKCP"
+      }
+    }
+  ]
+}

nym-wallet/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "nym-wallet",
-    "version": "1.0.8"
+    "version": "1.0.7"
   },
   "build": {
     "distDir": "../dist",

nym-wallet/src/components/Accounts/AccountAvatar.tsx

@@ -1,12 +1,8 @@
 import React from 'react';
-import { Avatar, Typography } from '@mui/material';
+import { Avatar } from '@mui/material';
 import stc from 'string-to-color';
 import { TAccount } from 'src/types';
 
-export const AccountAvatar = ({ name, small }: { name: TAccount['name']; small?: boolean }) => (
-  <Avatar sx={{ bgcolor: stc(name), ...(small ? { width: 25, height: 25 } : {}) }}>
-    <Typography fontSize={small ? 14 : 'inherit'} fontWeight={600}>
-      {name?.split('')[0]}
-    </Typography>
-  </Avatar>
+export const AccountAvatar = ({ name }: Pick<TAccount, 'name'>) => (
+  <Avatar sx={{ bgcolor: stc(name), width: 20, height: 20 }}>{name?.split('')[0]}</Avatar>
 );

nym-wallet/src/components/Accounts/AccountOverview.tsx

@@ -5,10 +5,10 @@ import { AccountAvatar } from './AccountAvatar';
 
 export const AccountOverview = ({ account, onClick }: { account: AccountEntry; onClick: () => void }) => (
   <Button
-    startIcon={<AccountAvatar name={account.id} small />}
+    startIcon={<AccountAvatar name={account.id} />}
     sx={{ color: 'text.primary' }}
-    color="inherit"
     onClick={onClick}
+    disableRipple
   >
     {account.id}
   </Button>

nym-wallet/src/components/Accounts/MultiAccountHowTo.tsx

@@ -20,7 +20,7 @@ export const MultiAccountHowTo = ({ show, handleClose }: { show: boolean; handle
             <Close />
           </IconButton>
         </Box>
-        <Typography variant="body1" sx={{ color: (theme) => theme.palette.nym.text.muted }}>
+        <Typography variant="body1" sx={{ color: (t) => t.palette.nym.text.muted }}>
           How to set up multiple accounts
         </Typography>
       </DialogTitle>
@@ -29,7 +29,7 @@ export const MultiAccountHowTo = ({ show, handleClose }: { show: boolean; handle
           <Alert
             severity="warning"
             icon={false}
-            sx={(t) => (t.palette.mode === 'dark' ? { bgcolor: (theme) => theme.palette.background.paper } : {})}
+            sx={(t) => (t.palette.mode === 'dark' ? { bgcolor: (t) => t.palette.background.paper } : {})}
           >
             <Typography>In order to create multiple accounts your wallet needs a password.</Typography>
             <Typography>Follow steps below to create password.</Typography>

nym-wallet/src/components/Accounts/modals/AccountsModal.tsx

@@ -9,7 +9,6 @@ import {
   DialogTitle,
   IconButton,
   Typography,
-  Divider,
 } from '@mui/material';
 import { Add, ArrowDownwardSharp, Close } from '@mui/icons-material';
 import { AccountsContext } from 'src/context';
@@ -52,7 +51,7 @@ export const AccountsModal = () => {
               <Close />
             </IconButton>
           </Box>
-          <Typography fontSize="small" sx={{ color: 'grey.600' }}>
+          <Typography variant="body1" sx={{ color: (theme) => theme.palette.text.disabled }}>
             Switch between accounts
           </Typography>
         </DialogTitle>
@@ -70,7 +69,6 @@ export const AccountsModal = () => {
             />
           ))}
         </DialogContent>
-        <Divider variant="middle" sx={{ mt: 3 }} />
         <DialogActions sx={{ p: 3 }}>
           <Button startIcon={<ArrowDownwardSharp />} onClick={() => setDialogToDisplay('Import')}>
             Import account

nym-wallet/src/components/Accounts/modals/AddAccountModal.tsx

@@ -7,16 +7,17 @@ import {
   DialogActions,
   DialogContent,
   DialogTitle,
+  IconButton,
   TextField,
   Typography,
 } from '@mui/material';
+import { ArrowBackSharp } from '@mui/icons-material';
 import { useClipboard } from 'use-clipboard-copy';
 import { createMnemonic, validateMnemonic } from 'src/requests';
 import { Console } from 'src/utils/console';
 import { AccountsContext } from 'src/context';
 import { ConfirmPassword, Mnemonic } from 'src/components';
 import { MnemonicInput } from 'src/components/textfields';
-import { StyledBackButton } from 'src/components/StyledBackButton';
 
 const createAccountSteps = [
   'Copy and save mnemonic for your new account',
@@ -29,15 +30,14 @@ const importAccountSteps = [
   'Confirm the password used to login to your wallet',
 ];
 
-const MnemonicStep = ({ mnemonic, onNext, onBack }: { mnemonic: string; onNext: () => void; onBack: () => void }) => {
+const MnemonicStep = ({ mnemonic, onNext }: { mnemonic: string; onNext: () => void }) => {
   const { copy, copied } = useClipboard({ copiedTimeout: 5000 });
   return (
     <Box sx={{ mt: 1 }}>
       <DialogContent>
         <Mnemonic mnemonic={mnemonic} handleCopy={copy} copied={copied} />
       </DialogContent>
-      <DialogActions sx={{ p: 3, pt: 0, gap: 2 }}>
-        <StyledBackButton onBack={onBack} />
+      <DialogActions sx={{ p: 3, pt: 0 }}>
         <Button disabled={!copied} fullWidth disableElevation variant="contained" size="large" onClick={onNext}>
           I saved my mnemonic
         </Button>
@@ -50,12 +50,10 @@ const ImportMnemonic = ({
   value,
   onChange,
   onNext,
-  onBack,
 }: {
   value: string;
   onChange: (value: string) => void;
   onNext: () => void;
-  onBack: () => void;
 }) => {
   const [error, setError] = useState<string>();
 
@@ -79,8 +77,7 @@ const ImportMnemonic = ({
           }}
         />
       </DialogContent>
-      <DialogActions sx={{ p: 3, pt: 0, gap: 2 }}>
-        <StyledBackButton onBack={onBack} />
+      <DialogActions sx={{ p: 3, pt: 0 }}>
         <Button
           disabled={value.length === 0}
           fullWidth
@@ -96,7 +93,7 @@ const ImportMnemonic = ({
   );
 };
 
-const NameAccount = ({ onNext, onBack }: { onNext: (value: string) => void; onBack: () => void }) => {
+const NameAccount = ({ onNext }: { onNext: (value: string) => void }) => {
   const [value, setValue] = useState('');
   const [error, setError] = useState<string>();
 
@@ -124,8 +121,7 @@ const NameAccount = ({ onNext, onBack }: { onNext: (value: string) => void; onBa
           fullWidth
         />
       </DialogContent>
-      <DialogActions sx={{ p: 3, pt: 0, gap: 2 }}>
-        <StyledBackButton onBack={onBack} />
+      <DialogActions sx={{ p: 3, pt: 0 }}>
         <Button
           disabled={!value.length}
           fullWidth
@@ -182,6 +178,9 @@ export const AddAccountModal = () => {
         <DialogTitle sx={{ pb: 0 }}>
           <Box display="flex" justifyContent="space-between" alignItems="center">
             <Typography variant="h6">{`${dialogToDisplay} new account`}</Typography>
+            <IconButton onClick={() => (step === 0 ? handleClose() : setStep((s) => s - 1))}>
+              <ArrowBackSharp />
+            </IconButton>
           </Box>
           <Typography sx={{ mt: 2 }}>
             {dialogToDisplay === 'Add' ? createAccountSteps[step] : importAccountSteps[step]}
@@ -191,17 +190,12 @@ export const AddAccountModal = () => {
           switch (step) {
             case 0:
               return dialogToDisplay === 'Add' ? (
-                <MnemonicStep
-                  mnemonic={data.mnemonic}
-                  onNext={() => setStep((s) => s + 1)}
-                  onBack={() => (step === 0 ? handleClose() : setStep((s) => s - 1))}
-                />
+                <MnemonicStep mnemonic={data.mnemonic} onNext={() => setStep((s) => s + 1)} />
               ) : (
                 <ImportMnemonic
                   value={data.mnemonic}
                   onChange={(value) => setData((d) => ({ ...d, mnemonic: value }))}
                   onNext={() => setStep((s) => s + 1)}
-                  onBack={() => (step === 0 ? handleClose() : setStep((s) => s - 1))}
                 />
               );
             case 1:
@@ -211,7 +205,6 @@ export const AddAccountModal = () => {
                     setData((d) => ({ ...d, accountName }));
                     setStep((s) => s + 1);
                   }}
-                  onBack={() => setStep((s) => s - 1)}
                 />
               );
             case 2:
@@ -229,7 +222,6 @@ export const AddAccountModal = () => {
                       }
                     }
                   }}
-                  onCancel={() => setStep((s) => s - 1)}
                   isLoading={isLoading}
                   error={error}
                 />

nym-wallet/src/components/Accounts/modals/ConfirmPasswordModal.tsx

@@ -19,18 +19,17 @@ export const ConfirmPasswordModal = ({
     <Dialog open={Boolean(accountName)} onClose={onClose} fullWidth>
       <Paper>
         <DialogTitle>
-          <Typography variant="h6">Switch account</Typography>
-          <Typography fontSize="small" sx={{ color: 'grey.600' }}>
+          <Box display="flex" justifyContent="space-between" alignItems="center">
+            <Typography variant="h6">Switch account</Typography>
+            <IconButton onClick={onClose}>
+              <ArrowBack />
+            </IconButton>
+          </Box>
+          <Typography variant="body1" sx={{ color: (theme) => theme.palette.text.disabled }}>
             Confirm password
           </Typography>
         </DialogTitle>
-        <ConfirmPassword
-          onConfirm={onConfirm}
-          error={error}
-          isLoading={isLoading}
-          buttonTitle="Switch account"
-          onCancel={onClose}
-        />
+        <ConfirmPassword onConfirm={onConfirm} error={error} isLoading={isLoading} buttonTitle="Switch account" />
       </Paper>
     </Dialog>
   );

nym-wallet/src/components/Accounts/modals/EditAccountModal.tsx

@@ -33,7 +33,7 @@ export const EditAccountModal = () => {
               <Close />
             </IconButton>
           </Box>
-          <Typography fontSize="small" sx={{ color: 'grey.600' }}>
+          <Typography variant="body1" sx={{ color: (theme) => theme.palette.text.disabled }}>
             New wallet address
           </Typography>
         </DialogTitle>

nym-wallet/src/components/Accounts/modals/ImportAccountModal.tsx

@@ -0,0 +1,69 @@
+import React, { useContext, useState } from 'react';
+import {
+  Box,
+  Button,
+  Paper,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogTitle,
+  IconButton,
+  TextField,
+  Typography,
+} from '@mui/material';
+import { Close } from '@mui/icons-material';
+import { AccountsContext } from 'src/context';
+
+export const ImportAccountModal = () => {
+  const [mnemonic, setMnemonic] = useState('');
+
+  const { dialogToDisplay, setDialogToDisplay, handleImportAccount } = useContext(AccountsContext);
+
+  const handleClose = () => {
+    setMnemonic('');
+    setDialogToDisplay('Accounts');
+  };
+
+  return (
+    <Dialog open={dialogToDisplay === 'Import'} onClose={handleClose} fullWidth>
+      <Paper>
+        <DialogTitle>
+          <Box display="flex" justifyContent="space-between" alignItems="center">
+            <Typography variant="h6">Import account</Typography>
+            <IconButton onClick={handleClose}>
+              <Close />
+            </IconButton>
+          </Box>
+          <Typography variant="body1" sx={{ color: (theme) => theme.palette.text.disabled }}>
+            Provide mnemonic of account you want to import
+          </Typography>
+        </DialogTitle>
+        <DialogContent sx={{ p: 0 }}>
+          <Box sx={{ px: 3, mt: 1 }}>
+            <TextField
+              placeholder="Paste or type your mnemonic here"
+              fullWidth
+              value={mnemonic}
+              onChange={(e) => setMnemonic(e.target.value)}
+              autoFocus
+              multiline
+              rows={3}
+            />
+          </Box>
+        </DialogContent>
+        <DialogActions sx={{ p: 3 }}>
+          <Button
+            fullWidth
+            disableElevation
+            variant="contained"
+            size="large"
+            onClick={() => handleImportAccount({ id: '', address: '' })}
+            disabled={!mnemonic.length}
+          >
+            Import account
+          </Button>
+        </DialogActions>
+      </Paper>
+    </Dialog>
+  );
+};

nym-wallet/src/components/ActionsMenu.tsx

@@ -1,42 +0,0 @@
-import React, { useRef } from 'react';
-import { MoreVertSharp } from '@mui/icons-material';
-import { IconButton, ListItemIcon, ListItemText, Menu, MenuItem } from '@mui/material';
-
-export const ActionsMenu: React.FC<{ open: boolean; onOpen: () => void; onClose: () => void }> = ({
-  children,
-  open,
-  onOpen,
-  onClose,
-}) => {
-  const anchorEl: any = useRef<HTMLElement>();
-
-  return (
-    <>
-      <IconButton ref={anchorEl} onClick={onOpen}>
-        <MoreVertSharp />
-      </IconButton>
-      <Menu anchorEl={anchorEl.current} open={open} onClose={onClose}>
-        {children}
-      </Menu>
-    </>
-  );
-};
-
-export const ActionsMenuItem = ({
-  title,
-  description,
-  onClick,
-  Icon,
-  disabled,
-}: {
-  title: string;
-  description?: string;
-  onClick?: () => void;
-  Icon?: React.ReactNode;
-  disabled?: boolean;
-}) => (
-  <MenuItem sx={{ p: 2 }} onClick={onClick} disabled={disabled}>
-    <ListItemIcon sx={{ color: 'text.primary' }}>{Icon}</ListItemIcon>
-    <ListItemText sx={{ color: 'text.primary' }} primary={title} secondary={description} />
-  </MenuItem>
-);

nym-wallet/src/components/AppBar.tsx

@@ -7,11 +7,13 @@ import ModeNightOutlinedIcon from '@mui/icons-material/ModeNightOutlined';
 import LightModeOutlinedIcon from '@mui/icons-material/LightModeOutlined';
 import { AppContext } from '../context/main';
 import { NetworkSelector } from './NetworkSelector';
+import { Node as NodeIcon } from '../svg-icons/node';
 import { MultiAccounts } from './Accounts';
 import { config } from '../config';
 
 export const AppBar = () => {
-  const { logOut, handleShowTerminal, appEnv, mode, handleSwitchMode } = useContext(AppContext);
+  const { logOut, handleShowTerminal, appEnv, handleShowSettings, showSettings, mode, handleSwitchMode } =
+    useContext(AppContext);
   const navigate = useNavigate();
 
   return (
@@ -29,7 +31,7 @@ export const AppBar = () => {
           <Grid item container justifyContent="flex-end" md={12} lg={5} spacing={2}>
             <Grid item>
               <IconButton size="small" onClick={handleSwitchMode} sx={{ color: 'text.primary' }}>
-                {mode === 'dark' ? (
+                {mode === 'light' ? (
                   <LightModeOutlinedIcon fontSize="small" />
                 ) : (
                   <ModeNightOutlinedIcon fontSize="small" sx={{ transform: 'rotate(180deg)' }} />
@@ -43,6 +45,15 @@ export const AppBar = () => {
                 </IconButton>
               </Grid>
             )}
+            <Grid item>
+              <IconButton
+                onClick={handleShowSettings}
+                sx={{ color: showSettings ? 'primary.main' : 'text.primary' }}
+                size="small"
+              >
+                <NodeIcon fontSize="small" />
+              </IconButton>
+            </Grid>
             <Grid item>
               <IconButton
                 size="small"

nym-wallet/src/components/AppBar/AppBar.tsx

@@ -0,0 +1,65 @@
+import React, { useContext } from 'react';
+import { Logout } from '@mui/icons-material';
+import TerminalIcon from '@mui/icons-material/Terminal';
+import ModeNightOutlinedIcon from '@mui/icons-material/ModeNightOutlined';
+import LightModeOutlinedIcon from '@mui/icons-material/LightModeOutlined';
+import { AppBar as MuiAppBar, Grid, IconButton, Toolbar } from '@mui/material';
+import { Node } from 'src/svg-icons/node';
+import { config } from '../../config';
+import { AppContext } from '../../context/main';
+import { MultiAccounts } from '../Accounts';
+import { NetworkSelector } from '../NetworkSelector';
+
+export const AppBar = () => {
+  const { showSettings, handleShowTerminal, appEnv, handleShowSettings, logOut, mode, handleSwitchMode } =
+    useContext(AppContext);
+
+  return (
+    <MuiAppBar position="sticky" sx={{ boxShadow: 'none', bgcolor: 'transparent', backgroundImage: 'none' }}>
+      <Toolbar disableGutters>
+        <Grid container justifyContent="space-between" alignItems="center" flexWrap="nowrap">
+          <Grid item container alignItems="center" spacing={1}>
+            <Grid item>
+              <MultiAccounts />
+            </Grid>
+            <Grid item>
+              <NetworkSelector />
+            </Grid>
+          </Grid>
+          <Grid item container justifyContent="flex-end" md={12} lg={5} spacing={2}>
+            <Grid item>
+              <IconButton size="small" onClick={handleSwitchMode} sx={{ color: 'text.primary' }}>
+                {mode === 'light' ? (
+                  <ModeNightOutlinedIcon fontSize="small" />
+                ) : (
+                  <LightModeOutlinedIcon fontSize="small" />
+                )}
+              </IconButton>
+            </Grid>
+            {(appEnv?.SHOW_TERMINAL || config.IS_DEV_MODE) && (
+              <Grid item>
+                <IconButton size="small" onClick={handleShowTerminal} sx={{ color: 'text.primary' }}>
+                  <TerminalIcon fontSize="small" />
+                </IconButton>
+              </Grid>
+            )}
+            <Grid item>
+              <IconButton
+                onClick={handleShowSettings}
+                sx={{ color: showSettings ? 'primary.main' : 'text.primary' }}
+                size="small"
+              >
+                <Node fontSize="small" />
+              </IconButton>
+            </Grid>
+            <Grid item>
+              <IconButton size="small" onClick={logOut} sx={{ color: 'text.primary' }}>
+                <Logout fontSize="small" />
+              </IconButton>
+            </Grid>
+          </Grid>
+        </Grid>
+      </Toolbar>
+    </MuiAppBar>
+  );
+};

nym-wallet/src/components/AppBar/index.ts

@@ -0,0 +1 @@
+export * from './AppBar';

nym-wallet/src/components/Bonding/Bond.tsx

@@ -1,44 +0,0 @@
-import React from 'react';
-import { Box, Button, Typography } from '@mui/material';
-import { NymCard } from '../NymCard';
-
-export const Bond = ({
-  onBond,
-  disabled,
-}: {
-  onBond: () => void;
-
-  disabled: boolean;
-}) => (
-  <NymCard title="Bonding" borderless>
-    <Box
-      sx={{
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'space-between',
-      }}
-    >
-      <Typography>Bond a mixnode or a gateway</Typography>
-      <Box
-        sx={{
-          display: 'flex',
-          alignItems: 'flex-end',
-          justifyContent: 'space-between',
-          gap: 2,
-        }}
-      >
-        <Button
-          size="large"
-          variant="contained"
-          color="primary"
-          type="button"
-          disableElevation
-          onClick={onBond}
-          disabled={disabled}
-        >
-          Bond
-        </Button>
-      </Box>
-    </Box>
-  </NymCard>
-);

nym-wallet/src/components/Bonding/BondedGateway.tsx

@@ -1,84 +0,0 @@
-import React from 'react';
-import { Stack, Typography } from '@mui/material';
-import { Link } from '@nymproject/react/link/Link';
-import { TBondedGateway, urls } from 'src/context';
-import { NymCard } from 'src/components';
-import { Network } from 'src/types';
-import { IdentityKey } from 'src/components/IdentityKey';
-import { Cell, Header, NodeTable } from './NodeTable';
-import { BondedGatewayActions, TBondedGatwayActions } from './BondedGatewayAction';
-
-const headers: Header[] = [
-  {
-    header: 'IP',
-    id: 'ip',
-    sx: { pl: 0 },
-  },
-  {
-    header: 'Bond',
-    id: 'bond',
-  },
-  {
-    id: 'menu-button',
-    sx: { width: 34, maxWidth: 34 },
-  },
-];
-
-export const BondedGateway = ({
-  gateway,
-  network,
-  onActionSelect,
-}: {
-  gateway: TBondedGateway;
-  network?: Network;
-  onActionSelect: (action: TBondedGatwayActions) => void;
-}) => {
-  const { name, bond, ip, identityKey } = gateway;
-  const cells: Cell[] = [
-    {
-      cell: ip,
-      id: 'stake-saturation-cell',
-    },
-    {
-      cell: `${bond.amount} ${bond.denom}`,
-      id: 'stake-cell',
-      sx: { pl: 0 },
-    },
-
-    {
-      cell: <BondedGatewayActions onActionSelect={onActionSelect} />,
-      id: 'actions-cell',
-      align: 'right',
-    },
-  ];
-
-  return (
-    <NymCard
-      borderless
-      title={
-        <Stack gap={2}>
-          <Typography variant="h5" fontWeight={600}>
-            Gateway
-          </Typography>
-
-          {name && (
-            <Typography fontWeight="regular" variant="h6">
-              {name}
-            </Typography>
-          )}
-          <IdentityKey identityKey={identityKey} />
-        </Stack>
-      }
-    >
-      <NodeTable headers={headers} cells={cells} />
-      {network && (
-        <Typography sx={{ mt: 2, fontSize: 'small' }}>
-          Check more stats of your node on the{' '}
-          <Link href={`${urls(network).networkExplorer}/network-components/gateways`} target="_blank">
-            explorer
-          </Link>
-        </Typography>
-      )}
-    </NymCard>
-  );
-};

nym-wallet/src/components/Bonding/BondedGatewayAction.tsx

@@ -1,31 +0,0 @@
-import React, { useState } from 'react';
-import { ActionsMenu, ActionsMenuItem } from 'src/components/ActionsMenu';
-import { Unbond as UnbondIcon } from '../../svg-icons';
-
-export type TBondedGatwayActions = 'unbond';
-
-export const BondedGatewayActions = ({
-  onActionSelect,
-}: {
-  onActionSelect: (action: TBondedGatwayActions) => void;
-}) => {
-  const [isOpen, setIsOpen] = useState(false);
-
-  const handleOpen = () => setIsOpen(true);
-  const handleClose = () => setIsOpen(false);
-
-  const handleActionClick = (action: TBondedGatwayActions) => {
-    onActionSelect(action);
-    handleClose();
-  };
-
-  return (
-    <ActionsMenu open={isOpen} onOpen={handleOpen} onClose={handleClose}>
-      <ActionsMenuItem
-        title="Unbond"
-        Icon={<UnbondIcon fontSize="inherit" />}
-        onClick={() => handleActionClick('unbond')}
-      />
-    </ActionsMenu>
-  );
-};

nym-wallet/src/components/Bonding/BondedMixnode.tsx

@@ -1,138 +0,0 @@
-import React from 'react';
-import { Box, Button, Stack, Typography } from '@mui/material';
-import { Link } from '@nymproject/react/link/Link';
-import { TBondedMixnode, urls } from 'src/context';
-import { NymCard } from 'src/components';
-import { Network } from 'src/types';
-import { IdentityKey } from 'src/components/IdentityKey';
-import { NodeStatus } from 'src/components/NodeStatus';
-import { Node as NodeIcon } from '../../svg-icons/node';
-import { Cell, Header, NodeTable } from './NodeTable';
-import { BondedMixnodeActions, TBondedMixnodeActions } from './BondedMixnodeActions';
-
-const headers: Header[] = [
-  {
-    header: 'Stake',
-    id: 'stake',
-    sx: { pl: 0 },
-  },
-  {
-    header: 'Bond',
-    id: 'bond',
-  },
-  {
-    header: 'Stake saturation',
-    id: 'stake-saturation',
-  },
-  {
-    header: 'PM',
-    id: 'profit-margin',
-    tooltipText:
-      'The percentage of the node rewards that you as the node operator will take before the rest of the reward is shared between you and the delegators.',
-  },
-  {
-    header: 'Operator rewards',
-    id: 'operator-rewards',
-    tooltipText:
-      'This is your (operator) new rewards including the PM and cost. You can compound your rewards manually every epoch or unbond your node to redeem them.',
-  },
-  {
-    header: 'No. delegators',
-    id: 'delegators',
-  },
-  {
-    id: 'menu-button',
-    sx: { width: 34, maxWidth: 34 },
-  },
-];
-
-export const BondedMixnode = ({
-  mixnode,
-  network,
-  onActionSelect,
-}: {
-  mixnode: TBondedMixnode;
-  network?: Network;
-  onActionSelect: (action: TBondedMixnodeActions) => void;
-}) => {
-  const { name, stake, bond, stakeSaturation, profitMargin, operatorRewards, delegators, status, identityKey } =
-    mixnode;
-  const cells: Cell[] = [
-    {
-      cell: `${stake.amount} ${stake.denom}`,
-      id: 'stake-cell',
-    },
-    {
-      cell: `${bond.amount} ${bond.denom}`,
-      id: 'bond-cell',
-    },
-    {
-      cell: `${stakeSaturation}%`,
-      id: 'stake-saturation-cell',
-    },
-    {
-      cell: `${profitMargin}%`,
-      id: 'pm-cell',
-    },
-    {
-      cell: operatorRewards ? `${operatorRewards.amount} ${operatorRewards.denom}` : '-',
-      id: 'operator-rewards-cell',
-    },
-    {
-      cell: delegators,
-      id: 'delegators-cell',
-    },
-    {
-      cell: (
-        <BondedMixnodeActions
-          onActionSelect={onActionSelect}
-          disabledRedeemAndCompound={(operatorRewards && Number(operatorRewards.amount) === 0) || false}
-        />
-      ),
-      id: 'actions-cell',
-      align: 'right',
-    },
-  ];
-
-  return (
-    <NymCard
-      borderless
-      title={
-        <Stack gap={2}>
-          <Box display="flex" alignItems="center" gap={2}>
-            <Typography variant="h5" fontWeight={600}>
-              Mix node
-            </Typography>
-            <NodeStatus status={status} />
-          </Box>
-          {name && (
-            <Typography fontWeight="regular" variant="h6">
-              {name}
-            </Typography>
-          )}
-          <IdentityKey identityKey={identityKey} />
-        </Stack>
-      }
-      Action={
-        <Button
-          variant="text"
-          color="secondary"
-          onClick={() => onActionSelect('nodeSettings')}
-          startIcon={<NodeIcon />}
-        >
-          Settings
-        </Button>
-      }
-    >
-      <NodeTable headers={headers} cells={cells} />
-      {network && (
-        <Typography sx={{ mt: 2, fontSize: 'small' }}>
-          Check more stats of your node on the{' '}
-          <Link href={`${urls(network).networkExplorer}/network-components/mixnodes`} target="_blank">
-            explorer
-          </Link>
-        </Typography>
-      )}
-    </NymCard>
-  );
-};

nym-wallet/src/components/Bonding/BondedMixnodeActions.tsx

@@ -1,48 +0,0 @@
-import React, { useState } from 'react';
-import { Typography } from '@mui/material';
-import { ActionsMenu, ActionsMenuItem } from 'src/components/ActionsMenu';
-import { Unbond as UnbondIcon } from '../../svg-icons';
-
-export type TBondedMixnodeActions = 'nodeSettings' | 'bondMore' | 'unbond' | 'redeem' | 'compound';
-
-export const BondedMixnodeActions = ({
-  onActionSelect,
-  disabledRedeemAndCompound,
-}: {
-  onActionSelect: (action: TBondedMixnodeActions) => void;
-  disabledRedeemAndCompound: boolean;
-}) => {
-  const [isOpen, setIsOpen] = useState(false);
-
-  const handleOpen = () => setIsOpen(true);
-  const handleClose = () => setIsOpen(false);
-
-  const handleActionClick = (action: TBondedMixnodeActions) => {
-    onActionSelect(action);
-    handleClose();
-  };
-
-  return (
-    <ActionsMenu open={isOpen} onOpen={handleOpen} onClose={handleClose}>
-      <ActionsMenuItem
-        title="Unbond"
-        Icon={<UnbondIcon fontSize="inherit" />}
-        onClick={() => handleActionClick('unbond')}
-      />
-      <ActionsMenuItem
-        title="Compound rewards"
-        Icon={<Typography sx={{ pl: 1 }}>C</Typography>}
-        description={disabledRedeemAndCompound ? 'No rewards to compound' : 'Add your rewards to you balance'}
-        onClick={() => handleActionClick('compound')}
-        disabled={disabledRedeemAndCompound}
-      />
-      <ActionsMenuItem
-        title="Redeem rewards"
-        Icon={<Typography sx={{ pl: 1 }}>R</Typography>}
-        description={disabledRedeemAndCompound ? 'No rewards to redeem' : 'Add your rewards to you balance'}
-        onClick={() => handleActionClick('redeem')}
-        disabled={disabledRedeemAndCompound}
-      />
-    </ActionsMenu>
-  );
-};

nym-wallet/src/components/Bonding/NodeTable.tsx

@@ -1,50 +0,0 @@
-import React from 'react';
-import {
-  Stack,
-  SxProps,
-  Table,
-  TableBody,
-  TableCell,
-  TableCellProps,
-  TableContainer,
-  TableHead,
-  TableRow,
-  Typography,
-} from '@mui/material';
-import { InfoTooltip } from '../InfoToolTip';
-
-export type Header = { header?: string; id: string; tooltipText?: string; sx?: SxProps };
-export type Cell = { cell: string | React.ReactNode; id: string; align?: TableCellProps['align']; sx?: SxProps };
-
-export interface TableProps {
-  headers: Header[];
-  cells: Cell[];
-}
-
-export const NodeTable = ({ headers, cells }: TableProps) => (
-  <TableContainer>
-    <Table aria-label="node-table">
-      <TableHead>
-        <TableRow>
-          {headers.map(({ header, id, tooltipText }) => (
-            <TableCell key={id}>
-              <Stack direction="row" gap={1}>
-                {tooltipText && <InfoTooltip title={tooltipText} />}
-                <Typography>{header}</Typography>
-              </Stack>
-            </TableCell>
-          ))}
-        </TableRow>
-      </TableHead>
-      <TableBody>
-        <TableRow key="node-data">
-          {cells.map(({ cell, id, align }) => (
-            <TableCell key={id} align={align} sx={{ textTransform: 'uppercase' }}>
-              {cell}
-            </TableCell>
-          ))}
-        </TableRow>
-      </TableBody>
-    </Table>
-  </TableContainer>
-);

nym-wallet/src/components/Bonding/forms/BondGatewayForm.tsx

@@ -1,214 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { IdentityKeyFormField } from '@nymproject/react/mixnodes/IdentityKeyFormField';
-import { Box, Checkbox, FormControlLabel, Stack, TextField } from '@mui/material';
-import { useForm } from 'react-hook-form';
-import { CurrencyFormField } from '@nymproject/react/currency/CurrencyFormField';
-import { NodeTypeSelector, TokenPoolSelector } from 'src/components';
-import { yupResolver } from '@hookform/resolvers/yup';
-import { checkHasEnoughFunds, checkHasEnoughLockedTokens } from 'src/utils';
-import { CurrencyDenom, TNodeType } from '@nymproject/types';
-import { GatewayAmount, GatewayData } from 'src/pages/bonding/types';
-import { gatewayValidationSchema, amountSchema } from './gatewayValidationSchema';
-
-const NodeFormData = ({ gatewayData, onNext }: { gatewayData: GatewayData; onNext: (data: GatewayData) => void }) => {
-  const [showAdvancedOptions, setShowAdvancedOptions] = useState(false);
-
-  const {
-    register,
-    formState: { errors },
-    handleSubmit,
-    setValue,
-  } = useForm({ resolver: yupResolver(gatewayValidationSchema), defaultValues: gatewayData });
-
-  const handleRequestValidation = (event: { detail: { step: number } }) => {
-    if (event.detail.step === 1) {
-      handleSubmit(onNext)();
-    }
-  };
-
-  useEffect(() => {
-    window.addEventListener('validate_bond_gateway_step' as any, handleRequestValidation);
-    return () => window.removeEventListener('validate_bond_gateway_step' as any, handleRequestValidation);
-  }, []);
-
-  return (
-    <Stack gap={2}>
-      <IdentityKeyFormField
-        required
-        fullWidth
-        label="Identity Key"
-        initialValue={gatewayData?.identityKey}
-        errorText={errors.identityKey?.message}
-        onChanged={(value) => setValue('identityKey', value)}
-      />
-      <TextField
-        {...register('sphinxKey')}
-        name="sphinxKey"
-        label="Sphinx key"
-        error={Boolean(errors.sphinxKey)}
-        helperText={errors.sphinxKey?.message}
-      />
-      <TextField
-        {...register('ownerSignature')}
-        name="ownerSignature"
-        label="Owner signature"
-        error={Boolean(errors.ownerSignature)}
-        helperText={errors.ownerSignature?.message}
-      />
-      <TextField
-        {...register('location')}
-        name="location"
-        label="Location"
-        error={Boolean(errors.location)}
-        helperText={errors.location?.message}
-        required
-        sx={{ flexBasis: '50%' }}
-      />
-      <Stack direction="row" gap={2}>
-        <TextField
-          {...register('host')}
-          name="host"
-          label="Host"
-          error={Boolean(errors.host)}
-          helperText={errors.host?.message}
-          required
-          sx={{ flexBasis: '50%' }}
-        />
-        <TextField
-          {...register('version')}
-          name="version"
-          label="Version"
-          error={Boolean(errors.version)}
-          helperText={errors.version?.message}
-          required
-          sx={{ flexBasis: '50%' }}
-        />
-      </Stack>
-      <FormControlLabel
-        control={<Checkbox onChange={() => setShowAdvancedOptions((show) => !show)} checked={showAdvancedOptions} />}
-        label="Show advanced options"
-      />
-      {showAdvancedOptions && (
-        <Stack direction="row" gap={2} sx={{ mb: 2 }}>
-          <TextField
-            {...register('mixPort')}
-            name="mixPort"
-            label="Mix port"
-            error={Boolean(errors.mixPort)}
-            helperText={errors.mixPort?.message}
-            fullWidth
-          />
-          <TextField
-            {...register('clientsPort')}
-            name="clientsPort"
-            label="Client WS API port"
-            error={Boolean(errors.clientsPort)}
-            helperText={errors.clientsPort?.message}
-            fullWidth
-          />
-        </Stack>
-      )}
-    </Stack>
-  );
-};
-
-const AmountFormData = ({
-  denom,
-  amountData,
-  hasVestingTokens,
-  onNext,
-}: {
-  denom: CurrencyDenom;
-  amountData: GatewayAmount;
-  hasVestingTokens: boolean;
-  onNext: (data: any) => void;
-}) => {
-  const {
-    formState: { errors },
-    handleSubmit,
-    setValue,
-    getValues,
-    setError,
-  } = useForm({ resolver: yupResolver(amountSchema), defaultValues: amountData });
-
-  const handleRequestValidation = async (event: { detail: { step: number } }) => {
-    let hasSufficientTokens = true;
-    const values = getValues();
-
-    if (values.tokenPool === 'balance') {
-      hasSufficientTokens = await checkHasEnoughFunds(values.amount.amount);
-    }
-
-    if (values.tokenPool === 'locked') {
-      hasSufficientTokens = await checkHasEnoughLockedTokens(values.amount.amount);
-    }
-
-    if (event.detail.step === 2 && hasSufficientTokens) {
-      handleSubmit(onNext)();
-    } else {
-      setError('amount.amount', { message: 'Not enough tokens' });
-    }
-  };
-
-  useEffect(() => {
-    window.addEventListener('validate_bond_gateway_step' as any, handleRequestValidation);
-    return () => window.removeEventListener('validate_bond_gateway_step' as any, handleRequestValidation);
-  }, []);
-
-  return (
-    <Stack gap={2}>
-      <Box display="flex" gap={2} justifyContent="center" sx={{ mt: 2 }}>
-        {hasVestingTokens && <TokenPoolSelector disabled={false} onSelect={(pool) => setValue('tokenPool', pool)} />}
-        <CurrencyFormField
-          required
-          fullWidth
-          label="Amount"
-          autoFocus
-          onChanged={(newValue) => setValue('amount', newValue, { shouldValidate: true })}
-          validationError={errors.amount?.amount?.message}
-          denom={denom}
-          initialValue={amountData.amount.amount}
-        />
-      </Box>
-    </Stack>
-  );
-};
-
-export const BondGatewayForm = ({
-  step,
-  denom,
-  gatewayData,
-  amountData,
-  hasVestingTokens,
-  onValidateGatewayData,
-  onValidateAmountData,
-  onSelectNodeType,
-}: {
-  step: 1 | 2 | 3;
-  gatewayData: GatewayData;
-  amountData: GatewayAmount;
-  denom: CurrencyDenom;
-  hasVestingTokens: boolean;
-  onValidateGatewayData: (data: GatewayData) => void;
-  onValidateAmountData: (data: GatewayAmount) => Promise<void>;
-  onSelectNodeType: (nodeType: TNodeType) => void;
-}) => (
-  <>
-    {step === 1 && (
-      <>
-        <Box sx={{ mb: 2 }}>
-          <NodeTypeSelector disabled={false} setNodeType={onSelectNodeType} nodeType="gateway" />
-        </Box>
-        <NodeFormData onNext={onValidateGatewayData} gatewayData={gatewayData} />
-      </>
-    )}
-    {step === 2 && (
-      <AmountFormData
-        denom={denom}
-        amountData={amountData}
-        hasVestingTokens={hasVestingTokens}
-        onNext={onValidateAmountData}
-      />
-    )}
-  </>
-);

nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx

@@ -1,223 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { yupResolver } from '@hookform/resolvers/yup';
-import { Box, Checkbox, FormControlLabel, Stack, TextField } from '@mui/material';
-import { CurrencyFormField } from '@nymproject/react/currency/CurrencyFormField';
-import { IdentityKeyFormField } from '@nymproject/react/mixnodes/IdentityKeyFormField';
-import { CurrencyDenom, TNodeType } from '@nymproject/types';
-import { checkHasEnoughFunds, checkHasEnoughLockedTokens } from 'src/utils';
-import { NodeTypeSelector, TokenPoolSelector } from 'src/components';
-import { MixnodeAmount, MixnodeData } from 'src/pages/bonding/types';
-import { amountSchema, mixnodeValidationSchema } from './mixnodeValidationSchema';
-
-const NodeFormData = ({ mixnodeData, onNext }: { mixnodeData: MixnodeData; onNext: (data: any) => void }) => {
-  const [showAdvancedOptions, setShowAdvancedOptions] = useState(false);
-
-  const {
-    register,
-    formState: { errors },
-    handleSubmit,
-    setValue,
-  } = useForm({ resolver: yupResolver(mixnodeValidationSchema), defaultValues: mixnodeData });
-
-  const handleRequestValidation = (event: { detail: { step: number } }) => {
-    if (event.detail.step === 1) {
-      handleSubmit(onNext)();
-    }
-  };
-
-  useEffect(() => {
-    window.addEventListener('validate_bond_mixnode_step' as any, handleRequestValidation);
-    return () => window.removeEventListener('validate_bond_mixnode_step' as any, handleRequestValidation);
-  }, []);
-
-  return (
-    <Stack gap={2}>
-      <IdentityKeyFormField
-        required
-        fullWidth
-        label="Identity Key"
-        initialValue={mixnodeData?.identityKey}
-        errorText={errors.identityKey?.message}
-        onChanged={(value) => setValue('identityKey', value)}
-      />
-      <TextField
-        {...register('sphinxKey')}
-        name="sphinxKey"
-        label="Sphinx key"
-        error={Boolean(errors.sphinxKey)}
-        helperText={errors.sphinxKey?.message}
-      />
-      <TextField
-        {...register('ownerSignature')}
-        name="ownerSignature"
-        label="Owner signature"
-        error={Boolean(errors.ownerSignature)}
-        helperText={errors.ownerSignature?.message}
-      />
-      <Stack direction="row" gap={2}>
-        <TextField
-          {...register('host')}
-          name="host"
-          label="Host"
-          error={Boolean(errors.host)}
-          helperText={errors.host?.message}
-          required
-          sx={{ flexBasis: '50%' }}
-        />
-        <TextField
-          {...register('version')}
-          name="version"
-          label="Version"
-          error={Boolean(errors.version)}
-          helperText={errors.version?.message}
-          required
-          sx={{ flexBasis: '50%' }}
-        />
-      </Stack>
-      <FormControlLabel
-        control={<Checkbox onChange={() => setShowAdvancedOptions((show) => !show)} checked={showAdvancedOptions} />}
-        label="Show advanced options"
-      />
-      {showAdvancedOptions && (
-        <Stack direction="row" gap={2} sx={{ mb: 2 }}>
-          <TextField
-            {...register('mixPort')}
-            name="mixPort"
-            label="Mix port"
-            error={Boolean(errors.mixPort)}
-            helperText={errors.mixPort?.message}
-            fullWidth
-          />
-          <TextField
-            {...register('verlocPort')}
-            name="verlocPort"
-            label="Verloc port"
-            error={Boolean(errors.verlocPort)}
-            helperText={errors.verlocPort?.message}
-            fullWidth
-          />
-          <TextField
-            {...register('httpApiPort')}
-            name="httpApiPort"
-            label="HTTP api port"
-            error={Boolean(errors.httpApiPort)}
-            helperText={errors.httpApiPort?.message}
-            fullWidth
-          />
-        </Stack>
-      )}
-    </Stack>
-  );
-};
-
-const AmountFormData = ({
-  amountData,
-  hasVestingTokens,
-  denom,
-  onNext,
-}: {
-  amountData: MixnodeAmount;
-  hasVestingTokens: boolean;
-  denom: CurrencyDenom;
-  onNext: (data: MixnodeAmount) => void;
-}) => {
-  const {
-    register,
-    formState: { errors },
-    handleSubmit,
-    setValue,
-    getValues,
-    setError,
-  } = useForm({ resolver: yupResolver(amountSchema), defaultValues: amountData });
-
-  const handleRequestValidation = async (event: { detail: { step: number } }) => {
-    let hasSufficientTokens = true;
-    const values = getValues();
-
-    if (values.tokenPool === 'balance') {
-      hasSufficientTokens = await checkHasEnoughFunds(values.amount.amount);
-    }
-
-    if (values.tokenPool === 'locked') {
-      hasSufficientTokens = await checkHasEnoughLockedTokens(values.amount.amount);
-    }
-
-    if (event.detail.step === 2 && hasSufficientTokens) {
-      handleSubmit(onNext)();
-    } else {
-      setError('amount.amount', { message: 'Not enough tokens' });
-    }
-  };
-
-  useEffect(() => {
-    window.addEventListener('validate_bond_mixnode_step' as any, handleRequestValidation);
-    return () => window.removeEventListener('validate_bond_mixnode_step' as any, handleRequestValidation);
-  }, []);
-
-  return (
-    <Stack gap={2}>
-      <Box display="flex" gap={2} justifyContent="center" sx={{ mt: 2 }}>
-        {hasVestingTokens && <TokenPoolSelector disabled={false} onSelect={(pool) => setValue('tokenPool', pool)} />}
-        <CurrencyFormField
-          required
-          fullWidth
-          label="Amount"
-          autoFocus
-          onChanged={(newValue) => {
-            setValue('amount', newValue, { shouldValidate: true });
-          }}
-          validationError={errors.amount?.amount?.message}
-          denom={denom}
-          initialValue={amountData.amount.amount}
-        />
-      </Box>
-      <TextField
-        {...register('profitMargin')}
-        name="profitMargin"
-        label="Profit margin"
-        error={Boolean(errors.profitMargin)}
-        helperText={errors.profitMargin?.message}
-      />
-    </Stack>
-  );
-};
-
-export const BondMixnodeForm = ({
-  step,
-  denom,
-  mixnodeData,
-  amountData,
-  hasVestingTokens,
-  onValidateMixnodeData,
-  onValidateAmountData,
-  onSelectNodeType,
-}: {
-  step: 1 | 2 | 3;
-  mixnodeData: MixnodeData;
-  amountData: MixnodeAmount;
-  denom: CurrencyDenom;
-  hasVestingTokens: boolean;
-  onValidateMixnodeData: (data: MixnodeData) => void;
-  onValidateAmountData: (data: MixnodeAmount) => Promise<void>;
-  onSelectNodeType: (nodeType: TNodeType) => void;
-}) => (
-  <>
-    {step === 1 && (
-      <>
-        <Box sx={{ mb: 2 }}>
-          <NodeTypeSelector disabled={false} setNodeType={onSelectNodeType} nodeType="mixnode" />
-        </Box>
-        <NodeFormData onNext={onValidateMixnodeData} mixnodeData={mixnodeData} />
-      </>
-    )}
-    {step === 2 && (
-      <AmountFormData
-        denom={denom}
-        amountData={amountData}
-        hasVestingTokens={hasVestingTokens}
-        onNext={onValidateAmountData}
-      />
-    )}
-  </>
-);

nym-wallet/src/components/Bonding/forms/gatewayValidationSchema.ts

@@ -1,59 +0,0 @@
-import * as Yup from 'yup';
-import {
-  isValidHostname,
-  validateAmount,
-  validateKey,
-  validateLocation,
-  validateRawPort,
-  validateVersion,
-} from 'src/utils';
-
-export const gatewayValidationSchema = Yup.object().shape({
-  identityKey: Yup.string()
-    .required('An indentity key is required')
-    .test('valid-id-key', 'A valid identity key is required', (value) => validateKey(value || '', 32)),
-
-  sphinxKey: Yup.string()
-    .required('A sphinx key is required')
-    .test('valid-sphinx-key', 'A valid sphinx key is required', (value) => validateKey(value || '', 32)),
-
-  ownerSignature: Yup.string()
-    .required('Signature is required')
-    .test('valid-signature', 'A valid signature is required', (value) => validateKey(value || '', 64)),
-
-  host: Yup.string()
-    .required('A host is required')
-    .test('valid-host', 'A valid host is required', (value) => (value ? isValidHostname(value) : false)),
-
-  version: Yup.string()
-    .required('A version is required')
-    .test('valid-version', 'A valid version is required', (value) => (value ? validateVersion(value) : false)),
-
-  location: Yup.string()
-    .required('A location is required')
-    .test('valid-location', 'A valid version is required', (locationValueTest) =>
-      locationValueTest ? validateLocation(locationValueTest) : false,
-    ),
-
-  mixPort: Yup.number()
-    .required('A mixport is required')
-    .test('valid-mixport', 'A valid mixport is required', (value) => (value ? validateRawPort(value) : false)),
-
-  clientsPort: Yup.number()
-    .required('A clients port is required')
-    .test('valid-clients', 'A valid clients port is required', (value) => (value ? validateRawPort(value) : false)),
-});
-
-export const amountSchema = Yup.object().shape({
-  amount: Yup.object().shape({
-    amount: Yup.string()
-      .required('An amount is required')
-      .test('valid-amount', 'Pledge error', async function isValidAmount(this, value) {
-        const isValid = await validateAmount(value || '', '100');
-        if (!isValid) {
-          return this.createError({ message: 'A valid amount is required (min 100)' });
-        }
-        return true;
-      }),
-  }),
-});

nym-wallet/src/components/Bonding/forms/mixnodeValidationSchema.ts

@@ -1,51 +0,0 @@
-import * as Yup from 'yup';
-import { isValidHostname, validateAmount, validateKey, validateRawPort, validateVersion } from 'src/utils';
-
-export const mixnodeValidationSchema = Yup.object().shape({
-  identityKey: Yup.string()
-    .required('An identity key is required')
-    .test('valid-id-key', 'A valid identity key is required', (value) => validateKey(value || '', 32)),
-
-  sphinxKey: Yup.string()
-    .required('A sphinx key is required')
-    .test('valid-sphinx-key', 'A valid sphinx key is required', (value) => validateKey(value || '', 32)),
-
-  ownerSignature: Yup.string()
-    .required('Signature is required')
-    .test('valid-signature', 'A valid signature is required', (value) => validateKey(value || '', 64)),
-
-  host: Yup.string()
-    .required('A host is required')
-    .test('valid-host', 'A valid host is required', (value) => (value ? isValidHostname(value) : false)),
-
-  version: Yup.string()
-    .required('A version is required')
-    .test('valid-version', 'A valid version is required', (value) => (value ? validateVersion(value) : false)),
-
-  mixPort: Yup.number()
-    .required('A mixport is required')
-    .test('valid-mixport', 'A valid mixport is required', (value) => (value ? validateRawPort(value) : false)),
-
-  verlocPort: Yup.number()
-    .required('A verloc port is required')
-    .test('valid-verloc', 'A valid verloc port is required', (value) => (value ? validateRawPort(value) : false)),
-
-  httpApiPort: Yup.number()
-    .required('A http-api port is required')
-    .test('valid-http', 'A valid http-api port is required', (value) => (value ? validateRawPort(value) : false)),
-});
-
-export const amountSchema = Yup.object().shape({
-  amount: Yup.object().shape({
-    amount: Yup.string()
-      .required('An amount is required')
-      .test('valid-amount', 'Pledge error', async function isValidAmount(this, value) {
-        const isValid = await validateAmount(value || '', '100');
-        if (!isValid) {
-          return this.createError({ message: 'A valid amount is required (min 100)' });
-        }
-        return true;
-      }),
-  }),
-  profitMargin: Yup.number().required('Profit Percentage is required').min(0).max(100),
-});

nym-wallet/src/components/Bonding/modals/BondGatewayModal.tsx

@@ -1,161 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Box } from '@mui/material';
-import { CurrencyDenom, TNodeType } from '@nymproject/types';
-import { ConfirmTx } from 'src/components/ConfirmTX';
-import { ModalListItem } from 'src/components/Modals/ModalListItem';
-import { SimpleModal } from 'src/components/Modals/SimpleModal';
-import { TPoolOption } from 'src/components/TokenPoolSelector';
-import { useGetFee } from 'src/hooks/useGetFee';
-import { GatewayAmount, GatewayData } from 'src/pages/bonding/types';
-import { simulateBondGateway, simulateVestingBondGateway } from 'src/requests';
-import { TBondGatewayArgs } from 'src/types';
-import { BondGatewayForm } from '../forms/BondGatewayForm';
-
-const defaultMixnodeValues: GatewayData = {
-  identityKey: '',
-  sphinxKey: '',
-  ownerSignature: '',
-  location: '',
-  host: '',
-  version: '',
-  mixPort: 1789,
-  clientsPort: 1790,
-};
-
-const defaultAmountValues = (denom: CurrencyDenom) => ({
-  amount: { amount: '100', denom },
-  tokenPool: 'balance',
-});
-
-export const BondGatewayModal = ({
-  denom,
-  hasVestingTokens,
-  onBondGateway,
-  onSelectNodeType,
-  onClose,
-  onError,
-}: {
-  denom: CurrencyDenom;
-  hasVestingTokens: boolean;
-  onBondGateway: (data: TBondGatewayArgs, tokenPool: TPoolOption) => void;
-  onSelectNodeType: (type: TNodeType) => void;
-  onClose: () => void;
-  onError: (e: string) => void;
-}) => {
-  const [step, setStep] = useState<1 | 2 | 3>(1);
-  const [gatewayData, setGatewayData] = useState<GatewayData>(defaultMixnodeValues);
-  const [amountData, setAmountData] = useState<GatewayAmount>(defaultAmountValues(denom));
-
-  const { fee, getFee, resetFeeState, feeError } = useGetFee();
-
-  useEffect(() => {
-    if (feeError) {
-      onError(feeError);
-    }
-  }, [feeError]);
-
-  const validateStep = async (s: number) => {
-    const event = new CustomEvent('validate_bond_gateway_step', { detail: { step: s } });
-    window.dispatchEvent(event);
-  };
-
-  const handleBack = () => {
-    setStep(1);
-  };
-
-  const handleUpdateGatwayData = (data: GatewayData) => {
-    setGatewayData(data);
-    setStep(2);
-  };
-
-  const handleUpdateAmountData = async (data: GatewayAmount) => {
-    setAmountData(data);
-    const payload = {
-      pledge: data.amount,
-      ownerSignature: gatewayData.ownerSignature,
-      gateway: {
-        ...gatewayData,
-        host: gatewayData.host,
-        version: gatewayData.version,
-        mix_port: gatewayData.mixPort,
-        clients_port: gatewayData.clientsPort,
-        sphinx_key: gatewayData.sphinxKey,
-        identity_key: gatewayData.identityKey,
-        location: gatewayData.location,
-      },
-    };
-
-    if (data.tokenPool === 'balance') {
-      await getFee<TBondGatewayArgs>(simulateBondGateway, payload);
-    } else {
-      await getFee<TBondGatewayArgs>(simulateVestingBondGateway, payload);
-    }
-  };
-
-  const handleConfirm = async () => {
-    await onBondGateway(
-      {
-        pledge: amountData.amount,
-        ownerSignature: gatewayData.ownerSignature,
-        gateway: {
-          ...gatewayData,
-          host: gatewayData.host,
-          version: gatewayData.version,
-          mix_port: gatewayData.mixPort,
-          clients_port: gatewayData.clientsPort,
-          sphinx_key: gatewayData.sphinxKey,
-          identity_key: gatewayData.identityKey,
-          location: gatewayData.location,
-        },
-      },
-      amountData.tokenPool as TPoolOption,
-    );
-  };
-
-  if (fee) {
-    return (
-      <ConfirmTx
-        open
-        header="Bond details"
-        fee={fee}
-        onClose={onClose}
-        onPrev={resetFeeState}
-        onConfirm={handleConfirm}
-      >
-        <ModalListItem label="Node identity key" value={gatewayData.identityKey} divider />
-        <ModalListItem
-          label="Amount"
-          value={`${amountData.amount.amount} ${amountData.amount.denom.toUpperCase()}`}
-          divider
-        />
-      </ConfirmTx>
-    );
-  }
-
-  return (
-    <SimpleModal
-      open
-      onOk={async () => {
-        await validateStep(step);
-      }}
-      onBack={step === 2 ? handleBack : undefined}
-      onClose={onClose}
-      header="Bond gateway"
-      subHeader={`Step ${step}/2`}
-      okLabel="Next"
-    >
-      <Box sx={{ mb: 2 }}>
-        <BondGatewayForm
-          step={step}
-          denom={denom}
-          gatewayData={gatewayData}
-          amountData={amountData}
-          hasVestingTokens={hasVestingTokens}
-          onValidateGatewayData={handleUpdateGatwayData}
-          onValidateAmountData={handleUpdateAmountData}
-          onSelectNodeType={onSelectNodeType}
-        />
-      </Box>
-    </SimpleModal>
-  );
-};

nym-wallet/src/components/Bonding/modals/BondMixnodeModal.tsx

@@ -1,160 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Box } from '@mui/material';
-import { CurrencyDenom, TNodeType } from '@nymproject/types';
-import { ConfirmTx } from 'src/components/ConfirmTX';
-import { ModalListItem } from 'src/components/Modals/ModalListItem';
-import { SimpleModal } from 'src/components/Modals/SimpleModal';
-import { TPoolOption } from 'src/components/TokenPoolSelector';
-import { useGetFee } from 'src/hooks/useGetFee';
-import { MixnodeAmount, MixnodeData } from 'src/pages/bonding/types';
-import { simulateBondMixnode, simulateVestingBondMixnode } from 'src/requests';
-import { TBondMixNodeArgs } from 'src/types';
-import { BondMixnodeForm } from '../forms/BondMixnodeForm';
-
-const defaultMixnodeValues: MixnodeData = {
-  identityKey: '',
-  sphinxKey: '',
-  ownerSignature: '',
-  host: '',
-  version: '',
-  mixPort: 1789,
-  verlocPort: 1790,
-  httpApiPort: 8000,
-};
-
-const defaultAmountValues = (denom: CurrencyDenom) => ({
-  amount: { amount: '100', denom },
-  profitMargin: 10,
-  tokenPool: 'balance',
-});
-
-export const BondMixnodeModal = ({
-  denom,
-  hasVestingTokens,
-  onBondMixnode,
-  onSelectNodeType,
-  onClose,
-  onError,
-}: {
-  denom: CurrencyDenom;
-  hasVestingTokens: boolean;
-  onBondMixnode: (data: TBondMixNodeArgs, tokenPool: TPoolOption) => void;
-  onSelectNodeType: (type: TNodeType) => void;
-  onClose: () => void;
-  onError: (e: string) => void;
-}) => {
-  const [step, setStep] = useState<1 | 2 | 3>(1);
-  const [mixnodeData, setMixnodeData] = useState<MixnodeData>(defaultMixnodeValues);
-  const [amountData, setAmountData] = useState<MixnodeAmount>(defaultAmountValues(denom));
-
-  const { fee, getFee, resetFeeState, feeError } = useGetFee();
-
-  useEffect(() => {
-    if (feeError) {
-      onError(feeError);
-    }
-  }, [feeError]);
-
-  const validateStep = async (s: number) => {
-    const event = new CustomEvent('validate_bond_mixnode_step', { detail: { step: s } });
-    window.dispatchEvent(event);
-  };
-
-  const handleBack = () => {
-    setStep(1);
-  };
-
-  const handleUpdateMixnodeData = (data: MixnodeData) => {
-    setMixnodeData(data);
-    setStep(2);
-  };
-
-  const handleUpdateAmountData = async (data: MixnodeAmount) => {
-    setAmountData(data);
-    const payload = {
-      pledge: data.amount,
-      ownerSignature: mixnodeData.ownerSignature,
-      mixnode: {
-        ...mixnodeData,
-        mix_port: mixnodeData.mixPort,
-        http_api_port: mixnodeData.httpApiPort,
-        verloc_port: mixnodeData.verlocPort,
-        sphinx_key: mixnodeData.sphinxKey,
-        identity_key: mixnodeData.identityKey,
-        profit_margin_percent: data.profitMargin,
-      },
-    };
-
-    if (data.tokenPool === 'balance') {
-      await getFee<TBondMixNodeArgs>(simulateBondMixnode, payload);
-    } else {
-      await getFee<TBondMixNodeArgs>(simulateVestingBondMixnode, payload);
-    }
-  };
-
-  const handleConfirm = async () => {
-    await onBondMixnode(
-      {
-        pledge: amountData.amount,
-        ownerSignature: mixnodeData.ownerSignature,
-        mixnode: {
-          ...mixnodeData,
-          mix_port: mixnodeData.mixPort,
-          http_api_port: mixnodeData.httpApiPort,
-          verloc_port: mixnodeData.verlocPort,
-          sphinx_key: mixnodeData.sphinxKey,
-          identity_key: mixnodeData.identityKey,
-          profit_margin_percent: amountData.profitMargin,
-        },
-      },
-      amountData.tokenPool as TPoolOption,
-    );
-  };
-
-  if (fee) {
-    return (
-      <ConfirmTx
-        open
-        header="Bond details"
-        fee={fee}
-        onClose={onClose}
-        onPrev={resetFeeState}
-        onConfirm={handleConfirm}
-      >
-        <ModalListItem label="Node identity key" value={mixnodeData.identityKey} divider />
-        <ModalListItem
-          label="Amount"
-          value={`${amountData.amount.amount} ${amountData.amount.denom.toUpperCase()}`}
-          divider
-        />
-      </ConfirmTx>
-    );
-  }
-
-  return (
-    <SimpleModal
-      open
-      onOk={async () => {
-        await validateStep(step);
-      }}
-      onBack={step === 2 ? handleBack : undefined}
-      onClose={onClose}
-      header="Bond mixnode"
-      subHeader={`Step ${step}/2`}
-      okLabel="Next"
-    >
-      <Box sx={{ mb: 2 }}>
-        <BondMixnodeForm
-          step={step}
-          denom={denom}
-          mixnodeData={mixnodeData}
-          amountData={amountData}
-          hasVestingTokens={hasVestingTokens}
-          onValidateMixnodeData={handleUpdateMixnodeData}
-          onValidateAmountData={handleUpdateAmountData}
-          onSelectNodeType={onSelectNodeType}
-        />
-      </Box>
-    </SimpleModal>
-  );
-};

nym-wallet/src/components/Bonding/modals/BondMoreModal.tsx

@@ -1,115 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Box, FormHelperText, Stack, TextField } from '@mui/material';
-import { CurrencyFormField } from '@nymproject/react/currency/CurrencyFormField';
-import { ModalListItem } from 'src/components/Modals/ModalListItem';
-import { SimpleModal } from 'src/components/Modals/SimpleModal';
-import { DecCoin } from '@nymproject/types';
-import { TokenPoolSelector, TPoolOption } from 'src/components/TokenPoolSelector';
-import { ConfirmTx } from 'src/components/ConfirmTX';
-import { useGetFee } from 'src/hooks/useGetFee';
-import { validateAmount, validateKey } from 'src/utils';
-
-export const BondMoreModal = ({
-  currentBond,
-  userBalance,
-  hasVestingTokens,
-  onConfirm,
-  onClose,
-}: {
-  currentBond: DecCoin;
-  userBalance?: string;
-  hasVestingTokens: boolean;
-  onConfirm: (args: { additionalBond: DecCoin; signature: string; tokenPool: TPoolOption }) => Promise<void>;
-  onClose: () => void;
-}) => {
-  const { fee, resetFeeState } = useGetFee();
-  const [additionalBond, setAdditionalBond] = useState<DecCoin>({ amount: '0', denom: currentBond.denom });
-  const [signature, setSignature] = useState<string>('');
-  const [tokenPool, setTokenPool] = useState<TPoolOption>('balance');
-  const [errorAmount, setErrorAmount] = useState(false);
-  const [errorSignature, setErrorSignature] = useState(false);
-
-  const handleOnOk = async () => {
-    const errors = {
-      amount: false,
-      signature: false,
-    };
-
-    if (!validateKey(signature || '', 64)) {
-      errors.signature = true;
-    }
-
-    if (!additionalBond?.amount) {
-      errors.amount = true;
-    }
-
-    if (additionalBond && !(await validateAmount(additionalBond.amount, '1'))) {
-      errors.amount = true;
-    }
-
-    if (!errors.amount && !errors.signature) {
-      onConfirm({ additionalBond, signature, tokenPool });
-    } else {
-      setErrorAmount(errors.amount);
-      setErrorSignature(errors.signature);
-    }
-  };
-
-  useEffect(() => {
-    setErrorAmount(false);
-  }, [additionalBond]);
-
-  if (fee)
-    return (
-      <ConfirmTx
-        header="Bond more details"
-        open
-        fee={fee}
-        onConfirm={async () => onConfirm({ additionalBond, signature, tokenPool })}
-        onPrev={resetFeeState}
-      >
-        <ModalListItem label="Current bond" value={`${currentBond.amount} ${currentBond.denom}`} divider />
-        <ModalListItem label="Additional bond" value={`${additionalBond?.amount} ${additionalBond?.denom}`} divider />
-      </ConfirmTx>
-    );
-
-  return (
-    <SimpleModal
-      open
-      header="Bond more"
-      subHeader="Bond more tokens on your node and receive more rewards"
-      okLabel="Next"
-      onOk={handleOnOk}
-      okDisabled={errorAmount || errorSignature}
-      onClose={onClose}
-    >
-      <Stack gap={2}>
-        <Box display="flex" gap={1}>
-          {hasVestingTokens && <TokenPoolSelector disabled={false} onSelect={(pool) => setTokenPool(pool)} />}
-          <CurrencyFormField
-            autoFocus
-            label="Bond amount"
-            denom={currentBond.denom}
-            onChanged={(value) => {
-              setAdditionalBond(value);
-              setErrorSignature(false);
-            }}
-            fullWidth
-            validationError={errorAmount ? 'Please enter a valid amount' : undefined}
-          />
-        </Box>
-
-        <Box>
-          <TextField fullWidth label="Signature" value={signature} onChange={(e) => setSignature(e.target.value)} />
-          {errorSignature && <FormHelperText sx={{ color: 'error.main' }}>Invalid signature</FormHelperText>}
-        </Box>
-
-        <Box>
-          <ModalListItem label="Account balance" value={userBalance?.toUpperCase() || '-'} divider />
-          <ModalListItem label="Current bond" value={`${currentBond.amount} ${currentBond.denom}`} divider />
-          <ModalListItem label="Est. fee for this operation will be calculated in the next page" value="" divider />
-        </Box>
-      </Stack>
-    </SimpleModal>
-  );
-};

nym-wallet/src/components/Bonding/modals/CompoundRewardsModal.tsx

@@ -1,55 +0,0 @@
-import React, { useEffect } from 'react';
-import { FeeDetails } from '@nymproject/types';
-import { ModalFee } from 'src/components/Modals/ModalFee';
-import { ModalListItem } from 'src/components/Modals/ModalListItem';
-import { SimpleModal } from 'src/components/Modals/SimpleModal';
-import { TBondedMixnode } from 'src/context';
-import { useGetFee } from 'src/hooks/useGetFee';
-import { simulateCompoundOperatorReward, simulateVestingCompoundOperatorReward } from 'src/requests';
-
-export const CompoundRewardsModal = ({
-  node,
-  onConfirm,
-  onClose,
-  onError,
-}: {
-  node: TBondedMixnode;
-  onClose: () => void;
-  onConfirm: (fee?: FeeDetails) => void;
-  onError: (err: string) => void;
-}) => {
-  const { fee, getFee, feeError, isFeeLoading } = useGetFee();
-
-  useEffect(() => {
-    if (feeError) onError(feeError);
-  }, [feeError]);
-
-  useEffect(() => {
-    if (node.proxy) getFee(simulateVestingCompoundOperatorReward, {});
-    else getFee(simulateCompoundOperatorReward, {});
-  }, []);
-
-  const handleOnOK = async () => onConfirm(fee);
-
-  return (
-    <SimpleModal
-      open
-      header="Compound rewards"
-      subHeader="Get more rewards by compounding"
-      okLabel="Compound"
-      okDisabled={isFeeLoading}
-      onOk={handleOnOK}
-      onClose={onClose}
-    >
-      <ModalListItem
-        label="Rewards to redeem"
-        value={
-          node.operatorRewards ? `${node.operatorRewards.amount} ${node.operatorRewards.denom.toUpperCase()}` : '-'
-        }
-        divider
-      />
-      <ModalFee fee={fee} isLoading={isFeeLoading} divider />
-      <ModalListItem label="Rewards will be transferred to the account you are logged in with" value="" />
-    </SimpleModal>
-  );
-};

nym-wallet/src/components/Bonding/modals/ConfirmationModal.tsx

@@ -1,52 +0,0 @@
-import React from 'react';
-import { Stack, Typography, SxProps } from '@mui/material';
-import { Link } from '@nymproject/react/link/Link';
-import { ConfirmationModal } from 'src/components/Modals/ConfirmationModal';
-import { ErrorModal } from 'src/components/Modals/ErrorModal';
-
-export type ConfirmationDetailProps = {
-  status: 'success' | 'error';
-  title: string;
-  subtitle?: string;
-  txUrl?: string;
-};
-
-export const ConfirmationDetailsModal = ({
-  title,
-  subtitle,
-  txUrl,
-  status,
-  onClose,
-  sx,
-  backdropProps,
-}: ConfirmationDetailProps & {
-  onClose: () => void;
-  sx?: SxProps;
-  backdropProps?: object;
-}) => {
-  if (status === 'error') {
-    <ErrorModal open message={subtitle} onClose={onClose} />;
-  }
-
-  return (
-    <ConfirmationModal
-      open
-      onConfirm={onClose}
-      onClose={onClose}
-      title=""
-      confirmButton="Done"
-      maxWidth="xs"
-      fullWidth
-      sx={sx}
-      backdropProps={backdropProps}
-    >
-      <Stack alignItems="center" spacing={2}>
-        <Typography variant="h6" fontWeight={600}>
-          {title}
-        </Typography>
-        <Typography>{subtitle}</Typography>
-        {txUrl && <Link href={txUrl} target="_blank" sx={{ ml: 1 }} text="View on blockchain" />}
-      </Stack>
-    </ConfirmationModal>
-  );
-};

nym-wallet/src/components/Bonding/modals/NodeSettingsModal.tsx

@@ -1,128 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Box, Button, FormHelperText, TextField, Typography } from '@mui/material';
-import { SimpleModal } from 'src/components/Modals/SimpleModal';
-import { Node as NodeIcon } from 'src/svg-icons/node';
-import { TBondedMixnode } from 'src/context';
-import { Tabs } from 'src/components/Tabs';
-import { ModalListItem } from 'src/components/Modals/ModalListItem';
-import { isDecimal } from 'src/utils';
-import { useGetFee } from 'src/hooks/useGetFee';
-import { ConfirmTx } from 'src/components/ConfirmTX';
-import { simulateUpdateMixnode, simulateVestingUpdateMixnode } from 'src/requests';
-import { LoadingModal } from 'src/components/Modals/LoadingModal';
-import { FeeDetails } from '@nymproject/types';
-
-export const NodeSettings = ({
-  currentPm,
-  isVesting,
-  onConfirm,
-  onClose,
-  onError,
-}: {
-  currentPm: TBondedMixnode['profitMargin'];
-  isVesting: boolean;
-  onConfirm: (profitMargin: number, fee?: FeeDetails) => Promise<void>;
-  onClose: () => void;
-  onError: (err: string) => void;
-}) => {
-  const [pm, setPm] = useState(currentPm.toString());
-  const [error, setError] = useState(false);
-
-  const { fee, getFee, resetFeeState, isFeeLoading, feeError } = useGetFee();
-
-  const handleValidate = async () => {
-    let isValid = true;
-    const pmAsNumber = Number(pm);
-
-    if (!pmAsNumber) {
-      isValid = false;
-    }
-    if (isDecimal(pmAsNumber)) {
-      isValid = false;
-    }
-    if (pmAsNumber > 100) {
-      isValid = false;
-    }
-    if (pmAsNumber < 0) {
-      isValid = false;
-    }
-
-    if (!isValid) {
-      setError(true);
-      return;
-    }
-
-    if (isVesting) {
-      await getFee(simulateVestingUpdateMixnode, { profitMarginPercent: pmAsNumber });
-    } else {
-      await getFee(simulateUpdateMixnode, { profitMarginPercent: pmAsNumber });
-    }
-  };
-
-  useEffect(() => {
-    setError(false);
-  }, [pm]);
-
-  useEffect(() => {
-    if (feeError) {
-      onError(feeError);
-    }
-  }, [feeError]);
-
-  if (isFeeLoading) return <LoadingModal />;
-
-  if (fee)
-    return (
-      <ConfirmTx
-        open
-        header="Profit margin change"
-        fee={fee}
-        onPrev={resetFeeState}
-        onClose={onClose}
-        onConfirm={() => onConfirm(Number(pm), fee)}
-      >
-        <ModalListItem label="Current profit margin" value={`${currentPm}%`} divider />
-        <ModalListItem label="New profit margin" value={`${pm}%`} divider />
-      </ConfirmTx>
-    );
-
-  return (
-    <SimpleModal
-      open
-      hideCloseIcon
-      sx={{ p: 0 }}
-      header={
-        <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, p: 3 }}>
-          <NodeIcon />
-          <Typography variant="h6" fontWeight={600}>
-            Node Settings
-          </Typography>
-        </Box>
-      }
-      okLabel="Next"
-      onClose={onClose}
-    >
-      <Tabs tabs={['System variables']} selectedTab={0} disableActiveTabHighlight />
-      <Box sx={{ p: 3 }}>
-        <Typography fontWeight={600} sx={{ mb: 1 }}>
-          Set profit margin
-        </Typography>
-        <Box sx={{ mb: 3 }}>
-          <TextField placeholder="Profit margin" value={pm} onChange={(e) => setPm(e.target.value)} fullWidth />
-          {error && (
-            <FormHelperText sx={{ color: 'error.main' }}>
-              Profit margin should be a whole number between 0 and 100
-            </FormHelperText>
-          )}
-          <FormHelperText>Your new profit margin will be applied in the next epoch</FormHelperText>
-        </Box>
-        <Box sx={{ mb: 3 }}>
-          <ModalListItem label="Est. fee for this operation will be caculated in the next page" value="" />
-        </Box>
-        <Button variant="contained" fullWidth size="large" onClick={handleValidate} disabled={error}>
-          Next
-        </Button>
-      </Box>
-    </SimpleModal>
-  );
-};

nym-wallet/src/components/Bonding/modals/RedeemRewardsModal.tsx

@@ -1,55 +0,0 @@
-import React, { useEffect } from 'react';
-import { FeeDetails } from '@nymproject/types';
-import { ModalListItem } from 'src/components/Modals/ModalListItem';
-import { SimpleModal } from 'src/components/Modals/SimpleModal';
-import { ModalFee } from 'src/components/Modals/ModalFee';
-import { useGetFee } from 'src/hooks/useGetFee';
-import { simulateClaimOperatorReward, simulateVestingClaimOperatorReward } from 'src/requests';
-import { TBondedMixnode } from 'src/context';
-
-export const RedeemRewardsModal = ({
-  node,
-  onConfirm,
-  onError,
-  onClose,
-}: {
-  node: TBondedMixnode;
-  onConfirm: (fee?: FeeDetails) => Promise<void>;
-  onError: (err: string) => void;
-  onClose: () => void;
-}) => {
-  const { fee, getFee, isFeeLoading, feeError } = useGetFee();
-
-  useEffect(() => {
-    if (feeError) onError(feeError);
-  }, [feeError]);
-
-  useEffect(() => {
-    if (node.proxy) getFee(simulateVestingClaimOperatorReward, {});
-    else getFee(simulateClaimOperatorReward, {});
-  }, []);
-
-  const handleOnOK = async () => onConfirm(fee);
-
-  return (
-    <SimpleModal
-      open
-      header="Redeem rewards"
-      subHeader="Claim you rewards"
-      okLabel="Redeem"
-      okDisabled={isFeeLoading}
-      onOk={handleOnOK}
-      onClose={onClose}
-    >
-      <ModalListItem
-        label="Rewards to redeem"
-        value={
-          node.operatorRewards ? `${node.operatorRewards.amount} ${node.operatorRewards.denom.toUpperCase()}` : '-'
-        }
-        divider
-      />
-      <ModalFee fee={fee} isLoading={isFeeLoading} divider />
-      <ModalListItem label="Rewards will be transferred to the account you are logged in with" value="" />
-    </SimpleModal>
-  );
-};

nym-wallet/src/components/Bonding/modals/UnbondModal.tsx

@@ -1,74 +0,0 @@
-import * as React from 'react';
-import { Typography } from '@mui/material';
-import { useEffect } from 'react';
-import { TBondedGateway, TBondedMixnode } from 'src/context';
-import { useGetFee } from 'src/hooks/useGetFee';
-import { isGateway, isMixnode } from 'src/types';
-import { ModalFee } from '../../Modals/ModalFee';
-import { ModalListItem } from '../../Modals/ModalListItem';
-import { SimpleModal } from '../../Modals/SimpleModal';
-import {
-  simulateUnbondGateway,
-  simulateUnbondMixnode,
-  simulateVestingUnbondGateway,
-  simulateVestingUnbondMixnode,
-} from '../../../requests';
-
-interface Props {
-  node: TBondedMixnode | TBondedGateway;
-  onConfirm: () => Promise<void>;
-  onClose: () => void;
-  onError: (e: string) => void;
-}
-
-export const UnbondModal = ({ node, onConfirm, onClose, onError }: Props) => {
-  const { fee, isFeeLoading, getFee, feeError } = useGetFee();
-
-  useEffect(() => {
-    if (feeError) {
-      onError(feeError);
-    }
-  }, [feeError]);
-
-  useEffect(() => {
-    if (isMixnode(node) && !node.proxy) {
-      getFee(simulateUnbondMixnode, {});
-    }
-
-    if (isMixnode(node) && node.proxy) {
-      getFee(simulateVestingUnbondMixnode, {});
-    }
-
-    if (isGateway(node) && !node.proxy) {
-      getFee(simulateUnbondGateway, {});
-    }
-
-    if (isGateway(node) && node.proxy) {
-      getFee(simulateVestingUnbondGateway, {});
-    }
-  }, [node]);
-
-  return (
-    <SimpleModal
-      open
-      header="Unbond"
-      subHeader="Unbond and remove your node from the mixnet"
-      okLabel="Unbond"
-      onOk={onConfirm}
-      onClose={onClose}
-    >
-      <ModalListItem label="Amount to unbond" value={`${node.bond.amount} ${node.bond.denom.toUpperCase()}`} divider />
-      {isMixnode(node) && (
-        <ModalListItem
-          label="Operator rewards"
-          value={
-            node.operatorRewards ? `${node.operatorRewards.amount} ${node.operatorRewards.denom.toUpperCase()}` : '-'
-          }
-          divider
-        />
-      )}
-      <ModalFee isLoading={isFeeLoading} fee={fee} divider />
-      <Typography fontSize="small">Tokens will be transferred to the account you are logged in with now</Typography>
-    </SimpleModal>
-  );
-};

nym-wallet/src/components/ClientAddress.tsx

@@ -28,7 +28,7 @@ type ClientAddressProps = {
   showEntireAddress?: boolean;
 };
 
-export const ClientAddressDisplay: FC<ClientAddressProps & { address?: string } > = ({
+export const ClientAddressDisplay: FC<ClientAddressProps & { address?: string }> = ({
   withLabel,
   withCopy,
   showEntireAddress,
@@ -44,7 +44,7 @@ export const ClientAddressDisplay: FC<ClientAddressProps & { address?: string }
     )}
 
     <AddressTooltip address={address} visible={!showEntireAddress}>
-      <Typography data-testid="accountNumber" variant="body2" component="span" sx={{ mr: 1, color: 'text.primary', fontWeight: 400 }}>
+      <Typography variant="body2" component="span" sx={{ mr: 1, color: 'text.primary', fontWeight: 400 }}>
         {showEntireAddress ? address || '' : splice(6, address)}
       </Typography>
     </AddressTooltip>

nym-wallet/src/components/ConfirmPassword.tsx

@@ -2,19 +2,16 @@ import React, { useEffect, useState } from 'react';
 import { Button, CircularProgress, DialogActions, DialogContent, Typography } from '@mui/material';
 import { useKeyPress } from 'src/hooks/useKeyPress';
 import { PasswordInput } from './textfields';
-import { StyledBackButton } from './StyledBackButton';
 
 export const ConfirmPassword = ({
   error,
   isLoading,
   onConfirm,
-  onCancel,
   buttonTitle,
 }: {
   error?: string;
   isLoading?: boolean;
   buttonTitle: string;
-  onCancel?: () => void;
   onConfirm: (password: string) => void;
 }) => {
   const [value, setValue] = useState('');
@@ -42,8 +39,7 @@ export const ConfirmPassword = ({
           disabled={isLoading}
         />
       </DialogContent>
-      <DialogActions sx={{ p: 3, pt: 0, gap: 2 }}>
-        {onCancel && <StyledBackButton onBack={onCancel} />}
+      <DialogActions sx={{ p: 3, pt: 0 }}>
         <Button
           disabled={!value.length || isLoading}
           fullWidth

nym-wallet/src/components/ConfirmTX.stories.tsx

@@ -10,9 +10,9 @@ export default {
 
 const Template: ComponentStory<typeof ConfirmTx> = (args) => (
   <ConfirmTx {...args}>
-    <ModalListItem label="Transaction type:" value="Bond" divider />
-    <ModalListItem label="Current bond:" value="100 NYM" divider />
-    <ModalListItem label="Additional bond:" value="50 NYM" divider />
+    <ModalListItem label="Transaction type" value="Bond" divider />
+    <ModalListItem label="Current bond" value="100 NYM" divider />
+    <ModalListItem label="Additional bond" value="50 NYM" divider />
   </ConfirmTx>
 );
 

nym-wallet/src/components/CopyToClipboard.tsx

@@ -36,9 +36,7 @@ export const CopyToClipboard = ({ text = '', iconButton }: { text?: string; icon
             color: 'text.primary',
           }}
         >
-          {!copied ? <ContentCopy sx={{ fontSize: 14 }} /> : <Check color="success" sx={{ fontSize: 14 }} />}
-          {!copied ? <ContentCopy data-testid="copyIcon"
-            fontSize="small" /> : <Check color="success" />}
+          {!copied ? <ContentCopy fontSize="small" /> : <Check color="success" />}
         </IconButton>
       </Tooltip>
     );

nym-wallet/src/components/Delegation/DelegateModal.tsx

@@ -13,13 +13,12 @@ import { TokenPoolSelector, TPoolOption } from '../TokenPoolSelector';
 import { ConfirmTx } from '../ConfirmTX';
 
 import { getMixnodeStakeSaturation } from '../../requests';
-import { ErrorModal } from '../Modals/ErrorModal';
 
 const MIN_AMOUNT_TO_DELEGATE = 10;
 
 export const DelegateModal: React.FC<{
   open: boolean;
-  onClose: () => void;
+  onClose?: () => void;
   onOk?: (identityKey: string, amount: DecCoin, tokenPool: TPoolOption, fee?: FeeDetails) => Promise<void>;
   identityKey?: string;
   onIdentityKeyChanged?: (identityKey: string) => void;
@@ -63,7 +62,7 @@ export const DelegateModal: React.FC<{
   const [tokenPool, setTokenPool] = useState<TPoolOption>('balance');
   const [errorIdentityKey, setErrorIdentityKey] = useState<string>();
 
-  const { fee, getFee, resetFeeState, feeError } = useGetFee();
+  const { fee, getFee, resetFeeState } = useGetFee();
 
   const handleCheckStakeSaturation = async (identity: string) => {
     try {
@@ -169,24 +168,12 @@ export const DelegateModal: React.FC<{
         onPrev={resetFeeState}
         onConfirm={handleOk}
       >
-        <ModalListItem label="Node identity key:" value={identityKey} divider />
-        <ModalListItem label="Amount:" value={`${amount} ${denom.toUpperCase()}`} divider />
+        <ModalListItem label="Node identity key" value={identityKey} divider />
+        <ModalListItem label="Amount" value={`${amount} ${denom.toUpperCase()}`} divider />
       </ConfirmTx>
     );
   }
 
-  if (feeError) {
-    return (
-      <ErrorModal
-        title="Something went wrong while calculating fee. Are you sure you entered a valid node address?"
-        message={feeError}
-        sx={sx}
-        open={open}
-        onClose={onClose}
-      />
-    );
-  }
-
   return (
     <SimpleModal
       open={open}
@@ -197,24 +184,23 @@ export const DelegateModal: React.FC<{
         }
       }}
       header={header || 'Delegate'}
+      subHeader="Delegate to mixnode"
       okLabel={buttonText || 'Delegate stake'}
       okDisabled={!isValidated}
       sx={sx}
       backdropProps={backdropProps}
     >
-      <Box sx={{ mt: 2 }}>
-        <IdentityKeyFormField
-          required
-          fullWidth
-          label="Node identity key"
-          onChanged={handleIdentityKeyChanged}
-          initialValue={identityKey}
-          readOnly={Boolean(initialIdentityKey)}
-          textFieldProps={{
-            autoFocus: !initialIdentityKey,
-          }}
-        />
-      </Box>
+      <IdentityKeyFormField
+        required
+        fullWidth
+        placeholder="Node identity key"
+        onChanged={handleIdentityKeyChanged}
+        initialValue={identityKey}
+        readOnly={Boolean(initialIdentityKey)}
+        textFieldProps={{
+          autoFocus: !initialIdentityKey,
+        }}
+      />
       <Typography
         component="div"
         textAlign="left"
@@ -228,7 +214,7 @@ export const DelegateModal: React.FC<{
         <CurrencyFormField
           required
           fullWidth
-          label="Amount"
+          placeholder="Amount"
           initialValue={amount}
           autoFocus={Boolean(initialIdentityKey)}
           onChanged={handleAmountChanged}
@@ -244,7 +230,7 @@ export const DelegateModal: React.FC<{
         {errorAmount}
       </Typography>
       <Box sx={{ mt: 3 }}>
-        <ModalListItem label="Account balance" value={accountBalance?.toUpperCase()} divider fontWeight={600} />
+        <ModalListItem label="Account balance" value={accountBalance} divider />
       </Box>
 
       <ModalListItem label="Rewards payout interval" value={rewardInterval} hidden divider />
@@ -255,7 +241,7 @@ export const DelegateModal: React.FC<{
         divider
       />
       <ModalListItem
-        label="Node avg. uptime"
+        label="Node uptime"
         value={`${nodeUptimePercentage ? `${nodeUptimePercentage}%` : '-'}`}
         hidden={nodeUptimePercentage === undefined}
         divider
@@ -267,7 +253,6 @@ export const DelegateModal: React.FC<{
         hidden
         divider
       />
-      <ModalListItem label="Est. fee for this transaction will be calculated in the next page" />
     </SimpleModal>
   );
 };

nym-wallet/src/components/Delegation/DelegationActions.tsx

@@ -1,8 +1,19 @@
-import React, { useState } from 'react';
-import { Box, Button, Stack, Tooltip, Typography } from '@mui/material';
+import React from 'react';
+import {
+  Box,
+  Button,
+  IconButton,
+  ListItemIcon,
+  ListItemText,
+  Menu,
+  MenuItem,
+  Stack,
+  Tooltip,
+  Typography,
+} from '@mui/material';
+import { MoreVertSharp } from '@mui/icons-material';
 import { DelegationEventKind } from '@nymproject/types';
 import { Delegate, Undelegate } from '../../svg-icons';
-import { ActionsMenu, ActionsMenuItem } from '../ActionsMenu';
 import { DelegateListItemPending } from './types';
 
 export type DelegationListItemActions = 'delegate' | 'undelegate' | 'redeem' | 'compound';
@@ -64,20 +75,42 @@ export const DelegationActions: React.FC<{
   );
 };
 
+const DelegationActionsMenuItem = ({
+  title,
+  description,
+  onClick,
+  Icon,
+  disabled,
+}: {
+  title: string;
+  description?: string;
+  onClick?: () => void;
+  Icon?: React.ReactNode;
+  disabled?: boolean;
+}) => (
+  <MenuItem sx={{ p: 2 }} onClick={onClick} disabled={disabled}>
+    <ListItemIcon sx={{ color: 'text.primary' }}>{Icon}</ListItemIcon>
+    <ListItemText sx={{ color: 'text.primary' }} primary={title} secondary={description} />
+  </MenuItem>
+);
+
 export const DelegationsActionsMenu: React.FC<{
   onActionClick?: (action: DelegationListItemActions) => void;
   isPending?: DelegationEventKind;
   disableRedeemingRewards?: boolean;
   disableCompoundRewards?: boolean;
 }> = ({ disableRedeemingRewards, disableCompoundRewards, onActionClick, isPending }) => {
-  const [isOpen, setIsOpen] = useState(false);
+  const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
+  const open = Boolean(anchorEl);
+  const handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+    setAnchorEl(event.currentTarget);
+  };
 
-  const handleOpenMenu = () => setIsOpen(true);
-  const handleOnClose = () => setIsOpen(false);
+  const handleClose = () => setAnchorEl(null);
 
   const handleActionSelect = (action: DelegationListItemActions) => {
+    handleClose();
     onActionClick?.(action);
-    handleOnClose();
   };
 
   if (isPending) {
@@ -93,23 +126,37 @@ export const DelegationsActionsMenu: React.FC<{
   }
 
   return (
-    <ActionsMenu open={isOpen} onOpen={handleOpenMenu} onClose={handleOnClose}>
-      <ActionsMenuItem title="Delegate more" Icon={<Delegate />} onClick={() => handleActionSelect('delegate')} />
-      <ActionsMenuItem title="Undelegate" Icon={<Undelegate />} onClick={() => handleActionSelect('undelegate')} />
-      <ActionsMenuItem
-        title="Redeem"
-        description="Transfer your rewards to your balance"
-        Icon={<Typography sx={{ pl: 1 }}>R</Typography>}
-        onClick={() => handleActionSelect('redeem')}
-        disabled={disableRedeemingRewards}
-      />
-      <ActionsMenuItem
-        title="Compound"
-        description="Add your rewards to this delegation"
-        Icon={<Typography sx={{ pl: 1 }}>C</Typography>}
-        onClick={() => handleActionSelect('compound')}
-        disabled={disableCompoundRewards}
-      />
-    </ActionsMenu>
+    <>
+      <IconButton onClick={handleClick}>
+        <MoreVertSharp />
+      </IconButton>
+      <Menu anchorEl={anchorEl} open={open} onClose={handleClose}>
+        <DelegationActionsMenuItem
+          title="Delegate more"
+          Icon={<Delegate />}
+          onClick={() => handleActionSelect?.('delegate')}
+        />
+        <DelegationActionsMenuItem
+          title="Undelegate"
+          Icon={<Undelegate />}
+          onClick={() => handleActionSelect?.('undelegate')}
+          disabled={false}
+        />
+        <DelegationActionsMenuItem
+          title="Redeem"
+          description="Transfer your rewards to your balance"
+          Icon={<Typography sx={{ pl: 1 }}>R</Typography>}
+          onClick={() => handleActionSelect?.('redeem')}
+          disabled={disableRedeemingRewards}
+        />
+        <DelegationActionsMenuItem
+          title="Compound"
+          description="Add your rewards to this delegation"
+          Icon={<Typography sx={{ pl: 1 }}>C</Typography>}
+          onClick={() => handleActionSelect?.('compound')}
+          disabled={disableCompoundRewards}
+        />
+      </Menu>
+    </>
   );
 };

nym-wallet/src/components/Delegation/DelegationList.tsx

@@ -16,13 +16,12 @@ import {
 import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
 import { visuallyHidden } from '@mui/utils';
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
-import { DelegationEvent, DelegationWithEverything } from '@nymproject/types';
+import { DelegationWithEverything } from '@nymproject/types';
 import { Link } from '@nymproject/react/link/Link';
 import { format, formatDistanceToNow, parseISO } from 'date-fns';
 import { styled } from '@mui/material/styles';
 import { tableCellClasses } from '@mui/material/TableCell';
 import { DelegationListItemActions, DelegationsActionsMenu } from './DelegationActions';
-import { DelegationWithEvent, isPendingDelegation, TDelegations } from '../../context/delegations';
 
 const StyledTooltipTableCell = styled(TableCell)(({ theme }) => ({
   [`&.${tableCellClasses.head}`]: {
@@ -72,30 +71,13 @@ function descendingComparator<T>(a: T, b: T, orderBy: keyof T) {
   return 0;
 }
 
-function sortPendingDelegation(a: DelegationWithEvent, b: DelegationWithEvent) {
-  if (isPendingDelegation(a) && isPendingDelegation(b)) return 0;
-  if (isPendingDelegation(b)) return -1;
-  if (isPendingDelegation(a)) return 1;
-  return 2;
-}
-
 function getComparator<Key extends keyof DelegationWithEverything>(
   order: Order,
   orderBy: Key,
-): (a: DelegationWithEvent, b: DelegationWithEvent) => number {
+): (a: DelegationWithEverything, b: DelegationWithEverything) => number {
   return order === 'desc'
-    ? (a, b) => {
-        const pendingSort = sortPendingDelegation(a, b);
-        if (pendingSort === 2)
-          return descendingComparator(a as DelegationWithEverything, b as DelegationWithEverything, orderBy);
-        return pendingSort;
-      }
-    : (a, b) => {
-        const pendingSort = -sortPendingDelegation(a, b);
-        if (pendingSort === 2)
-          return -descendingComparator(a as DelegationWithEverything, b as DelegationWithEverything, orderBy);
-        return pendingSort;
-      };
+    ? (a, b) => descendingComparator(a, b, orderBy)
+    : (a, b) => -descendingComparator(a, b, orderBy);
 }
 
 const EnhancedTableHead: React.FC<EnhancedTableProps> = ({ order, orderBy, onRequestSort }) => {
@@ -137,7 +119,7 @@ const EnhancedTableHead: React.FC<EnhancedTableProps> = ({ order, orderBy, onReq
 
 export const DelegationList: React.FC<{
   isLoading?: boolean;
-  items?: TDelegations;
+  items?: DelegationWithEverything[];
   onItemActionClick?: (item: DelegationWithEverything, action: DelegationListItemActions) => void;
   explorerUrl: string;
 }> = ({ isLoading, items, onItemActionClick, explorerUrl }) => {
@@ -150,15 +132,6 @@ export const DelegationList: React.FC<{
     setOrderBy(property);
   };
 
-  const getRewardValue = (item: DelegationWithEvent) => {
-    if (isPendingDelegation(item)) {
-      return '';
-    }
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { accumulated_rewards } = item;
-    return !accumulated_rewards ? '-' : `${accumulated_rewards.amount} ${accumulated_rewards.denom}`;
-  };
-
   return (
     <TableContainer>
       <Table sx={{ width: '100%' }}>
@@ -176,19 +149,12 @@ export const DelegationList: React.FC<{
                     noIcon
                   />
                 </TableCell>
+                <TableCell>{!item.avg_uptime_percent ? '-' : `${item.avg_uptime_percent}%`}</TableCell>
+                <TableCell>{!item.profit_margin_percent ? '-' : `${item.profit_margin_percent}%`}</TableCell>
                 <TableCell>
-                  {!isPendingDelegation(item) && (!item.avg_uptime_percent ? '-' : `${item.avg_uptime_percent}%`)}
-                </TableCell>
-                <TableCell>
-                  {!isPendingDelegation(item) && (!item.profit_margin_percent ? '-' : `${item.profit_margin_percent}%`)}
-                </TableCell>
-                <TableCell>
-                  {!isPendingDelegation(item) &&
-                    (!item.stake_saturation ? '-' : `${Math.round(item.stake_saturation * 100000) / 1000}%`)}
-                </TableCell>
-                <TableCell>
-                  {!isPendingDelegation(item) && format(new Date(item.delegated_on_iso_datetime), 'dd/MM/yyyy')}
+                  {!item.stake_saturation ? '-' : `${Math.round(item.stake_saturation * 100000) / 1000}%`}
                 </TableCell>
+                <TableCell>{format(new Date(item.delegated_on_iso_datetime), 'dd/MM/yyyy')}</TableCell>
                 <TableCell>
                   <Tooltip
                     placement="right"
@@ -203,65 +169,55 @@ export const DelegationList: React.FC<{
                             </TableRow>
                           </TableHead>
                           <TableBody>
-                            {!isPendingDelegation(item) &&
-                              item.history.map((historyItem) => (
-                                <TableRow key={`${historyItem.block_height}`}>
-                                  <StyledTooltipTableCell>
-                                    {formatDistanceToNow(parseISO(historyItem.delegated_on_iso_datetime), {
-                                      addSuffix: true,
-                                    })}
-                                  </StyledTooltipTableCell>
-                                  <StyledTooltipTableCell>
-                                    <Typography fontSize="inherit" noWrap>
-                                      {`${historyItem.amount.amount} ${historyItem.amount.denom}`}
-                                      {historyItem.uses_vesting_contract_tokens && (
-                                        <LockOutlinedIcon fontSize="inherit" sx={{ ml: 0.5 }} />
-                                      )}
-                                    </Typography>
-                                  </StyledTooltipTableCell>
-                                  <StyledTooltipTableCell>{historyItem.block_height}</StyledTooltipTableCell>
-                                </TableRow>
-                              ))}
+                            {item.history.map((historyItem) => (
+                              <TableRow key={`${historyItem.block_height}`}>
+                                <StyledTooltipTableCell>
+                                  {formatDistanceToNow(parseISO(historyItem.delegated_on_iso_datetime), {
+                                    addSuffix: true,
+                                  })}
+                                </StyledTooltipTableCell>
+                                <StyledTooltipTableCell>
+                                  <Typography fontSize="inherit" noWrap>
+                                    {`${historyItem.amount.amount} ${historyItem.amount.denom}`}
+                                    {historyItem.uses_vesting_contract_tokens && (
+                                      <LockOutlinedIcon fontSize="inherit" sx={{ ml: 0.5 }} />
+                                    )}
+                                  </Typography>
+                                </StyledTooltipTableCell>
+                                <StyledTooltipTableCell>{historyItem.block_height}</StyledTooltipTableCell>
+                              </TableRow>
+                            ))}
                           </TableBody>
                         </Table>
                       </TableContainer>
                     }
                     arrow
                   >
-                    <span style={{ cursor: 'pointer', textTransform: 'uppercase' }}>
-                      {!isPendingDelegation(item) && `${item.amount.amount} ${item.amount.denom}`}
-                    </span>
+                    <span
+                      style={{ cursor: 'pointer', textTransform: 'uppercase' }}
+                    >{`${item.amount.amount} ${item.amount.denom}`}</span>
                   </Tooltip>
                 </TableCell>
-                <TableCell sx={{ textTransform: 'uppercase' }}>{getRewardValue(item)}</TableCell>
+                <TableCell sx={{ textTransform: 'uppercase' }}>
+                  {!item.accumulated_rewards
+                    ? '-'
+                    : `${item.accumulated_rewards.amount} ${item.accumulated_rewards.denom}`}
+                </TableCell>
 
                 <TableCell align="right">
-                  {!isPendingDelegation(item) && !item.pending_events.length && (
+                  {!item.pending_events.length ? (
                     <DelegationsActionsMenu
                       isPending={undefined}
                       onActionClick={(action) => (onItemActionClick ? onItemActionClick(item, action) : undefined)}
                       disableRedeemingRewards={!item.accumulated_rewards || item.accumulated_rewards.amount === '0'}
                       disableCompoundRewards={!item.accumulated_rewards || item.accumulated_rewards.amount === '0'}
                     />
-                  )}
-                  {!isPendingDelegation(item) && item.pending_events.length > 0 && (
+                  ) : (
                     <Tooltip
-                      title="Your changes will take effect when
-the new epoch starts. There is a new
-epoch every hour."
+                      title="There will be a new epoch roughly every hour when your changes will take effect"
                       arrow
                     >
-                      <Chip label="Pending Events" />
-                    </Tooltip>
-                  )}
-                  {isPendingDelegation(item) && (
-                    <Tooltip
-                      title={`Your delegation of ${item.amount?.amount} ${item.amount?.denom} will take effect 
-                        when the new epoch starts. There is a new
-                        epoch every hour.`}
-                      arrow
-                    >
-                      <Chip label="Pending Events" />
+                      <Chip label="Pending events" />
                     </Tooltip>
                   )}
                 </TableCell>

nym-wallet/src/components/Delegation/DelegationModal.stories.tsx

@@ -29,6 +29,9 @@ const transactionForDarkTheme = {
   url: 'https://sandbox-blocks.nymtech.net/transactions/11ED7B9E21534A9421834F52FED5103DC6E982949C06335F5E12EFC71DAF0CFO',
   hash: '11ED7B9E21534A9421834F52FED5103DC6E982949C06335F5E12EFC71DAF0CF0',
 };
+const balance = '104 NYMT';
+const balanceVested = '12 NYMT';
+const recipient = 'nymt1923pujepxfnv8dqyxqrl078s4ysf3xn2p7z2xa';
 
 const Content: React.FC<{ children: React.ReactElement<any, any>; handleClick: () => void }> = ({
   children,
@@ -75,6 +78,8 @@ export const DelegateSuccess = () => {
         status="success"
         action="delegate"
         message="You delegated 5 NYM"
+        recipient={recipient}
+        balance={balance}
         transactions={theme.palette.mode === 'light' ? [transaction] : [transactionForDarkTheme]}
         {...storybookStyles(theme)}
       />
@@ -94,6 +99,8 @@ export const UndelegateSuccess = () => {
         status="success"
         action="undelegate"
         message="You undelegated 5 NYM"
+        recipient={recipient}
+        balance={balance}
         transactions={theme.palette.mode === 'light' ? [transaction] : [transactionForDarkTheme]}
         {...storybookStyles(theme)}
       />
@@ -113,6 +120,8 @@ export const RedeemSuccess = () => {
         status="success"
         action="redeem"
         message="42 NYM"
+        recipient={recipient}
+        balance={balance}
         transactions={
           theme.palette.mode === 'light'
             ? [transaction, transaction]
@@ -136,6 +145,9 @@ export const RedeemWithVestedSuccess = () => {
         status="success"
         action="redeem"
         message="42 NYM"
+        recipient={recipient}
+        balance={balance}
+        balanceVested={balanceVested}
         transactions={
           theme.palette.mode === 'light'
             ? [transaction, transaction]
@@ -159,6 +171,8 @@ export const RedeemAllSuccess = () => {
         status="success"
         action="redeem-all"
         message="42 NYM"
+        recipient={recipient}
+        balance={balance}
         transactions={
           theme.palette.mode === 'light'
             ? [transaction, transaction]
@@ -182,6 +196,8 @@ export const Error = () => {
         status="error"
         action="redeem-all"
         message="Minim esse veniam Lorem id velit Lorem eu eu est. Excepteur labore sunt do proident proident sint aliquip consequat Lorem sint non nulla ad excepteur."
+        recipient={recipient}
+        balance={balance}
         transactions={theme.palette.mode === 'light' ? [transaction] : [transactionForDarkTheme]}
         {...storybookStyles(theme)}
       />

nym-wallet/src/components/Delegation/DelegationModal.tsx

@@ -1,10 +1,9 @@
 import React from 'react';
-import { Typography, SxProps, Stack } from '@mui/material';
+import { Box, Button, Modal, Typography, SxProps } from '@mui/material';
 import { Link } from '@nymproject/react/link/Link';
 import { Console } from 'src/utils/console';
+import { modalStyle } from '../Modals/styles';
 import { LoadingModal } from '../Modals/LoadingModal';
-import { ConfirmationModal } from '../Modals/ConfirmationModal';
-import { ErrorModal } from '../Modals/ErrorModal';
 
 export type ActionType = 'delegate' | 'undelegate' | 'redeem' | 'redeem-all' | 'compound';
 
@@ -16,9 +15,9 @@ const actionToHeader = (action: ActionType): string => {
     case 'redeem-all':
       return 'All rewards redeemed successfully';
     case 'delegate':
-      return 'Delegation successful';
+      return 'Delegation complete';
     case 'undelegate':
-      return 'Undelegation successful';
+      return 'Undelegation complete';
     case 'compound':
       return 'Rewards compounded successfully';
     default:
@@ -30,6 +29,9 @@ export type DelegationModalProps = {
   status: 'loading' | 'success' | 'error';
   action: ActionType;
   message?: string;
+  recipient?: string;
+  balance?: string;
+  balanceVested?: string;
   transactions?: {
     url: string;
     hash: string;
@@ -39,44 +41,94 @@ export type DelegationModalProps = {
 export const DelegationModal: React.FC<
   DelegationModalProps & {
     open: boolean;
-    onClose: () => void;
+    onClose?: () => void;
     sx?: SxProps;
     backdropProps?: object;
   }
-> = ({ status, action, message, transactions, open, onClose, children, sx, backdropProps }) => {
+> = ({
+  status,
+  action,
+  message,
+  recipient,
+  balance,
+  balanceVested,
+  transactions,
+  open,
+  onClose,
+  children,
+  sx,
+  backdropProps,
+}) => {
   if (status === 'loading') return <LoadingModal sx={sx} backdropProps={backdropProps} />;
 
   if (status === 'error') {
     return (
-      <ErrorModal message={message} sx={sx} open={open} onClose={onClose}>
-        {children}
-      </ErrorModal>
+      <Modal open={open} onClose={onClose} BackdropProps={backdropProps}>
+        <Box sx={{ ...modalStyle, ...sx }} textAlign="center">
+          <Typography color={(theme) => theme.palette.error.main} mb={1}>
+            Oh no! Something went wrong...
+          </Typography>
+          <Typography my={5} color="text.primary">
+            {message}
+          </Typography>
+          {children}
+          <Button variant="contained" onClick={onClose}>
+            Close
+          </Button>
+        </Box>
+      </Modal>
     );
   }
 
   transactions?.map((transaction) => Console.log('action', action, 'status', status, 'key', transaction.hash));
-
   return (
-    <ConfirmationModal
-      open={open}
-      onConfirm={onClose || (() => {})}
-      title={actionToHeader(action)}
-      confirmButton="Done"
-    >
-      <Stack alignItems="center" spacing={2} mb={0}>
-        {message && <Typography>{message}</Typography>}
-        {transactions?.length === 1 && (
-          <Link href={transactions[0].url} target="_blank" sx={{ ml: 1 }} text="View on blockchain" noIcon />
+    <Modal open={open} onClose={onClose} BackdropProps={backdropProps}>
+      <Box sx={{ ...modalStyle, ...sx }} textAlign="center">
+        <Typography color={(theme) => theme.palette.success.main} mb={1}>
+          {actionToHeader(action)}
+        </Typography>
+        <Typography mb={3} color="text.primary">
+          {message}
+        </Typography>
+
+        {recipient && (
+          <Typography mb={1} fontSize="small" color={(theme) => theme.palette.text.secondary}>
+            Recipient: {recipient}
+          </Typography>
         )}
-        {transactions && transactions.length > 1 && (
-          <Stack alignItems="center" spacing={1}>
-            <Typography>View the transactions on blockchain:</Typography>
-            {transactions.map(({ url, hash }) => (
-              <Link href={url} target="_blank" sx={{ ml: 1 }} text={hash.slice(0, 6)} key={hash} noIcon />
+        {balanceVested ? (
+          <>
+            <Typography mb={1} fontSize="small" color={(theme) => theme.palette.text.secondary}>
+              Your current balance: {balance?.toUpperCase()}
+            </Typography>
+            <Typography mb={1} fontSize="small" color={(theme) => theme.palette.text.secondary}>
+              ({balanceVested.toUpperCase()} is unlocked in your vesting account)
+            </Typography>
+          </>
+        ) : (
+          <Typography mb={1} fontSize="small" color={(theme) => theme.palette.text.secondary}>
+            Your current balance: {balance?.toUpperCase()}
+          </Typography>
+        )}
+        {transactions && (
+          <Typography mb={1} fontSize="small" color={(theme) => theme.palette.text.secondary}>
+            Check the transaction {transactions.length > 1 ? 'hashes' : 'hash'}:
+            {transactions.map((transaction) => (
+              <Link
+                key={transaction.hash}
+                href={transaction.url}
+                target="_blank"
+                sx={{ ml: 1 }}
+                text={transaction.hash.slice(0, 6)}
+              />
             ))}
-          </Stack>
+          </Typography>
         )}
-      </Stack>
-    </ConfirmationModal>
+        {children}
+        <Button variant="contained" sx={{ mt: 3 }} size="large" onClick={onClose}>
+          Finish
+        </Button>
+      </Box>
+    </Modal>
   );
 };

nym-wallet/src/components/Delegation/PendingEvents.tsx

@@ -0,0 +1,160 @@
+import React, { FC } from 'react';
+import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
+import {
+  Box,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  TableSortLabel,
+  Tooltip,
+  Typography,
+} from '@mui/material';
+import { CopyToClipboard } from '@nymproject/react/clipboard/CopyToClipboard';
+import { DelegationEvent } from '@nymproject/types';
+import { ArrowDropDown } from '@mui/icons-material';
+import { visuallyHidden } from '@mui/utils';
+import { Link } from '@nymproject/react/link/Link';
+
+type Order = 'asc' | 'desc';
+
+interface HeadCell {
+  id: keyof DelegationEvent;
+  label: string;
+  sortable: boolean;
+  disablePadding?: boolean;
+}
+
+interface EnhancedTableProps {
+  onRequestSort: (event: React.MouseEvent<unknown>, property: keyof DelegationEvent) => void;
+  order: Order;
+  orderBy: string;
+}
+
+const headCells: HeadCell[] = [
+  { id: 'node_identity', label: 'Node ID', sortable: true },
+  { id: 'amount', label: 'Delegation', sortable: true },
+  { id: 'kind', label: 'Type', sortable: true },
+];
+
+function descendingComparator<T>(a: T, b: T, orderBy: keyof T) {
+  if (b[orderBy] < a[orderBy]) {
+    return -1;
+  }
+  if (b[orderBy] > a[orderBy]) {
+    return 1;
+  }
+  return 0;
+}
+
+function getComparator<Key extends keyof DelegationEvent>(
+  order: Order,
+  orderBy: Key,
+): (a: DelegationEvent, b: DelegationEvent) => number {
+  return order === 'desc'
+    ? (a, b) => descendingComparator(a, b, orderBy)
+    : (a, b) => -descendingComparator(a, b, orderBy);
+}
+
+const EnhancedTableHead: React.FC<EnhancedTableProps> = ({ order, orderBy, onRequestSort }) => {
+  const createSortHandler = (property: keyof DelegationEvent) => (event: React.MouseEvent<unknown>) => {
+    onRequestSort(event, property);
+  };
+
+  return (
+    <TableHead>
+      <TableRow>
+        {headCells.map((headCell) => (
+          <TableCell
+            key={headCell.id}
+            align="left"
+            padding={headCell.disablePadding ? 'none' : 'normal'}
+            sortDirection={orderBy === headCell.id ? order : false}
+            color="secondary"
+          >
+            <TableSortLabel
+              active={orderBy === headCell.id}
+              direction={orderBy === headCell.id ? order : 'asc'}
+              onClick={createSortHandler(headCell.id)}
+              IconComponent={ArrowDropDown}
+            >
+              {headCell.label}
+              {orderBy === headCell.id ? (
+                <Box component="span" sx={visuallyHidden}>
+                  {order === 'desc' ? 'sorted descending' : 'sorted ascending'}
+                </Box>
+              ) : null}
+            </TableSortLabel>
+          </TableCell>
+        ))}
+      </TableRow>
+    </TableHead>
+  );
+};
+
+export const PendingEvents: FC<{ pendingEvents: DelegationEvent[]; explorerUrl: string }> = ({
+  pendingEvents,
+  explorerUrl,
+}) => {
+  const [order, setOrder] = React.useState<Order>('asc');
+  const [orderBy, setOrderBy] = React.useState<keyof DelegationEvent>('node_identity');
+
+  const handleRequestSort = (event: React.MouseEvent<unknown>, property: keyof DelegationEvent) => {
+    const isAsc = orderBy === property && order === 'asc';
+    setOrder(isAsc ? 'desc' : 'asc');
+    setOrderBy(property);
+  };
+
+  if (pendingEvents.length === 0) return <Typography>No pending events</Typography>;
+
+  return (
+    <TableContainer>
+      <Table sx={{ width: '100%' }}>
+        <EnhancedTableHead order={order} orderBy={orderBy} onRequestSort={handleRequestSort} />
+        <TableBody>
+          {pendingEvents.sort(getComparator(order, orderBy)).map((item) => (
+            <TableRow key={`${item.node_identity}-${item.block_height}`}>
+              <TableCell>
+                <CopyToClipboard
+                  sx={{ fontSize: 16, mr: 1 }}
+                  value={item.node_identity}
+                  tooltip={
+                    <>
+                      Copy identity key <strong>{item.node_identity}</strong> to clipboard
+                    </>
+                  }
+                />
+                <Tooltip
+                  title={
+                    <>
+                      Click to view <strong>{item.node_identity}</strong> in the Network Explorer
+                    </>
+                  }
+                  placement="right"
+                  arrow
+                >
+                  <Link
+                    target="_blank"
+                    href={`${explorerUrl}/network-components/mixnode/${item.node_identity}`}
+                    text={`${item.node_identity.slice(0, 6)}...${item.node_identity.slice(-6)}`}
+                  />
+                </Tooltip>
+              </TableCell>
+              <TableCell>{!item.amount ? '-' : `${item.amount?.amount} ${item.amount?.denom.toUpperCase()}`}</TableCell>
+              <TableCell>
+                {item.kind === 'Delegate' ? 'Delegation' : 'Undelegation'}
+                {item.proxy && (
+                  <Tooltip title="Uses tokens for your vesting account" arrow>
+                    <LockOutlinedIcon fontSize="inherit" sx={{ ml: 0.5 }} />
+                  </Tooltip>
+                )}
+              </TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+      </Table>
+    </TableContainer>
+  );
+};

nym-wallet/src/components/Delegation/UndelegateModal.tsx

@@ -40,6 +40,7 @@ export const UndelegateModal: React.FC<{
       onClose={onClose}
       onOk={handleOk}
       header="Undelegate"
+      subHeader="Undelegate from mixnode"
       okLabel="Undelegate stake"
       okDisabled={!fee}
       sx={sx}
@@ -54,10 +55,14 @@ export const UndelegateModal: React.FC<{
       />
 
       <Box sx={{ mt: 3 }}>
-        <ModalListItem label="Delegation amount" value={`${amount} ${currency.toUpperCase()}`} divider />
-        <ModalFee fee={fee} isLoading={isFeeLoading} error={feeError} divider />
-        <ModalListItem label=" Tokens will be transferred to account you are logged in with now" value="" divider />
+        <ModalListItem label="Delegation amount" value={`${amount} ${currency}`} divider />
       </Box>
+
+      <Typography mb={5} fontSize="smaller" sx={{ color: 'text.primary' }}>
+        Tokens will be transferred to account you are logged in with now
+      </Typography>
+
+      <ModalFee fee={fee} isLoading={isFeeLoading} error={feeError} />
     </SimpleModal>
   );
 };

nym-wallet/src/components/IdentityKey.tsx

@@ -1,13 +0,0 @@
-import React from 'react';
-import { Stack, Typography } from '@mui/material';
-import { CopyToClipboard } from '@nymproject/react/clipboard/CopyToClipboard';
-import { splice } from 'src/utils';
-
-export const IdentityKey = ({ identityKey }: { identityKey: string }) => (
-  <Stack direction="row">
-    <Typography variant="body2" component="span" fontWeight={400} sx={{ mr: 1, color: 'text.primary' }}>
-      {splice(6, identityKey)}
-    </Typography>
-    <CopyToClipboard value={identityKey} sx={{ fontSize: 18 }} />
-  </Stack>
-);

nym-wallet/src/components/Mnemonic.tsx

@@ -18,11 +18,10 @@ export const Mnemonic = ({
         Below is your 24 word mnemonic, make sure to store it in a safe place for accessing your wallet in the future
       </Typography>
     </Warning>
-    <TextField multiline rows={3} value={mnemonic} fullWidth  data-testid="mnemonicPhrase"/>
+    <TextField multiline rows={3} value={mnemonic} fullWidth />
 
     <Button
       color="inherit"
-      data-testid="copyMnemonic"
       disableElevation
       size="large"
       onClick={() => {

nym-wallet/src/components/Modals/ConfirmationModal.tsx

@@ -41,7 +41,7 @@ export const ConfirmationModal = ({
   backdropProps,
 }: ConfirmationModalProps) => {
   const Title = (
-    <DialogTitle id="responsive-dialog-title" sx={{ pb: 2 }}>
+    <DialogTitle id="responsive-dialog-title" sx={{ py: 3, pb: 2, fontWeight: 600 }} color="text.primary">
       {title}
       {subTitle &&
         (typeof subTitle === 'string' ? (
@@ -56,7 +56,7 @@ export const ConfirmationModal = ({
   const ConfirmButton =
     typeof confirmButton === 'string' ? (
       <Button onClick={onConfirm} variant="contained" fullWidth disabled={disabled} sx={{ py: 1.6 }}>
-        <Typography variant="button" fontSize="large" data-testid={confirmButton}>
+        <Typography variant="button" fontSize="large">
           {confirmButton}
         </Typography>
       </Button>

nym-wallet/src/components/Modals/ErrorModal.tsx

@@ -1,27 +0,0 @@
-import React from 'react';
-import { Box, Button, Modal, SxProps, Typography } from '@mui/material';
-import { modalStyle } from './styles';
-
-export const ErrorModal: React.FC<{
-  open: boolean;
-  title?: string;
-  message?: string;
-  sx?: SxProps;
-  backdropProps?: object;
-  onClose: () => void;
-}> = ({ children, open, title, message, sx, backdropProps, onClose }) => (
-  <Modal open={open} onClose={onClose} BackdropProps={backdropProps}>
-    <Box sx={{ ...modalStyle, ...sx }} textAlign="center">
-      <Typography color={(theme) => theme.palette.error.main} mb={1}>
-        {title || 'Oh no! Something went wrong...'}
-      </Typography>
-      <Typography my={5} color="text.primary">
-        {message}
-      </Typography>
-      {children}
-      <Button variant="contained" onClick={onClose}>
-        Close
-      </Button>
-    </Box>
-  </Modal>
-);

nym-wallet/src/components/Modals/ModalFee.tsx

@@ -2,20 +2,16 @@ import React from 'react';
 import { FeeDetails } from '@nymproject/types';
 import { CircularProgress } from '@mui/material';
 import { ModalListItem } from './ModalListItem';
-import { ModalDivider } from './ModalDivider';
 
-type TFeeProps = { fee?: FeeDetails; isLoading: boolean; error?: string; divider?: boolean };
+type TFeeProps = { fee?: FeeDetails; isLoading: boolean; error?: string };
 
 const getValue = ({ fee, isLoading, error }: TFeeProps) => {
   if (isLoading) return <CircularProgress size={15} />;
   if (error && !isLoading) return 'n/a';
-  if (fee) return `${fee.amount?.amount} ${fee.amount?.denom.toUpperCase()}`;
+  if (fee) return `${fee.amount?.amount} ${fee.amount?.denom}`;
   return '-';
 };
 
-export const ModalFee = ({ fee, isLoading, error, divider }: TFeeProps) => (
-  <>
-    <ModalListItem label="Fee for this operation" value={getValue({ fee, isLoading, error })} />
-    {divider && <ModalDivider />}
-  </>
+export const ModalFee = ({ fee, isLoading, error }: TFeeProps) => (
+  <ModalListItem label="Estimated fee for this operation" value={getValue({ fee, isLoading, error })} />
 );

nym-wallet/src/components/Modals/ModalListItem.tsx

@@ -1,25 +1,26 @@
 import React from 'react';
-import { Box, Stack, Typography, TypographyProps } from '@mui/material';
+import { Box, Stack, Typography } from '@mui/material';
 import { ModalDivider } from './ModalDivider';
 
 export const ModalListItem: React.FC<{
   label: string;
   divider?: boolean;
   hidden?: boolean;
-  fontWeight?: TypographyProps['fontWeight'];
-  light?: boolean;
-  value?: React.ReactNode;
-}> = ({ label, value, hidden, fontWeight, divider }) => (
+  strong?: boolean;
+  value: React.ReactNode;
+}> = ({ label, value, hidden, divider, strong }) => (
   <Box sx={{ display: hidden ? 'none' : 'block' }}>
     <Stack direction="row" justifyContent="space-between">
-      <Typography fontSize="smaller" fontWeight={fontWeight} sx={{ color: 'text.primary' }}>
-        {label}
+      <Typography fontSize="smaller" fontWeight={strong ? 600 : undefined} sx={{ color: 'text.primary' }}>
+        {label}:
+      </Typography>
+      <Typography
+        fontSize="smaller"
+        fontWeight={strong ? 600 : undefined}
+        sx={{ color: 'text.primary', textTransform: 'uppercase' }}
+      >
+        {value}
       </Typography>
-      {value && (
-        <Typography fontSize="smaller" fontWeight={fontWeight} sx={{ color: 'text.primary' }}>
-          {value}
-        </Typography>
-      )}
     </Stack>
     {divider && <ModalDivider />}
   </Box>

nym-wallet/src/components/Modals/SimpleModal.tsx

@@ -14,7 +14,7 @@ export const SimpleModal: React.FC<{
   onClose?: () => void;
   onOk?: () => Promise<void>;
   onBack?: () => void;
-  header: string | React.ReactNode;
+  header: string;
   subHeader?: string;
   okLabel: string;
   okDisabled?: boolean;
@@ -41,25 +41,22 @@ export const SimpleModal: React.FC<{
     <Box sx={{ ...modalStyle, ...sx }}>
       {displayErrorIcon && <ErrorOutline color="error" sx={{ mb: 3 }} />}
       <Stack direction="row" justifyContent="space-between" alignItems="center">
-        {typeof header === 'string' ? (
-          <Typography fontSize={20} fontWeight={600} sx={{ color: 'text.primary', ...headerStyles }}>
-            {header}
-          </Typography>
-        ) : (
-          header
-        )}
+        <Typography fontSize={20} fontWeight={600} sx={{ color: 'text.primary', ...headerStyles }}>
+          {header}
+        </Typography>
         {!hideCloseIcon && <CloseIcon onClick={onClose} cursor="pointer" />}
       </Stack>
-
-      <Typography
-        mt={0.5}
-        mb={3}
-        fontSize={12}
-        color={(theme) => theme.palette.text.secondary}
-        sx={{ color: (theme) => theme.palette.nym.nymWallet.text.muted, ...subHeaderStyles }}
-      >
-        {subHeader}
-      </Typography>
+      {subHeader && (
+        <Typography
+          mt={0.5}
+          mb={3}
+          fontSize={12}
+          color={(theme) => theme.palette.text.secondary}
+          sx={{ color: (theme) => theme.palette.nym.nymWallet.text.muted, ...subHeaderStyles }}
+        >
+          {subHeader}
+        </Typography>
+      )}
 
       {children}
 

nym-wallet/src/components/Nav.tsx

@@ -2,8 +2,8 @@ import React, { useState, useContext } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { List, ListItem, ListItemIcon, ListItemText } from '@mui/material';
 import { AccountBalanceWalletOutlined, ArrowBack, ArrowForward, Description, Settings } from '@mui/icons-material';
-import { AppContext } from '../context/main';
-import { Delegate, Bonding } from '../svg-icons';
+import { AppContext } from '../context';
+import { Bond, Delegate, Unbond } from '../svg-icons';
 
 export const Nav = () => {
   const location = useLocation();
@@ -29,10 +29,16 @@ export const Nav = () => {
       onClick: handleShowReceiveModal,
     },
     {
-      label: 'Bonding',
-      route: '/bonding',
-      Icon: Bonding,
-      onClick: () => navigate('/bonding'),
+      label: 'Bond',
+      route: '/bond',
+      Icon: Bond,
+      onClick: () => navigate('/bond'),
+    },
+    {
+      label: 'Unbond',
+      route: '/unbond',
+      Icon: Unbond,
+      onClick: () => navigate('/unbond'),
     },
     {
       label: 'Delegation',
@@ -62,16 +68,9 @@ export const Nav = () => {
         display: 'flex',
         alignItems: 'center',
         justifyContent: 'flex-start',
-        marginLeft: 12,
-        marginRight: 12,
       }}
     >
-      <List
-        disablePadding
-        sx={{
-          width: '100%',
-        }}
-      >
+      <List disablePadding>
         {routesSchema
           .filter(({ mode }) => {
             if (!mode) {
@@ -87,35 +86,17 @@ export const Nav = () => {
             }
           })
           .map(({ Icon, onClick, label, route }) => (
-            <ListItem
-              disableGutters
-              key={label}
-              onClick={onClick}
-              sx={{
-                cursor: 'pointer',
-                py: 2,
-                paddingLeft: 3.5,
-                borderRadius: 1,
-                '&:hover': { backgroundColor: (theme) => theme.palette.nym.nymWallet.hover.background },
-              }}
-            >
+            <ListItem disableGutters key={label} onClick={onClick} sx={{ cursor: 'pointer' }}>
               <ListItemIcon
                 sx={{
-                  height: '20px',
                   minWidth: 30,
                   color: location.pathname === route ? 'primary.main' : 'text.primary',
                 }}
               >
-                <Icon
-                  sx={{
-                    fontSize: 20,
-                  }}
-                />
+                <Icon sx={{ fontSize: 20 }} />
               </ListItemIcon>
               <ListItemText
                 sx={{
-                  height: '20px',
-                  margin: 0,
                   color: location.pathname === route ? 'primary.main' : 'text.primary',
                   '& .MuiListItemText-primary': {
                     fontSize: 14,