Add receive all and reply buttons + UI improvements

* Added receive all button in inbox UI that receives all non-messages.

* Added a reply button when reading a message.

* Made the accounts UI jump straight to highlighting the top account.

* Automatically jump to message input when address is pre-filled.

* Changed the location of the back button on the accounts UI to make navigation easier.

* Added a gap between <Send> and <Back> in the send UI.

Author: derfarctor

src/app/components/accounts/ui/primary.rs

@@ -18,6 +18,11 @@ pub fn show_accounts(s: &mut Cursive) {
     let prefix = data.coins[data.coin_idx].prefix.clone();
 
     let mut buttons = LinearLayout::horizontal().child(DummyView);
+    buttons.add_child(Button::new("Back", |s| {
+        s.pop_layer();
+        show_wallets(s);
+    }));
+    buttons.add_child(DummyView);
     if !wallet.mnemonic.is_empty() {
         buttons.add_child(Button::new("Show next", move |s| {
             add_account(s, None, &prefix);
@@ -35,12 +40,7 @@ pub fn show_accounts(s: &mut Cursive) {
         buttons.add_child(Button::new("Show index", add_index));
         buttons.add_child(DummyView);
         buttons.add_child(Button::new("Hide", hide_account));
-        buttons.add_child(DummyView);
     }
-    buttons.add_child(Button::new("Back", |s| {
-        s.pop_layer();
-        show_wallets(s);
-    }));
 
     let mut select = SelectView::<String>::new().on_submit(select_account);
 
@@ -97,4 +97,5 @@ pub fn show_accounts(s: &mut Cursive) {
         )
         .title(wallet_name),
     );
+    s.focus_name("accounts").unwrap();
 }

src/app/components/inbox/ui/primary.rs

@@ -9,7 +9,9 @@ use crate::app::{
         accounts::ui::primary::show_accounts,
         addressbook::ui::primary::show_addressbook,
         messages::{structs::Filter, ui::primary::show_messages},
-        receive::{load::load_receivables, ui::primary::show_receivable},
+        receive::{
+            load::load_receivables, ui::primary::show_receivable, ui::process::process_receive,
+        },
         send::ui::primary::show_send,
     },
     constants::EMPTY_MSG,
@@ -29,28 +31,6 @@ pub fn show_inbox(s: &mut Cursive) {
     let data: UserData = s.take_user_data().unwrap();
     let wallet = &data.wallets[data.wallet_idx];
     let address = wallet.accounts[wallet.acc_idx].address.clone();
-    let buttons = LinearLayout::vertical()
-        .child(Button::new("Refresh", load_receivables))
-        .child(DummyView)
-        .child(Button::new("Send", |s| show_send(s, false)))
-        .child(DummyView)
-        .child(Button::new("Messages log", |s| {
-            let filter: Filter = Default::default();
-            show_messages(s, filter);
-        }))
-        .child(Button::new("Address book", show_addressbook))
-        .child(Button::new("Copy address", move |s| {
-            copy_to_clip(s, address.clone())
-        }))
-        .child(Button::new("Change rep", show_change_rep))
-        .child(DummyView)
-        .child(Button::new("Back", show_accounts));
-
-    let select = SelectView::<String>::new()
-        .on_submit(show_receivable)
-        .with_name("select")
-        .scrollable()
-        .fixed_height(5);
 
     let bal = display_to_dp(
         wallet.accounts[wallet.acc_idx].balance,
@@ -59,39 +39,18 @@ pub fn show_inbox(s: &mut Cursive) {
         &data.coins[data.coin_idx].ticker,
     );
     let bal_text = format!("Balance: {}", bal);
-    let bal_content = TextView::new(StyledString::styled(
-        bal_text,
-        data.coins[data.coin_idx].colour,
-    ))
-    .with_name("balance");
-    s.add_layer(
-        HideableView::new(
-            Dialog::around(
-                LinearLayout::horizontal()
-                    .child(
-                        LinearLayout::vertical()
-                            .child(DummyView)
-                            .child(bal_content)
-                            .child(DummyView)
-                            .child(
-                                Dialog::around(select)
-                                    .padding_lrtb(1, 1, 1, 1)
-                                    .title("Incoming"),
-                            ),
-                    )
-                    .child(DummyView)
-                    .child(DummyView)
-                    .child(LinearLayout::vertical().child(DummyView).child(buttons)),
-            )
-            .title(format!("dagchat {}", VERSION)),
-        )
-        .with_name("hideable"),
+    let top_content = LinearLayout::horizontal().child(
+        TextView::new(StyledString::styled(
+            bal_text,
+            data.coins[data.coin_idx].colour,
+        ))
+        .with_name("balance"),
     );
+    let mut select = SelectView::<String>::new().on_submit(show_receivable);
 
+    let mut has_non_msg = false;
     if wallet.accounts[wallet.acc_idx].receivables.is_empty() {
-        s.call_on_name("select", |view: &mut SelectView<String>| {
-            view.add_item_str(EMPTY_MSG);
-        });
+        select.add_item_str(EMPTY_MSG);
     } else {
         for receivable in &wallet.accounts[wallet.acc_idx].receivables {
             let mut tag;
@@ -106,6 +65,8 @@ pub fn show_inbox(s: &mut Cursive) {
                 );
                 if receivable.message.is_some() {
                     tag = format!("{} + Msg", tag);
+                } else {
+                    has_non_msg = true;
                 }
             }
             let mut source_parts: Vec<&str> = receivable.source.split('_').collect();
@@ -116,11 +77,57 @@ pub fn show_inbox(s: &mut Cursive) {
                 receivable.source.get(0..11).unwrap()
             };
             tag = format!("{} > {}", addr, tag);
-            s.call_on_name("select", |view: &mut SelectView<String>| {
-                view.add_item_str(&tag)
-            });
+            select.add_item_str(&tag)
         }
     }
 
+    let mut receive_all =
+        HideableView::new(Button::new("Receive all", |s| process_receive(s, 0, true)));
+    if !has_non_msg {
+        receive_all.set_visible(false);
+    }
+    let buttons = LinearLayout::vertical()
+        .child(Button::new("Refresh", load_receivables))
+        .child(DummyView)
+        .child(Button::new("Send", |s| show_send(s, false)))
+        .child(receive_all.with_name("receiveall"))
+        .child(DummyView)
+        .child(Button::new("Messages log", |s| {
+            let filter: Filter = Default::default();
+            show_messages(s, filter);
+        }))
+        .child(Button::new("Address book", show_addressbook))
+        .child(Button::new("Copy address", move |s| {
+            copy_to_clip(s, address.clone())
+        }))
+        .child(Button::new("Change rep", show_change_rep))
+        .child(DummyView)
+        .child(Button::new("Back", show_accounts));
+
     s.set_user_data(data);
+    s.add_layer(
+        HideableView::new(
+            Dialog::around(
+                LinearLayout::horizontal()
+                    .child(
+                        LinearLayout::vertical()
+                            .child(DummyView)
+                            .child(top_content)
+                            .child(DummyView)
+                            .child(
+                                Dialog::around(
+                                    select.with_name("select").scrollable().fixed_height(5),
+                                )
+                                .padding_lrtb(1, 1, 1, 1)
+                                .title("Incoming"),
+                            ),
+                    )
+                    .child(DummyView)
+                    .child(DummyView)
+                    .child(LinearLayout::vertical().child(DummyView).child(buttons)),
+            )
+            .title(format!("dagchat {}", VERSION)),
+        )
+        .with_name("hideable"),
+    );
 }

src/app/components/receive/ui/primary.rs

@@ -1,5 +1,6 @@
 use super::process::process_receive;
 use crate::app::components::messages::readmessage::read_message;
+use crate::app::components::send::ui::primary::show_send;
 use crate::app::constants::colours::RED;
 use crate::app::constants::EMPTY_MSG;
 use crate::app::{
@@ -9,9 +10,9 @@ use crate::app::{
     userdata::UserData,
 };
 use crate::crypto::conversions::display_to_dp;
-use cursive::views::{Dialog, DummyView, LinearLayout, SelectView, TextView};
+use cursive::views::{Dialog, DummyView, LinearLayout, SelectView, TextArea, TextView};
 use cursive::{
-    traits::{Resizable, Scrollable},
+    traits::{Nameable, Resizable, Scrollable},
     utils::markup::StyledString,
     Cursive,
 };
@@ -55,7 +56,8 @@ pub fn show_receivable(s: &mut Cursive, _name: &str) {
                         plaintext = plaintext_res;
                         message.plaintext = plaintext.clone();
                     } else {
-                       plaintext = format!("Failed to read message. Error: {}", read_res.err().unwrap());  
+                        plaintext =
+                            format!("Failed to read message. Error: {}", read_res.err().unwrap());
                         receivable.message = None;
                     }
                 } else {
@@ -95,6 +97,7 @@ pub fn show_receivable(s: &mut Cursive, _name: &str) {
             let source_suffix = String::from('_') + source_parts.pop().unwrap();
 
             let sender = receivable.source.clone();
+            let sender2 = receivable.source.clone();
 
             let from = if data.addressbook.contains_key(&source_suffix) {
                 data.addressbook.get(&source_suffix).unwrap()
@@ -103,15 +106,21 @@ pub fn show_receivable(s: &mut Cursive, _name: &str) {
             };
             content.add_child(TextView::new(StyledString::styled("From", colour)));
             content.add_child(TextView::new(StyledString::styled(from, OFF_WHITE)).fixed_width(65));
-            s.add_layer(
-                Dialog::around(content)
-                    .button(receive_label, move |s| {
-                        process_receive(s, focus);
-                    })
-                    .button("Copy address", move |s| copy_to_clip(s, sender.clone()))
-                    .button("Back", go_back)
-                    .title(title),
-            );
+            let mut main_view = Dialog::around(content).button(receive_label, move |s| {
+                process_receive(s, focus, false);
+            });
+            if receivable.message.is_some() {
+                main_view.add_button("Reply", move |s| {
+                    s.pop_layer();
+                    s.pop_layer();
+                    s.add_layer(TextArea::new().content(&sender2).with_name("address"));
+                    show_send(s, true);
+                });
+            }
+            main_view.add_button("Copy address", move |s| copy_to_clip(s, sender.clone()));
+            main_view.add_button("Back", go_back);
+            main_view.set_title(title);
+            s.add_layer(main_view);
         }
     }
 }

src/app/components/receive/ui/process.rs

@@ -8,18 +8,30 @@ use crate::app::{
     userdata::UserData,
 };
 use crate::crypto::conversions::display_to_dp;
-use cursive::views::{Dialog, ProgressBar, SelectView, TextView};
+use cursive::views::{Button, Dialog, HideableView, ProgressBar, SelectView, TextView};
 use cursive::{traits::Resizable, utils::markup::StyledString, Cursive};
 use std::time::SystemTime;
 
-pub fn process_receive(s: &mut Cursive, idx: usize) {
+pub fn process_receive(s: &mut Cursive, mut idx: usize, all: bool) {
     let data = &s.user_data::<UserData>().unwrap();
     let wallet = &data.wallets[data.wallet_idx];
     let account = &wallet.accounts[wallet.acc_idx];
     let private_key = account.private_key;
+    if all {
+        let non_msg_idx = account.receivables.iter().position(|r| r.message.is_none());
+        if let Some(non_msg_idx) = non_msg_idx {
+            idx = non_msg_idx;
+        } else {
+            s.set_autorefresh(false);
+            s.call_on_name("receiveall", |view: &mut HideableView<Button>| {
+                view.set_visible(false);
+            })
+            .unwrap();
+            return;
+        }
+    }
     let receivable = &account.receivables[idx];
     let send_block_hash = receivable.hash.clone();
-
     let amount = receivable.amount;
     let address = account.address.clone();
     let coin = data.coins[data.coin_idx].clone();
@@ -101,7 +113,12 @@ pub fn process_receive(s: &mut Cursive, idx: usize) {
                         data.coins[data.coin_idx].colour,
                     ));
                     s.pop_layer();
-                    s.pop_layer();
+                    if all {
+                        return process_receive(s, 0, all);
+                    } else {
+                        s.pop_layer();
+                        s.set_autorefresh(false);
+                    }
                     if save_res.is_err() {
                         s.add_layer(
                             Dialog::info(StyledString::styled(save_res.err().unwrap(), RED))

src/app/components/send/ui/primary.rs

@@ -62,7 +62,7 @@ pub fn show_send(s: &mut Cursive, with_message: bool) {
     let mut address_entry = TextArea::new();
     address_entry.set_cursor(address.len());
     let address_entry = address_entry
-        .content(address)
+        .content(&address)
         .with_name("address")
         .max_width(68);
 
@@ -201,6 +201,7 @@ pub fn show_send(s: &mut Cursive, with_message: bool) {
                 }
                 process_send(s, raw, address, message);
             }))
+            .child(DummyView)
             .child(Button::new("Back", show_inbox))
             .child(DummyView)
             .child(DummyView)
@@ -216,4 +217,7 @@ pub fn show_send(s: &mut Cursive, with_message: bool) {
         )
         .with_name("hideable"),
     );
+    if !address.is_empty() && with_message {
+        s.focus_name("message").unwrap();
+    }
 }

src/app/components/settings/ui/primary.rs

@@ -81,7 +81,7 @@ pub fn show_settings(s: &mut Cursive) {
                         })
                         .unwrap();
                         let test = test_work_server(&work_server_url);
-                        if let Ok(_) = test {
+                        if test.is_ok() {
                             s.add_layer(Dialog::info(StyledString::styled(
                                 "Communicated successfully with work server.",
                                 colour,

src/app/constants.rs

@@ -1,4 +1,4 @@
-pub const VERSION: &str = "v1.2.1";
+pub const VERSION: &str = "v1.3.0";
 pub const SHOW_TO_DP: usize = 12;
 pub const AUTHOR: &str = "derfarctor (Author)";
 pub const AUTHOR_ADDR: &str = "_3kpznqbuzs3grswcqkzitd5fwky4s5cmyt76wru7kbenfwza7q9c1f1egzhm";

src/crypto/blocks.rs

@@ -77,7 +77,7 @@ pub fn get_signed_block(
                 &coin.network.send_thresh
             };
 
-            get_server_work(previous_hash, &threshold, &coin.network.work_server_url)?
+            get_server_work(previous_hash, threshold, &coin.network.work_server_url)?
         }
     } else if work_type == WorkType::BOOMPOW {
         String::from("")