Skip to content

Commit c5866db

Browse files
authored
feat(nc-android): sync with nc desktop (new design) (#2971)
* feat(nc-android): fit the design to mobile * refactor(nc-android): resync with nc desktop * fix(nc-android): tauri version * refactor(nc-android): resync with nc desktop (rust) * chore(nc-android): format code * chore(nc-android): bump version
1 parent 37187c7 commit c5866db

Some content is hidden

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

56 files changed

+8860
-921
lines changed

Cargo.lock

+148-131
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

clients/socks5/src/client/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use client_core::client::key_manager::KeyManager;
1818
use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
1919
use futures::channel::mpsc;
2020
use futures::StreamExt;
21+
#[cfg(not(feature = "mobile"))]
2122
use gateway_client::bandwidth::BandwidthController;
2223
use log::*;
2324
use nymsphinx::addressing::clients::Recipient;
@@ -69,6 +70,7 @@ impl NymClient {
6970
}
7071
}
7172

73+
#[cfg(not(feature = "mobile"))]
7274
async fn create_bandwidth_controller(config: &Config) -> BandwidthController<QueryNyxdClient> {
7375
let details = network_defaults::NymNetworkDetails::new_from_env();
7476
let mut client_config = validator_client::Config::try_from_nym_network_details(&details)

nym-connect-android/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"react-error-boundary": "^3.1.3",
4444
"react-hook-form": "^7.14.2",
4545
"react-markdown": "^8.0.4",
46-
"react-router-dom": "^5.2.0",
46+
"react-router-dom": "^6.7.0",
4747
"semver": "^6.3.0",
4848
"yup": "^0.32.9"
4949
},
@@ -58,7 +58,7 @@
5858
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
5959
"@storybook/react": "^6.5.15",
6060
"@svgr/webpack": "^6.1.1",
61-
"@tauri-apps/cli": "^2.0.0-alpha.1",
61+
"@tauri-apps/cli": "^2.0.0-alpha.2",
6262
"@testing-library/jest-dom": "^5.14.1",
6363
"@testing-library/react": "^12.0.0",
6464
"@types/jest": "^27.0.1",

0 commit comments

Comments
 (0)