Merge branch 'dev' into fix-camera-on-calls

Satellite-im · Dec 18, 2024 · dfdc282 · dfdc282
2 parents 8ae506b + 4347185
commit dfdc282
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/lib/lang/en.json b/src/lib/lang/en.json
@@ -162,6 +162,7 @@
         "request_sent": "You sent a request for {amount}"
     },
     "friends": {
+        "copy": "Copy",
         "copy_did": "Copy ID",
         "block": "Block",
         "blocked": "Blocked",
@@ -170,9 +171,10 @@
         "all": "All",
         "active": "Active",
         "add": "Add",
+        "add_friend": "Add Friend",
         "add_someone": "Add Someone",
         "search_friends_placeholder": "Search friends",
-        "find_placeholder": "Enter Friend ID",
+        "find_placeholder": "Enter Friend DID",
         "incoming_requests": "Incoming Requests",
         "outgoing_requests": "Outgoing Requests",
         "noOutgoing": "No outbound requests.",

diff --git a/src/routes/friends/+page.svelte b/src/routes/friends/+page.svelte
@@ -260,7 +260,9 @@
                         bind:value={requestString}>
                         <Icon icon={Shape.Search} />
                     </Input>
-                    <Button hook="button-add-friend" disabled={!isValidFriendDid} appearance={Appearance.Alt} text={$_("friends.add")} on:click={submitRequest}>
+                </div>
+                <div class="section" data-cy="friends-section-all-buttons">
+                    <Button hook="button-add-friend" disabled={!isValidFriendDid} appearance={Appearance.Alt} text={$_("friends.add")} tooltip={$_("friends.add_friend")} on:click={submitRequest}>
                         <Icon icon={Shape.Plus} />
                     </Button>
                     <ContextMenu
@@ -281,7 +283,7 @@
                                 onClick: async () => await copy_did(false),
                             },
                         ]}>
-                        <Button hook="button-copy-id" slot="content" appearance={Appearance.Alt} icon tooltip={$_("friends.copy_did")} let:open on:contextmenu={open} on:click={async _ => await copy_did(false)}>
+                        <Button hook="button-copy-id" slot="content" appearance={Appearance.Alt} text={$_("friends.copy")} tooltip={$_("friends.copy_did")} let:open on:contextmenu={open} on:click={async _ => await copy_did(false)}>
                             <Icon icon={Shape.Clipboard} />
                         </Button>
                     </ContextMenu>