Merge #1035: fix receive panel: reset addresses on reload
65f4a7581359edd7d9a1a593273238485955a3e6 fix receive panel: reset addresses on reload (edouardparis)
Pull request description:
We reintroduce previous behavior:
Reset the list when user leave and come back to the receive panel.
close #1026
ACKs for top commit:
jp1ac4:
ACK 65f4a75813.
Tree-SHA512: 23aa6f58d2759f8d39d5068ebaa45a1529fd5f2692f0147a2b42e70423eb7ac3d0be26c5a00af1394e0cea22bca5c4e6a49f85b033ff2abcd392bf9fbd43c58d
This commit is contained in:
commit
53f9c72185
@ -40,12 +40,6 @@ pub struct Addresses {
|
||||
labels: HashMap<String, String>,
|
||||
}
|
||||
|
||||
impl Addresses {
|
||||
fn is_empty(&self) -> bool {
|
||||
self.list.is_empty()
|
||||
}
|
||||
}
|
||||
|
||||
impl Labelled for Addresses {
|
||||
fn labelled(&self) -> Vec<LabelItem> {
|
||||
self.list
|
||||
@ -200,21 +194,17 @@ impl State for ReceivePanel {
|
||||
wallet: Arc<Wallet>,
|
||||
) -> Command<Message> {
|
||||
self.wallet = wallet;
|
||||
// Fill at least with one address, user will then use the generate button.
|
||||
if self.addresses.is_empty() {
|
||||
let daemon = daemon.clone();
|
||||
Command::perform(
|
||||
async move {
|
||||
daemon
|
||||
.get_new_address()
|
||||
.map(|res| (res.address, res.derivation_index))
|
||||
.map_err(|e| e.into())
|
||||
},
|
||||
Message::ReceiveAddress,
|
||||
)
|
||||
} else {
|
||||
Command::none()
|
||||
}
|
||||
self.addresses = Addresses::default();
|
||||
let daemon = daemon.clone();
|
||||
Command::perform(
|
||||
async move {
|
||||
daemon
|
||||
.get_new_address()
|
||||
.map(|res| (res.address, res.derivation_index))
|
||||
.map_err(|e| e.into())
|
||||
},
|
||||
Message::ReceiveAddress,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user