contrats: clippy in beta toolchain

socks5: remove pub mod not needed anymore (#1517 )
* socks5: remove pub mod not needed anymore * all: dedup parse_validators and move to common * rustfmt
2022-08-11 08:24:49 +02:00 · 2022-08-10 21:14:12 +02:00 · 2022-08-10 16:35:49 +02:00 · 2022-08-10 16:29:54 +02:00 · 2022-08-10 16:09:05 +02:00 · 2022-08-10 16:03:11 +02:00
56 changed files with 253 additions and 534 deletions
@@ -0,0 +1,36 @@
+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
@@ -52,6 +52,7 @@ 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])


 [#1249]: https://github.com/nymtech/nym/pull/1249
@@ -79,6 +80,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#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

 ## [nym-connect-v1.0.1](https://github.com/nymtech/nym/tree/nym-connect-v1.0.1) (2022-07-22)

@@ -3,7 +3,6 @@

 use crate::client::config::{Config, SocketType};
 use clap::{Parser, Subcommand};
-use url::Url;

 #[cfg(not(feature = "coconut"))]
 pub(crate) const DEFAULT_ETH_ENDPOINT: &str =
@@ -97,28 +96,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 {
    if let Some(raw_validators) = args.validators {
        config
            .get_base_mut()
-            .set_custom_validator_apis(parse_validators(&raw_validators));
+            .set_custom_validator_apis(config::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(parse_validators(&raw_validators));
+            .set_custom_validator_apis(config::parse_validators(&raw_validators));
    }

    if args.disable_socket {
@@ -3,7 +3,7 @@

 use crate::client::config::Config;
 use clap::{Parser, Subcommand};
-use url::Url;
+use config::parse_validators;

 pub mod init;
 pub(crate) mod run;
@@ -96,17 +96,6 @@ 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
@@ -2,9 +2,4 @@
 // 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;
@@ -4,8 +4,8 @@ import expect from 'expect';
 describe('Query: balances', () => {
  it('can query for an account balance', async () => {
    const client = await ValidatorClient.connectForQuery(
-      'https://rpc.nymtech.net/', 'https://validator.nymtech.net/api/', 'n', 'n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g', 'n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw', 'nym');
+      'https://rpc.nyx.nodes.guru/', 'https://validator.nymtech.net/api/', 'n', 'n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g', 'n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw', 'nym');
    const balance = await client.getBalance('n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy');
    expect(Number.parseFloat(balance.amount)).toBeGreaterThan(0);
  }).timeout(5000);
-})
+})
@@ -88,3 +88,14 @@ 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()
+}
@@ -37,7 +37,7 @@ impl SpendCredentialData {
    }
 }

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

-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, 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, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 pub struct NodeToRemove {
    owner: String,
    proxy: Option<String>,
@@ -24,8 +24,8 @@ 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 const NYMD_VALIDATOR: &str = "https://rpc.nymtech.net";
+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> {
    vec![ValidatorDetails::new(NYMD_VALIDATOR, Some(API_VALIDATOR))]
@@ -2,5 +2,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
 BIG_DIPPER_URL=https://qa-blocks.nymtech.net
-CURRENCY_DENOM=unymt
-CURRENCY_STAKING_DENOM=unyxt
+CURRENCY_DENOM=unym
+CURRENCY_STAKING_DENOM=unyx
@@ -26,6 +26,7 @@ const FilterItem = ({
  id,
  tooltipInfo,
  value,
+  isSmooth,
  marks,
  scale,
  min,
@@ -40,9 +41,9 @@ const FilterItem = ({
    <Slider
      value={value}
      onChange={(e: Event, newValue: number | number[]) => onChange(id, newValue as number[])}
-      valueLabelDisplay="off"
+      valueLabelDisplay={isSmooth ? 'auto' : 'off'}
      marks={marks}
-      step={null}
+      step={isSmooth ? 1 : null}
      scale={scale}
      min={min}
      max={max}
@@ -128,6 +129,7 @@ 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
@@ -5,6 +5,7 @@ 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 },
@@ -11,6 +11,7 @@ export type TFilterItem = {
  label: string;
  id: EnumFilterKey;
  value: number[];
+  isSmooth?: boolean;
  marks: Mark[];
  min?: number;
  max?: number;
@@ -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,17 +69,6 @@ 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 {
@@ -6,9 +6,11 @@ use std::process;
 use crate::{config::Config, Cli};
 use clap::Subcommand;
 use colored::Colorize;
-use config::defaults::var_names::{API_VALIDATOR, BECH32_PREFIX, CONFIGURED};
+use config::{
+    defaults::var_names::{API_VALIDATOR, BECH32_PREFIX, CONFIGURED},
+    parse_validators,
+};
 use crypto::bech32_address_validation;
-use url::Url;

 mod describe;
 mod init;
@@ -61,17 +63,6 @@ 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 {
@@ -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, commands::parse_validators};
+use nym_socks5::client::config::Config as Socks5Config;

 use crate::{
    error::{BackendError, Result},
@@ -134,10 +134,11 @@ 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(parse_validators(&raw_validators));
+            .set_custom_validator_apis(config_common::parse_validators(&raw_validators));
    }

    let gateway = setup_gateway(
@@ -1,217 +0,0 @@
-## [nym-wallet-v1.0.9](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.0.8) (2022-09-08)
-
- wallet: change default `nymd` URL to https://rpc.nymtech.net
-
-## [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))
@@ -3055,7 +3055,7 @@ dependencies = [

 [[package]]
 name = "nym_wallet"
-version = "1.0.9"
+version = "1.0.7"
 dependencies = [
 "aes-gcm",
 "argon2 0.3.4",
@@ -1,6 +1,6 @@
 [package]
 name = "nym_wallet"
-version = "1.0.9"
+version = "1.0.7"
 description = "Nym Native Wallet"
 authors = ["Nym Technologies SA"]
 license = ""
@@ -552,7 +552,7 @@ api_url = 'https://baz/api'
            .next()
            .map(|v| v.nymd_url)
            .unwrap();
-        assert_eq!(nymd_url.as_ref(), "https://rpc.nymtech.net/");
+        assert_eq!(nymd_url.as_ref(), "https://rpc.nyx.nodes.guru/");

        let api_url = config
            .get_base_validators(WalletNetwork::MAINNET)
@@ -516,7 +516,7 @@ mod tests {
                "http://nymd_url.com/".parse().unwrap(),
                "http://foo.com".parse().unwrap(),
                "http://bar.com".parse().unwrap(),
-                "https://rpc.nymtech.net".parse().unwrap(),
+                "https://rpc.nyx.nodes.guru".parse().unwrap(),
            ],
        );
        assert_eq!(
@@ -538,7 +538,7 @@ mod tests {
                "http://nymd_url.com/".parse().unwrap(),
                "http://foo.com".parse().unwrap(),
                "http://bar.com".parse().unwrap(),
-                "https://rpc.nymtech.net".parse().unwrap(),
+                "https://rpc.nyx.nodes.guru".parse().unwrap(),
            ],
        )
    }
@@ -1,7 +1,7 @@
 {
  "package": {
    "productName": "nym-wallet",
-    "version": "1.0.9"
+    "version": "1.0.7"
  },
  "build": {
    "distDir": "../dist",
@@ -1,8 +1,12 @@
 import React from 'react';
-import { Avatar } from '@mui/material';
+import { Avatar, Typography } from '@mui/material';
 import stc from 'string-to-color';
 import { TAccount } from 'src/types';

-export const AccountAvatar = ({ name }: Pick<TAccount, 'name'>) => (
-  <Avatar sx={{ bgcolor: stc(name), width: 20, height: 20 }}>{name?.split('')[0]}</Avatar>
+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>
 );
@@ -5,10 +5,10 @@ import { AccountAvatar } from './AccountAvatar';

 export const AccountOverview = ({ account, onClick }: { account: AccountEntry; onClick: () => void }) => (
  <Button
-    startIcon={<AccountAvatar name={account.id} />}
+    startIcon={<AccountAvatar name={account.id} small />}
    sx={{ color: 'text.primary' }}
+    color="inherit"
    onClick={onClick}
-    disableRipple
  >
    {account.id}
  </Button>
@@ -9,6 +9,7 @@ import {
  DialogTitle,
  IconButton,
  Typography,
+  Divider,
 } from '@mui/material';
 import { Add, ArrowDownwardSharp, Close } from '@mui/icons-material';
 import { AccountsContext } from 'src/context';
@@ -51,7 +52,7 @@ export const AccountsModal = () => {
              <Close />
            </IconButton>
          </Box>
-          <Typography variant="body1" sx={{ color: (theme) => theme.palette.text.disabled }}>
+          <Typography fontSize="small" sx={{ color: 'grey.600' }}>
            Switch between accounts
          </Typography>
        </DialogTitle>
@@ -69,6 +70,7 @@ export const AccountsModal = () => {
            />
          ))}
        </DialogContent>
+        <Divider variant="middle" sx={{ mt: 3 }} />
        <DialogActions sx={{ p: 3 }}>
          <Button startIcon={<ArrowDownwardSharp />} onClick={() => setDialogToDisplay('Import')}>
            Import account
@@ -7,17 +7,16 @@ 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',
@@ -30,14 +29,15 @@ const importAccountSteps = [
  'Confirm the password used to login to your wallet',
 ];

-const MnemonicStep = ({ mnemonic, onNext }: { mnemonic: string; onNext: () => void }) => {
+const MnemonicStep = ({ mnemonic, onNext, onBack }: { mnemonic: string; onNext: () => void; onBack: () => 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 }}>
+      <DialogActions sx={{ p: 3, pt: 0, gap: 2 }}>
+        <StyledBackButton onBack={onBack} />
        <Button disabled={!copied} fullWidth disableElevation variant="contained" size="large" onClick={onNext}>
          I saved my mnemonic
        </Button>
@@ -50,10 +50,12 @@ const ImportMnemonic = ({
  value,
  onChange,
  onNext,
+  onBack,
 }: {
  value: string;
  onChange: (value: string) => void;
  onNext: () => void;
+  onBack: () => void;
 }) => {
  const [error, setError] = useState<string>();

@@ -77,7 +79,8 @@ const ImportMnemonic = ({
          }}
        />
      </DialogContent>
-      <DialogActions sx={{ p: 3, pt: 0 }}>
+      <DialogActions sx={{ p: 3, pt: 0, gap: 2 }}>
+        <StyledBackButton onBack={onBack} />
        <Button
          disabled={value.length === 0}
          fullWidth
@@ -93,7 +96,7 @@ const ImportMnemonic = ({
  );
 };

-const NameAccount = ({ onNext }: { onNext: (value: string) => void }) => {
+const NameAccount = ({ onNext, onBack }: { onNext: (value: string) => void; onBack: () => void }) => {
  const [value, setValue] = useState('');
  const [error, setError] = useState<string>();

@@ -121,7 +124,8 @@ const NameAccount = ({ onNext }: { onNext: (value: string) => void }) => {
          fullWidth
        />
      </DialogContent>
-      <DialogActions sx={{ p: 3, pt: 0 }}>
+      <DialogActions sx={{ p: 3, pt: 0, gap: 2 }}>
+        <StyledBackButton onBack={onBack} />
        <Button
          disabled={!value.length}
          fullWidth
@@ -178,9 +182,6 @@ 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]}
@@ -190,12 +191,17 @@ export const AddAccountModal = () => {
          switch (step) {
            case 0:
              return dialogToDisplay === 'Add' ? (
-                <MnemonicStep mnemonic={data.mnemonic} onNext={() => setStep((s) => s + 1)} />
+                <MnemonicStep
+                  mnemonic={data.mnemonic}
+                  onNext={() => setStep((s) => s + 1)}
+                  onBack={() => (step === 0 ? handleClose() : 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:
@@ -205,6 +211,7 @@ export const AddAccountModal = () => {
                    setData((d) => ({ ...d, accountName }));
                    setStep((s) => s + 1);
                  }}
+                  onBack={() => setStep((s) => s - 1)}
                />
              );
            case 2:
@@ -222,6 +229,7 @@ export const AddAccountModal = () => {
                      }
                    }
                  }}
+                  onCancel={() => setStep((s) => s - 1)}
                  isLoading={isLoading}
                  error={error}
                />
@@ -19,17 +19,18 @@ export const ConfirmPasswordModal = ({
    <Dialog open={Boolean(accountName)} onClose={onClose} fullWidth>
      <Paper>
        <DialogTitle>
-          <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 }}>
+          <Typography variant="h6">Switch account</Typography>
+          <Typography fontSize="small" sx={{ color: 'grey.600' }}>
            Confirm password
          </Typography>
        </DialogTitle>
-        <ConfirmPassword onConfirm={onConfirm} error={error} isLoading={isLoading} buttonTitle="Switch account" />
+        <ConfirmPassword
+          onConfirm={onConfirm}
+          error={error}
+          isLoading={isLoading}
+          buttonTitle="Switch account"
+          onCancel={onClose}
+        />
      </Paper>
    </Dialog>
  );
@@ -33,7 +33,7 @@ export const EditAccountModal = () => {
              <Close />
            </IconButton>
          </Box>
-          <Typography variant="body1" sx={{ color: (theme) => theme.palette.text.disabled }}>
+          <Typography fontSize="small" sx={{ color: 'grey.600' }}>
            New wallet address
          </Typography>
        </DialogTitle>
@@ -1,69 +0,0 @@
-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>
-  );
-};
@@ -2,16 +2,19 @@ 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('');
@@ -39,7 +42,8 @@ export const ConfirmPassword = ({
          disabled={isLoading}
        />
      </DialogContent>
-      <DialogActions sx={{ p: 3, pt: 0 }}>
+      <DialogActions sx={{ p: 3, pt: 0, gap: 2 }}>
+        {onCancel && <StyledBackButton onBack={onCancel} />}
        <Button
          disabled={!value.length || isLoading}
          fullWidth
@@ -13,12 +13,13 @@ 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;
@@ -62,7 +63,7 @@ export const DelegateModal: React.FC<{
  const [tokenPool, setTokenPool] = useState<TPoolOption>('balance');
  const [errorIdentityKey, setErrorIdentityKey] = useState<string>();

-  const { fee, getFee, resetFeeState } = useGetFee();
+  const { fee, getFee, resetFeeState, feeError } = useGetFee();

  const handleCheckStakeSaturation = async (identity: string) => {
    try {
@@ -174,6 +175,18 @@ export const DelegateModal: React.FC<{
    );
  }

+  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}
@@ -193,7 +206,7 @@ export const DelegateModal: React.FC<{
        <IdentityKeyFormField
          required
          fullWidth
-          placeholder="Node identity key"
+          label="Node identity key"
          onChanged={handleIdentityKeyChanged}
          initialValue={identityKey}
          readOnly={Boolean(initialIdentityKey)}
@@ -215,7 +228,7 @@ export const DelegateModal: React.FC<{
        <CurrencyFormField
          required
          fullWidth
-          placeholder="Amount"
+          label="Amount"
          initialValue={amount}
          autoFocus={Boolean(initialIdentityKey)}
          onChanged={handleAmountChanged}
@@ -231,25 +244,25 @@ export const DelegateModal: React.FC<{
        {errorAmount}
      </Typography>
      <Box sx={{ mt: 3 }}>
-        <ModalListItem label="Account balance:" value={accountBalance?.toUpperCase()} divider strong />
+        <ModalListItem label="Account balance" value={accountBalance?.toUpperCase()} divider fontWeight={600} />
      </Box>

-      <ModalListItem label="Rewards payout interval:" value={rewardInterval} hidden divider />
+      <ModalListItem label="Rewards payout interval" value={rewardInterval} hidden divider />
      <ModalListItem
-        label="Node profit margin:"
+        label="Node profit margin"
        value={`${profitMarginPercentage ? `${profitMarginPercentage}%` : '-'}`}
        hidden={profitMarginPercentage === undefined}
        divider
      />
      <ModalListItem
-        label="Node avg. uptime:"
+        label="Node avg. uptime"
        value={`${nodeUptimePercentage ? `${nodeUptimePercentage}%` : '-'}`}
        hidden={nodeUptimePercentage === undefined}
        divider
      />

      <ModalListItem
-        label="Node est. reward per epoch:"
+        label="Node est. reward per epoch"
        value={`${estimatedReward} ${denom.toUpperCase()}`}
        hidden
        divider
@@ -1,10 +1,10 @@
 import React from 'react';
-import { Box, Button, Modal, Typography, SxProps, Stack } from '@mui/material';
+import { Typography, SxProps, Stack } 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';

@@ -39,7 +39,7 @@ export type DelegationModalProps = {
 export const DelegationModal: React.FC<
  DelegationModalProps & {
    open: boolean;
-    onClose?: () => void;
+    onClose: () => void;
    sx?: SxProps;
    backdropProps?: object;
  }
@@ -48,20 +48,9 @@ export const DelegationModal: React.FC<

  if (status === 'error') {
    return (
-      <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>
+      <ErrorModal message={message} sx={sx} open={open} onClose={onClose}>
+        {children}
+      </ErrorModal>
    );
  }

@@ -40,7 +40,6 @@ export const UndelegateModal: React.FC<{
      onClose={onClose}
      onOk={handleOk}
      header="Undelegate"
-      subHeader="Undelegate from mixnode"
      okLabel="Undelegate stake"
      okDisabled={!fee}
      sx={sx}
@@ -55,14 +54,10 @@ export const UndelegateModal: React.FC<{
      />

      <Box sx={{ mt: 3 }}>
-        <ModalListItem label="Delegation amount:" value={`${amount} ${currency}`} divider />
+        <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 />
      </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>
  );
 };
@@ -4,15 +4,16 @@ import { modalStyle } from './styles';

 export const ErrorModal: React.FC<{
  open: boolean;
+  title?: string;
  message?: string;
  sx?: SxProps;
  backdropProps?: object;
  onClose: () => void;
-}> = ({ children, open, message, sx, backdropProps, onClose }) => (
+}> = ({ 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}>
-        Oh no! Something went wrong...
+        {title || 'Oh no! Something went wrong...'}
      </Typography>
      <Typography my={5} color="text.primary">
        {message}
@@ -15,7 +15,7 @@ const getValue = ({ fee, isLoading, error }: TFeeProps) => {

 export const ModalFee = ({ fee, isLoading, error, divider }: TFeeProps) => (
  <>
-    <ModalListItem label="Fee for this operation:" value={getValue({ fee, isLoading, error })} />
+    <ModalListItem label="Fee for this operation" value={getValue({ fee, isLoading, error })} />
    {divider && <ModalDivider />}
  </>
 );
@@ -1,21 +1,25 @@
 import React from 'react';
-import { Box, Stack, Typography } from '@mui/material';
+import { Box, Stack, Typography, TypographyProps } from '@mui/material';
 import { ModalDivider } from './ModalDivider';
+import { fontWeight } from '@mui/system';
+
+type TFontWeight = 'strong' | 'light';

 export const ModalListItem: React.FC<{
  label: string;
  divider?: boolean;
  hidden?: boolean;
-  strong?: boolean;
+  fontWeight?: TypographyProps['fontWeight'];
+  light?: boolean;
  value?: React.ReactNode;
-}> = ({ label, value, hidden, divider, strong }) => (
+}> = ({ label, value, hidden, fontWeight, divider }) => (
  <Box sx={{ display: hidden ? 'none' : 'block' }}>
    <Stack direction="row" justifyContent="space-between">
-      <Typography fontSize="smaller" fontWeight={strong ? 600 : undefined} sx={{ color: 'text.primary' }}>
+      <Typography fontSize="smaller" fontWeight={fontWeight} sx={{ color: 'text.primary' }}>
        {label}
      </Typography>
      {value && (
-        <Typography fontSize="smaller" fontWeight={strong ? 600 : undefined} sx={{ color: 'text.primary' }}>
+        <Typography fontSize="smaller" fontWeight={fontWeight} sx={{ color: 'text.primary' }}>
          {value}
        </Typography>
      )}
@@ -50,17 +50,16 @@ export const SimpleModal: React.FC<{
        )}
        {!hideCloseIcon && <CloseIcon onClick={onClose} cursor="pointer" />}
      </Stack>
-      {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>
-      )}
+
+      <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}

@@ -39,7 +39,7 @@ export const NetworkSelector = () => {
    <>
      <Button
        variant="text"
-        color="primary"
+        color="inherit"
        sx={{ color: 'text.primary' }}
        onClick={handleClick}
        disableElevation
@@ -1,42 +1,33 @@
 import React, { useContext } from 'react';
 import { AppContext } from 'src/context';
-import { Box, Stack, Typography, SxProps } from '@mui/material';
+import { Box, Stack, Typography, SxProps, Dialog, DialogTitle, DialogContent } from '@mui/material';
 import QRCode from 'qrcode.react';
-import { SimpleModal } from '../Modals/SimpleModal';
 import { ClientAddress } from '../ClientAddress';
+import { ModalListItem } from '../Modals/ModalListItem';
+import { Close as CloseIcon } from '@mui/icons-material';

-export const ReceiveModal = ({
-  onClose,
-  open,
-  sx,
-  backdropProps,
-}: {
-  onClose: () => void;
-  open: boolean;
-  sx?: SxProps;
-  backdropProps?: object;
-}) => {
+export const ReceiveModal = ({ onClose }: { onClose: () => void; sx?: SxProps; backdropProps?: object }) => {
  const { clientDetails } = useContext(AppContext);
  return (
-    <SimpleModal
-      header="Receive"
-      okLabel="Ok"
-      onClose={onClose}
-      open={open}
-      sx={{ width: 'small', ...sx }}
-      backdropProps={backdropProps}
-    >
-      <Stack spacing={3} sx={{ mt: 1.6 }}>
-        <Stack direction="row" alignItems="center" gap={4}>
-          <Typography>Your address:</Typography>
-          <ClientAddress withCopy showEntireAddress />
-        </Stack>
-        <Stack alignItems="center">
-          <Box sx={{ border: (t) => `1px solid ${t.palette.nym.highlight}`, borderRadius: 2, p: 2 }}>
+    <Dialog open maxWidth="sm" fullWidth onClose={onClose}>
+      <DialogTitle>
+        <Box sx={{ mt: 1, display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
+          <Typography fontSize={20} fontWeight={600}>
+            Receive
+          </Typography>
+          <CloseIcon onClick={onClose} cursor="pointer" />
+        </Box>
+      </DialogTitle>
+      <DialogContent sx={{ p: 0 }}>
+        <Box sx={{ px: 3 }}>
+          <ModalListItem label="Your address:" value={<ClientAddress withCopy showEntireAddress />} />
+        </Box>
+        <Stack alignItems="center" sx={{ px: 0, py: 3, mt: 3, bgcolor: 'rgba(251, 110, 78, 5%)' }}>
+          <Box sx={{ border: (t) => `1px solid ${t.palette.nym.highlight}`, bgcolor: 'white', borderRadius: 2, p: 3 }}>
            {clientDetails && <QRCode data-testid="qr-code" value={clientDetails?.client_address} />}
          </Box>
        </Stack>
-      </Stack>
-    </SimpleModal>
+      </DialogContent>
+    </Dialog>
  );
 };
@@ -5,8 +5,7 @@ import { ReceiveModal } from './ReceiveModal';
 export const Receive = ({ hasStorybookStyles }: { hasStorybookStyles?: {} }) => {
  const { showReceiveModal, handleShowReceiveModal } = useContext(AppContext);

-  if (showReceiveModal)
-    return <ReceiveModal onClose={handleShowReceiveModal} open={showReceiveModal} {...hasStorybookStyles} />;
+  if (showReceiveModal) return <ReceiveModal onClose={handleShowReceiveModal} {...hasStorybookStyles} />;

  return null;
 };
@@ -46,9 +46,9 @@ export const CompoundModal: React.FC<{
        <IdentityKeyFormField readOnly fullWidth initialValue={identityKey} showTickOnValid={false} sx={{ mb: 2 }} />
      )}
      <ModalListItem label="Rewards amount" value={` ${amount} ${denom.toUpperCase()}`} divider />
-      {fee && <FeeWarning amount={amount} fee={fee} />}
      <ModalFee fee={fee} isLoading={isFeeLoading} error={feeError} divider />
      <ModalListItem label="Rewards will be added to this delegation" value="" divider />
+      {fee && <FeeWarning amount={amount} fee={fee} />}
    </SimpleModal>
  );
 };
@@ -52,9 +52,9 @@ export const RedeemModal: React.FC<{
        <IdentityKeyFormField readOnly fullWidth initialValue={identityKey} showTickOnValid={false} sx={{ mb: 2 }} />
      )}
      <ModalListItem label="Rewards amount" value={` ${amount} ${denom.toUpperCase()}`} divider />
-      {fee && <FeeWarning amount={amount} fee={fee} />}
      <ModalFee fee={fee} isLoading={isFeeLoading} error={feeError} divider />
      <ModalListItem label="Rewards will be transferred to account you are logged in with now" value="" divider />
+      {fee && <FeeWarning amount={amount} fee={fee} />}
    </SimpleModal>
  );
 };
@@ -1,6 +1,7 @@
 import React from 'react';
 import { CircularProgress, Stack, Typography } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
+import { InfoTooltip } from '../InfoToolTip';

 export const RewardsSummary: React.FC<{
  isLoading?: boolean;
@@ -9,15 +10,17 @@ export const RewardsSummary: React.FC<{
 }> = ({ isLoading, totalDelegation, totalRewards }) => {
  const theme = useTheme();
  return (
-    <Stack direction="row" justifyContent="space-between" alignItems="center">
+    <Stack direction="row" justifyContent="space-between">
      <Stack direction="row" spacing={4}>
-        <Stack direction="row" spacing={2}>
+        <Stack direction="row" spacing={1} alignItems="center">
+          <InfoTooltip title="This is the total amount you have delgated across multiple nodes" />
          <Typography>Total delegations:</Typography>
          <Typography fontWeight={600} fontSize={16} textTransform="uppercase">
            {isLoading ? <CircularProgress size={theme.typography.fontSize} /> : totalDelegation || '-'}
          </Typography>
        </Stack>
-        <Stack direction="row" spacing={2}>
+        <Stack direction="row" spacing={1} alignItems="center">
+          <InfoTooltip title="Awaiting rewards accrue per epoch (hourly). You can redeem or compound them" />
          <Typography>New rewards:</Typography>
          <Typography fontWeight={600} fontSize={16} textTransform="uppercase">
            {isLoading ? <CircularProgress size={theme.typography.fontSize} /> : totalRewards || '-'}
@@ -56,6 +56,7 @@ export const SendInputModal = ({
      backdropProps={backdropProps}
    >
      <Stack gap={2} sx={{ mt: 2 }}>
+        <ModalListItem label="Your address:" value={fromAddress} fontWeight="light" />
        <TextField
          placeholder="Recipient address"
          fullWidth
@@ -76,9 +77,8 @@ export const SendInputModal = ({
          {error}
        </Typography>
      </Stack>
-      <Stack gap={0.5} sx={{ mt: 2 }}>
-        <ModalListItem label="Account balance:" value={balance?.toUpperCase()} divider strong />
-        <ModalListItem label="Your address:" value={fromAddress} divider />
+      <Stack gap={0.5} sx={{ mt: 1 }}>
+        <ModalListItem label="Account balance:" value={balance?.toUpperCase()} divider fontWeight={600} />
        <Typography fontSize="smaller" sx={{ color: 'text.primary' }}>
          Est. fee for this transaction will be show on the next page
        </Typography>
@@ -4,7 +4,7 @@ import { Box, Typography } from '@mui/material';
 export const Title: React.FC<{ title: string | React.ReactNode; Icon?: React.ReactNode }> = ({ title, Icon }) => (
  <Box width="100%" display="flex" alignItems="center">
    {Icon}
-    <Typography width="100%" variant="h6" sx={{ fontWeight: 600 }}>
+    <Typography width="100%" variant="h5" sx={{ fontWeight: 600 }}>
      {title}
    </Typography>
  </Box>
@@ -81,6 +81,7 @@ export const DelegationContextProvider: FC<{
  };

  const refresh = useCallback(async () => {
+    resetState();
    setIsLoading(true);
    try {
      const data = await getDelegationSummary();
@@ -94,12 +95,11 @@ export const DelegationContextProvider: FC<{
      setError((e as Error).message);
    }
    setIsLoading(false);
-  }, [network]);
+  }, []);

  useEffect(() => {
-    resetState();
    refresh();
-  }, [network]);
+  }, []);

  const memoizedValue = useMemo(
    () => ({
@@ -1,5 +1,4 @@
 import React, { createContext, FC, useContext, useEffect, useMemo, useState } from 'react';
-import { Network } from 'src/types';
 import { FeeDetails, TransactionExecuteResult } from '@nymproject/types';
 import { useDelegationContext } from './delegations';
 import { claimDelegatorRewards, compoundDelegatorRewards } from '../requests';
@@ -29,11 +28,8 @@ export const RewardsContext = createContext<TRewardsContext>({
  },
 });

-export const RewardsContextProvider: FC<{
-  network?: Network;
-}> = ({ network, children }) => {
+export const RewardsContextProvider: FC<{}> = ({ children }) => {
  const { isLoading, totalRewards, refresh } = useDelegationContext();
-  const [currentNetwork, setCurrentNetwork] = useState<undefined | Network>();
  const [error, setError] = useState<string>();

  const resetState = async () => {
@@ -41,12 +37,8 @@ export const RewardsContextProvider: FC<{
  };

  useEffect(() => {
-    if (currentNetwork !== network) {
-      // reset state and refresh
-      resetState();
-      setCurrentNetwork(network);
-    }
-  }, [network]);
+    resetState();
+  }, []);

  const memoizedValue = useMemo(
    () => ({
@@ -60,7 +52,7 @@ export const RewardsContextProvider: FC<{
        throw new Error('Not implemented');
      },
    }),
-    [isLoading, error, totalRewards, network],
+    [isLoading, error, totalRewards],
  );

  return <RewardsContext.Provider value={memoizedValue}>{children}</RewardsContext.Provider>;
@@ -3,7 +3,7 @@ import React, { useContext } from 'react';
 import { useTheme } from '@mui/material/styles';
 import { Box, Tooltip, Typography } from '@mui/material';
 import { format } from 'date-fns';
-import { AppContext } from '../../../context/main';
+import { AppContext } from '../../../context';

 const calculateMarkerPosition = (arrLength: number, index: number) => (1 / arrLength) * 100 * index;

@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { Box } from '@mui/material';
 import { AppContext } from '../../context/main';

@@ -9,9 +9,25 @@ import { TransferModal } from './components/TransferModal';

 export const Balance = () => {
  const [showTransferModal, setShowTransferModal] = useState(false);
+  const [showVestingCard, setShowVestingCard] = useState(false);

  const { userBalance } = useContext(AppContext);

+  useEffect(() => {
+    const { originalVesting, currentVestingPeriod, tokenAllocation } = userBalance;
+    if (
+      originalVesting &&
+      currentVestingPeriod === 'After' &&
+      tokenAllocation?.locked === '0' &&
+      tokenAllocation?.vesting === '0' &&
+      tokenAllocation?.spendable === '0'
+    ) {
+      setShowVestingCard(false);
+    } else if (originalVesting) {
+      setShowVestingCard(true);
+    }
+  }, [userBalance]);
+
  const handleShowTransferModal = async () => {
    await userBalance.refreshBalances();
    setShowTransferModal(true);
@@ -21,7 +37,7 @@ export const Balance = () => {
    <PageLayout>
      <Box display="flex" flexDirection="column" gap={2}>
        <BalanceCard />
-        <VestingCard onTransfer={handleShowTransferModal} />
+        {showVestingCard && <VestingCard onTransfer={handleShowTransferModal} />}
        {showTransferModal && <TransferModal onClose={() => setShowTransferModal(false)} />}
      </Box>
    </PageLayout>
@@ -85,7 +85,7 @@ export const Delegation: FC<{ isStorybook?: boolean }> = ({ isStorybook }) => {

  useEffect(() => {
    refresh();
-  }, [network, clientDetails, confirmationModalProps]);
+  }, [clientDetails, confirmationModalProps]);

  const handleDelegationItemActionClick = (item: DelegationWithEverything, action: DelegationListItemActions) => {
    if ((action === 'delegate' || action === 'compound') && item.stake_saturation && item.stake_saturation > 1) {
@@ -302,7 +302,7 @@ export const Delegation: FC<{ isStorybook?: boolean }> = ({ isStorybook }) => {
              noIcon
            />
          </Box>
-          <Box display="flex" justifyContent="space-between" alignItems="center">
+          <Box display="flex" justifyContent="space-between" alignItems="end">
            <RewardsSummary isLoading={isLoading} totalDelegation={totalDelegations} totalRewards={totalRewards} />
            <Button
              variant="contained"
@@ -427,8 +427,8 @@ export const Delegation: FC<{ isStorybook?: boolean }> = ({ isStorybook }) => {
 export const DelegationPage: FC<{ isStorybook?: boolean }> = ({ isStorybook }) => {
  const { network } = useContext(AppContext);
  return (
-    <DelegationContextProvider network={network}>
-      <RewardsContextProvider network={network}>
+    <DelegationContextProvider>
+      <RewardsContextProvider>
        <Delegation isStorybook={isStorybook} />
      </RewardsContextProvider>
    </DelegationContextProvider>
@@ -30,18 +30,14 @@ const DataField = ({ title, info, Indicator }: { title: string; info: string; In
 );

 const colorMap: { [key in SelectionChance]: string } = {
-  VeryLow: 'error.main',
  Low: 'error.main',
  Moderate: 'warning.main',
-  High: 'success.main',
  VeryHigh: 'success.main',
 };

 const textMap: { [key in SelectionChance]: string } = {
-  VeryLow: 'Very low',
  Low: 'Low',
  Moderate: 'Moderate',
-  High: 'High',
  VeryHigh: 'Very high',
 };

@@ -1 +1 @@
-export type SelectionChance = 'VeryHigh' | 'High' | 'Moderate' | 'Low' | 'VeryLow';
+export type SelectionChance = 'VeryHigh' | 'Moderate' | 'Low';
@@ -716,7 +716,7 @@ async fn verification_of_bandwidth_credential() {
    let voucher_info = "voucher info";
    let public_attributes = vec![
        hash_to_scalar(voucher_value.to_string()),
-        hash_to_scalar(voucher_info.to_string()),
+        hash_to_scalar(voucher_info),
    ];
    let theta = theta_from_keys_and_attributes(&params, &key_pairs, &public_attributes).unwrap();
    let key_pair = key_pairs.remove(0);
@@ -82,18 +82,6 @@ const REWARDING_MONITOR_THRESHOLD_ARG: &str = "monitor-threshold";
 const MIN_MIXNODE_RELIABILITY_ARG: &str = "min_mixnode_reliability";
 const MIN_GATEWAY_RELIABILITY_ARG: &str = "min_gateway_reliability";

-#[cfg(feature = "coconut")]
-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()
-}
-
 fn long_version() -> String {
    format!(
        r#"
@@ -312,10 +300,10 @@ fn override_config(mut config: Config, matches: &ArgMatches<'_>) -> Config {

    #[cfg(feature = "coconut")]
    if let Some(raw_validators) = matches.value_of(API_VALIDATORS_ARG) {
-        config = config.with_custom_validator_apis(parse_validators(raw_validators));
+        config = config.with_custom_validator_apis(::config::parse_validators(raw_validators));
    } else if std::env::var(CONFIGURED).is_ok() {
        let raw_validators = std::env::var(API_VALIDATOR).expect("api validator not set");
-        config = config.with_custom_validator_apis(parse_validators(&raw_validators))
+        config = config.with_custom_validator_apis(::config::parse_validators(&raw_validators))
    }

    if let Some(raw_validator) = matches.value_of(NYMD_VALIDATOR_ARG) {
@@ -101,20 +101,16 @@ pub type StakeSaturation = f32;
 )]
 pub enum SelectionChance {
    VeryHigh,
-    High,
    Moderate,
    Low,
-    VeryLow,
 }

 impl From<f64> for SelectionChance {
    fn from(p: f64) -> SelectionChance {
        match p {
-            p if p >= 1. => SelectionChance::VeryHigh,
-            p if p > 0.9 => SelectionChance::High,
-            p if p > 0.7 => SelectionChance::Moderate,
-            p if p > 0.5 => SelectionChance::Low,
-            _ => SelectionChance::VeryLow,
+            p if p > 0.15 => SelectionChance::VeryHigh,
+            p if p >= 0.05 => SelectionChance::Moderate,
+            _ => SelectionChance::Low,
        }
    }
 }
@@ -123,10 +119,8 @@ impl fmt::Display for SelectionChance {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        match self {
            SelectionChance::VeryHigh => write!(f, "VeryHigh"),
-            SelectionChance::High => write!(f, "High"),
            SelectionChance::Moderate => write!(f, "Moderate"),
            SelectionChance::Low => write!(f, "Low"),
-            SelectionChance::VeryLow => write!(f, "VeryLow"),
        }
    }
 }
Author	SHA1	Message	Date
Jon Häggblad	606bb9aa3b	contrats: clippy in beta toolchain	2022-08-11 08:24:49 +02:00
Jon Häggblad	df03daf2cc	socks5: remove pub mod not needed anymore (#1517 ) * socks5: remove pub mod not needed anymore * all: dedup parse_validators and move to common * rustfmt	2022-08-10 21:14:12 +02:00
Raphaël Walther	b3f5a4f496	Added audit workflow	2022-08-10 16:35:49 +02:00
Raphaël Walther	d080d661f7	Added audit workflow	2022-08-10 16:29:54 +02:00
Raphaël Walther	6deb481e5d	Added audit workflow	2022-08-10 16:09:05 +02:00
Raphaël Walther	5b98e18a4e	Added audit workflow	2022-08-10 16:03:11 +02:00
Raphaël Walther	506a0da89c	Added audit workflow	2022-08-10 16:00:50 +02:00
Fouad	f7d38a7ec6	modal style updates (#1508 ) remove commented code remove unused props fix props	2022-08-10 10:14:48 +01:00
Pierre Dommerc	4459aca933	fix(wallet-delegation): add error feedback on wrong address (#1510 ) * fix(wallet-delegation): add error feedback on wrong address * fix(wallet-delegation): use generic component for modal error	2022-08-10 09:31:14 +01:00
Pierre Dommerc	5b84c58985	feat(wallet-balance): hide vesting ui when vesting balance is empty (#1505 ) * feat(wallet-balance): hide vesting ui when vesting balance is empty * refactor(wallet-balance): feedback review	2022-08-10 09:29:01 +01:00
Fouad	4301d91f6c	Feature/wallet style updates (#1506 ) * update buttons hover colours * fix nymcard title size * style updates for accounts! * fix delegations page lock-up on network switch	2022-08-10 09:28:03 +01:00
Fouad	03d28c115e	delegations page style updates (#1507 )	2022-08-10 09:27:03 +01:00
Jędrzej Stuczyński	de78ca8d9b	Removed unnecessary to-owned conversion	2022-08-09 15:25:45 +01:00
Gala	58d09e382a	Merge pull request #1504 from nymtech/smooth-filter-slider Smooth filter slider	2022-08-09 14:59:11 +02:00
Gala	0cef12d05b	Merge pull request #1502 from nymtech/1501-contrast-text fixing text color	2022-08-09 14:58:07 +02:00
Jon Häggblad	30e73ee795	Explorer: tweak selection probability categories (#1503 ) * validator-api: tweak SelectionChance * wallet: update SelectionChance colorMap * changelog: add note	2022-08-09 12:57:47 +02:00
Tommy Verrall	d918b69664	Update .env.qa Fix wrong denoms for the qa.env	2022-08-09 11:53:11 +01:00
Gala	b3b8d2ab46	adding the value to the cursor	2022-08-08 17:03:05 +02:00
Gala	67130a1289	adding smooth prop	2022-08-08 16:30:10 +02:00
Gala	e8e2f195e6	fixing text color	2022-08-08 14:09:33 +02:00