chore(fc): update message context action sheet ordering and copy

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt

@@ -979,6 +979,23 @@ class ConversationViewModel @Inject constructor(
         enableTip: Boolean,
     ): List<MessageControlAction> {
         return mutableListOf<MessageControlAction>().apply {
+            if (enableReply) {
+                add(
+                    MessageControlAction.Reply {
+                        val sender = Sender(
+                            id = message.senderId,
+                            profileImage = member?.imageUri.takeIf { it.orEmpty().isNotEmpty() },
+                            displayName = member?.memberName ?: "Deleted",
+                            isSelf = contents.isFromSelf,
+                            isHost = message.senderId == stateFlow.value.hostId && !contents.isFromSelf,
+                            isBlocked = member?.isBlocked == true
+                        )
+                        val anchor = MessageReplyAnchor(message.id, sender, contents)
+                        dispatchEvent(Event.ReplyTo(anchor))
+                    }
+                )
+            }
+
             if (enableTip) {
                 add(
                     MessageControlAction.Tip {
@@ -999,23 +1016,6 @@ class ConversationViewModel @Inject constructor(
                     )
                 }
             )
-
-            if (enableReply) {
-                add(
-                    MessageControlAction.Reply {
-                        val sender = Sender(
-                            id = message.senderId,
-                            profileImage = member?.imageUri.takeIf { it.orEmpty().isNotEmpty() },
-                            displayName = member?.memberName ?: "Deleted",
-                            isSelf = contents.isFromSelf,
-                            isHost = message.senderId == stateFlow.value.hostId && !contents.isFromSelf,
-                            isBlocked = member?.isBlocked == true
-                        )
-                        val anchor = MessageReplyAnchor(message.id, sender, contents)
-                        dispatchEvent(Event.ReplyTo(anchor))
-                    }
-                )
-            }
         } + buildSelfDefenseControls(message, member, contents)
     }
 

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/MessageActionContextSheet.kt

@@ -93,7 +93,7 @@ internal data class MessageActionContextSheet(val actions: List<MessageControlAc
                             )
 
                             is MessageControlAction.Reply -> stringResource(R.string.action_reply)
-                            is MessageControlAction.Tip -> stringResource(R.string.action_tipUser)
+                            is MessageControlAction.Tip -> stringResource(R.string.action_giveTip)
                         },
                         style = CodeTheme.typography.textMedium.copy(
                             color = if (action.isDestructive) CodeTheme.colors.errorText else CodeTheme.colors.textMain

flipchatApp/src/main/res/values/strings.xml

@@ -131,7 +131,7 @@
 
     <string name="permissions_description_push_messages">Receive push notifications when people message you.</string>
 
-    <string name="action_copyMessage">Copy</string>
+    <string name="action_copyMessage">Copy Message</string>
     <string name="action_deleteMessage">Delete</string>
     <string name="action_blockUser">Block User</string>
     <string name="action_blockUserByName">Block %1$s</string>
@@ -202,7 +202,7 @@
     <string name="prompt_description_logout">You will need to enter your Access Key to get back into this account</string>
 
     <string name="action_reply">Reply</string>
-    <string name="action_tipUser">Tip User</string>
+    <string name="action_giveTip">Give Tip</string>
 
     <string name="title_betaFlags">Labs</string>