feat(Messages): Adds copy text option to message context menu (#1490)

Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com> Co-authored-by: Sara Tavares <29093946+stavares843@users.noreply.github.com>
Satellite-im · Nov 9, 2023 · f11d18e · f11d18e
1 parent fce92d6
commit f11d18e
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/common/locales/en-US/main.ftl b/common/locales/en-US/main.ftl
@@ -42,6 +42,7 @@ uplink = Uplink
     .date-time-format = %d/%m/%Y %I:%M %p
     .open-devtools = Open Console
     .clear-unreads = Clear Unreads
+    .copy-text = Copy Text
     
 community = Community
     .invited = You're Invited!

diff --git a/ui/src/components/friends/add.rs b/ui/src/components/friends/add.rs
@@ -72,8 +72,16 @@ pub fn AddFriend(cx: Scope) -> Element {
     }
 
     if let Some(id) = my_id.get().clone() {
-        let mut clipboard = Clipboard::new().unwrap();
-        clipboard.set_text(id).unwrap();
+        match Clipboard::new() {
+            Ok(mut c) => {
+                if let Err(e) = c.set_text(id) {
+                    log::warn!("Unable to set text to clipboard: {e}");
+                }
+            }
+            Err(e) => {
+                log::warn!("Unable to create clipboard reference: {e}");
+            }
+        };
         state
             .write()
             .mutate(Action::AddToastNotification(ToastNotification::init(

diff --git a/ui/src/components/settings/sub_pages/profile/mod.rs b/ui/src/components/settings/sub_pages/profile/mod.rs
@@ -322,8 +322,16 @@ pub fn ProfileSettings(cx: Scope) -> Element {
                                     }
                                 )),
                                 onpress: move |_| {
-                                    let mut clipboard = Clipboard::new().unwrap();
-                                    clipboard.set_text(did_string.clone()).unwrap();
+                                    match Clipboard::new() {
+                                        Ok(mut c) => {
+                                            if let Err(e) = c.set_text(did_string.clone()) {
+                                                log::warn!("Unable to set text to clipboard: {e}");
+                                            }
+                                        },
+                                        Err(e) => {
+                                            log::warn!("Unable to create clipboard reference: {e}");
+                                        }
+                                    };
                                     state
                                         .write()
                                         .mutate(Action::AddToastNotification(ToastNotification::init(

diff --git a/ui/src/extension_browser/mod.rs b/ui/src/extension_browser/mod.rs
@@ -115,7 +115,7 @@ pub fn ExtensionsBrowser(cx: Scope) -> Element {
     let routes = vec![
         Route {
             name: get_local_text("settings-extensions.installed"),
-            icon: Icon::CheckCircle,
+            icon: Icon::Check,
             to: "installed",
             ..Default::default()
         },

diff --git a/ui/src/layouts/chats/presentation/messages/mod.rs b/ui/src/layouts/chats/presentation/messages/mod.rs
@@ -4,6 +4,7 @@ use std::{
     path::PathBuf,
 };
 
+use arboard::Clipboard;
 use dioxus::prelude::{EventHandler, *};
 
 mod coroutines;
@@ -399,6 +400,24 @@ fn wrap_messages_in_context_menu<'a>(cx: Scope<'a, MessagesProps<'a>>) -> Elemen
                         state.write().mutate(Action::SetEmojiPickerVisible(true));
                     }
                 },
+                ContextItem {
+                    icon: Icon::ClipboardDocument,
+                    aria_label: "messages-copy".into(),
+                    text: get_local_text("uplink.copy-text"),
+                    onpress: move |_| {
+                        let text = message.inner.lines().join("\n");
+                        match Clipboard::new() {
+                            Ok(mut c) => {
+                                if let Err(e) = c.set_text(text) {
+                                    log::warn!("Unable to set text to clipboard: {e}");
+                                }
+                            }
+                            Err(e) => {
+                                log::warn!("Unable to create clipboard reference: {e}");
+                            }
+                        };
+                    }
+                },
                 ContextItem {
                     icon: Icon::Pencil,
                     aria_label: "messages-edit".into(),