Cleaning up modals for platform consistency

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -949,11 +949,20 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             block(deleteThread = true)
         }
         binding.declineMessageRequestButton.setOnClickListener {
-            viewModel.declineMessageRequest()
-            lifecycleScope.launch(Dispatchers.IO) {
-                ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@ConversationActivityV2)
+            fun doDecline() {
+                viewModel.declineMessageRequest()
+                lifecycleScope.launch(Dispatchers.IO) {
+                    ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(this@ConversationActivityV2)
+                }
+                finish()
+            }
+
+            showSessionDialog {
+                title(R.string.delete)
+                text(resources.getString(R.string.messageRequestsDelete))
+                dangerButton(R.string.delete) { doDecline() }
+                button(R.string.cancel)
             }
-            finish()
         }
     }
 

app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsActivity.kt

@@ -108,7 +108,7 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
         showSessionDialog {
             title(R.string.delete)
             text(resources.getString(R.string.messageRequestsDelete))
-            button(R.string.delete) { doDecline() }
+            dangerButton(R.string.delete) { doDecline() }
             button(R.string.cancel)
         }
     }
@@ -129,9 +129,10 @@ class MessageRequestsActivity : PassphraseRequiredActionBarActivity(), Conversat
         }
 
         showSessionDialog {
+            title(resources.getString(R.string.clearAll))
             text(resources.getString(R.string.messageRequestsClearAllExplanation))
-            button(R.string.yes) { doDeleteAllAndBlock() }
-            button(R.string.no)
+            dangerButton(R.string.clear) { doDeleteAllAndBlock() }
+            button(R.string.cancel)
         }
     }
 }