From 5a7707362c8a5090f3d3566f15b17e9f75a474fa Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 19:43:11 -0700 Subject: [PATCH] Sort device paths for select (#8896) (#8897) automerge --- remote-wallet/src/ledger.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/remote-wallet/src/ledger.rs b/remote-wallet/src/ledger.rs index 5427807a8a..95ee137635 100644 --- a/remote-wallet/src/ledger.rs +++ b/remote-wallet/src/ledger.rs @@ -432,13 +432,16 @@ pub fn get_ledger_from_info( return Err(device.error.clone().unwrap()); } } - let (pubkeys, device_paths): (Vec, Vec) = matches + let mut matches: Vec<(Pubkey, String)> = matches .filter(|&device_info| device_info.error.is_none()) .map(|device_info| (device_info.pubkey, device_info.get_pretty_path())) - .unzip(); - if pubkeys.is_empty() { + .collect(); + if matches.is_empty() { return Err(RemoteWalletError::NoDeviceFound); } + matches.sort_by(|a, b| a.1.cmp(&b.1)); + let (pubkeys, device_paths): (Vec, Vec) = matches.into_iter().unzip(); + let wallet_base_pubkey = if pubkeys.len() > 1 { let selection = Select::with_theme(&ColorfulTheme::default()) .with_prompt(&format!(