task-072

Co-authored-by: Joe Carstairs <jcarstairs@scottlogic.com>
Reviewed-on: https://git.joeac.net/joeac/schist/pulls/3
Co-authored-by: Joe Carstairs <me@joeac.net>
Co-committed-by: Joe Carstairs <me@joeac.net>

2 files changed, 22 insertions, 21 deletions

diff --git a/schist_desktop_gui/src/gui/components/balances_view/view_balances_view.rs b/schist_desktop_gui/src/gui/components/balances_view/view_balances_view.rs
index e8a1e46..6a64508 100644
--- a/schist_desktop_gui/src/gui/components/balances_view/view_balances_view.rs
+++ b/schist_desktop_gui/src/gui/components/balances_view/view_balances_view.rs
@@ -1,6 +1,7 @@
 use iced::widget::{column, row, Container};
 use iced::{alignment, Element, Length};
 
+use crate::gui::components::Text;
 use crate::gui::components::{balances_view::Message, BalancesView};
 use crate::style::SPACING_LG;
 use crate::traits::Viewable;
@@ -10,7 +11,7 @@ pub fn view_balances_view<'a>(balances_view: &'a BalancesView) -> Element<'a, Me
         .navigation
         .view()
         .map(Message::NavigationMessage);
-    let main_content = column![iced::widget::text(balances_view.greeting.clone())];
+    let main_content = column![Text::default(&balances_view.greeting).as_element()];
     row![
         Container::new(navigation).width(Length::FillPortion(1)),
         Container::new(main_content).width(Length::FillPortion(3)),
diff --git a/schist_desktop_gui/src/gui/components/balances_view/view_group_names.rs b/schist_desktop_gui/src/gui/components/balances_view/view_group_names.rs
index 271e76c..18ddf0b 100644
--- a/schist_desktop_gui/src/gui/components/balances_view/view_group_names.rs
+++ b/schist_desktop_gui/src/gui/components/balances_view/view_group_names.rs
@@ -6,7 +6,7 @@ use crate::gui::components::Text;
 pub fn view_group_names(buckets: Vec<Bucket>) -> Vec<Text> {
     buckets
         .iter()
-        .map(|b| b.group.clone())
+        .map(|b| b.group.as_str())
         .unique()
         .map(Text::new)
         .collect()
@@ -96,23 +96,23 @@ mod test {
         ];
         let group_names = view_group_names(buckets);
         assert_eq!(17, group_names.len());
-        assert_eq!(group_names[0], Text::new(String::from("hydrogen")));
-        assert_eq!(group_names[1], Text::new(String::from("helium")));
-        assert_eq!(group_names[2], Text::new(String::from("lithium")));
-        assert_eq!(group_names[3], Text::new(String::from("beryllium")));
-        assert_eq!(group_names[4], Text::new(String::from("boron")));
-        assert_eq!(group_names[5], Text::new(String::from("carbon")));
-        assert_eq!(group_names[6], Text::new(String::from("nitrogen")));
-        assert_eq!(group_names[7], Text::new(String::from("oxygen")));
-        assert_eq!(group_names[8], Text::new(String::from("flourine")));
-        assert_eq!(group_names[9], Text::new(String::from("neon")));
-        assert_eq!(group_names[10], Text::new(String::from("magnesium")));
-        assert_eq!(group_names[11], Text::new(String::from("aluminium")));
-        assert_eq!(group_names[12], Text::new(String::from("silicon")));
-        assert_eq!(group_names[13], Text::new(String::from("phosphorus")));
-        assert_eq!(group_names[14], Text::new(String::from("sulphur")));
-        assert_eq!(group_names[15], Text::new(String::from("chlorine")));
-        assert_eq!(group_names[16], Text::new(String::from("argon")));
+        assert_eq!(group_names[0], Text::new("hydrogen"));
+        assert_eq!(group_names[1], Text::new("helium"));
+        assert_eq!(group_names[2], Text::new("lithium"));
+        assert_eq!(group_names[3], Text::new("beryllium"));
+        assert_eq!(group_names[4], Text::new("boron"));
+        assert_eq!(group_names[5], Text::new("carbon"));
+        assert_eq!(group_names[6], Text::new("nitrogen"));
+        assert_eq!(group_names[7], Text::new("oxygen"));
+        assert_eq!(group_names[8], Text::new("flourine"));
+        assert_eq!(group_names[9], Text::new("neon"));
+        assert_eq!(group_names[10], Text::new("magnesium"));
+        assert_eq!(group_names[11], Text::new("aluminium"));
+        assert_eq!(group_names[12], Text::new("silicon"));
+        assert_eq!(group_names[13], Text::new("phosphorus"));
+        assert_eq!(group_names[14], Text::new("sulphur"));
+        assert_eq!(group_names[15], Text::new("chlorine"));
+        assert_eq!(group_names[16], Text::new("argon"));
     }
 
     #[test]
@@ -134,8 +134,8 @@ mod test {
         let group_names = view_group_names(buckets);
         assert_eq!(
             vec![
-                Text::new(String::from("hydrogen")),
-                Text::new(String::from("helium")),
+                Text::new("hydrogen"),
+                Text::new("helium"),
             ],
             group_names
         );