Hide set button when disabled

app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettings.kt

@@ -67,7 +67,7 @@ fun DisappearingMessages(
             }
         }
 
-        OutlineButton(
+        if (state.showSetButton) OutlineButton(
             stringResource(R.string.expiration_settings_set_button_title),
             modifier = Modifier
                 .align(Alignment.CenterHorizontally)

app/src/main/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModel.kt

@@ -182,17 +182,27 @@ class ExpirationSettingsViewModel(
 
 data class UiState(
     val cards: List<CardModel> = emptyList(),
-    val showGroupFooter: Boolean = false
+    val showGroupFooter: Boolean = false,
+    val showSetButton: Boolean = true
 ) {
     constructor(state: State): this(
         cards = listOfNotNull(
             typeOptions(state)?.let { CardModel(GetString(R.string.activity_expiration_settings_delete_type), it) },
             timeOptions(state)?.let { CardModel(GetString(R.string.activity_expiration_settings_timer), it) }
         ),
-        showGroupFooter = state.isGroup && state.isNewConfigEnabled
+        showGroupFooter = state.isGroup && state.isNewConfigEnabled,
+        showSetButton = state.isSelfAdmin
     )
 
-    constructor(showGroupFooter: Boolean, vararg cards: CardModel): this(cards.asList(), showGroupFooter)
+    constructor(
+        vararg cards: CardModel,
+        showGroupFooter: Boolean = false,
+        showSetButton: Boolean = true,
+    ): this(
+        cards.asList(),
+        showGroupFooter,
+        showSetButton
+    )
 }
 
 data class CardModel(

app/src/test/java/org/thoughtcrime/securesms/conversation/expiration/ExpirationSettingsViewModelTest.kt

@@ -83,7 +83,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = false,
                 CardModel(
                     R.string.activity_expiration_settings_timer,
                     typeOption(ExpiryMode.NONE, selected = true),
@@ -123,7 +122,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = false,
                 CardModel(
                     R.string.activity_expiration_settings_timer,
                     typeOption(ExpiryMode.NONE, selected = true),
@@ -137,7 +135,7 @@ class ExpirationSettingsViewModelTest {
     }
 
     @Test
-    fun `group, off, not admin, new config`() = runTest {
+    fun `group, off, admin, new config`() = runTest {
         mockGroup(ExpiryMode.NONE)
 
         val viewModel = createViewModel()
@@ -163,7 +161,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = true,
                 CardModel(
                     R.string.activity_expiration_settings_timer,
                     typeOption(ExpiryMode.NONE, enabled = false, selected = true),
@@ -171,7 +168,50 @@ class ExpirationSettingsViewModelTest {
                     timeOption(ExpiryType.AFTER_SEND, 1.days, enabled = false),
                     timeOption(ExpiryType.AFTER_SEND, 7.days, enabled = false),
                     timeOption(ExpiryType.AFTER_SEND, 14.days, enabled = false)
+                ),
+                showGroupFooter = true,
+                showSetButton = false
+            )
         )
+    }
+
+    @Test
+    fun `group, off, not admin, new config`() = runTest {
+        mockGroup(ExpiryMode.NONE)
+
+        val viewModel = createViewModel()
+
+        advanceUntilIdle()
+
+        assertThat(
+            viewModel.state.value
+        ).isEqualTo(
+            State(
+                isGroup = true,
+                isSelfAdmin = false,
+                address = GROUP_ADDRESS,
+                isNoteToSelf = false,
+                expiryMode = ExpiryMode.NONE,
+                isNewConfigEnabled = true,
+                persistedMode = ExpiryMode.NONE,
+                showDebugOptions = false
+            )
+        )
+
+        assertThat(
+            viewModel.uiState.value
+        ).isEqualTo(
+            UiState(
+                CardModel(
+                    R.string.activity_expiration_settings_timer,
+                    typeOption(ExpiryMode.NONE, enabled = false, selected = true),
+                    timeOption(ExpiryType.AFTER_SEND, 12.hours, enabled = false),
+                    timeOption(ExpiryType.AFTER_SEND, 1.days, enabled = false),
+                    timeOption(ExpiryType.AFTER_SEND, 7.days, enabled = false),
+                    timeOption(ExpiryType.AFTER_SEND, 14.days, enabled = false)
+                ),
+                showGroupFooter = true,
+                showSetButton = false,
             )
         )
     }
@@ -204,7 +244,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = false,
                 CardModel(
                     R.string.activity_expiration_settings_delete_type,
                     typeOption(ExpiryMode.NONE, selected = true),
@@ -244,7 +283,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = false,
                 CardModel(
                     R.string.activity_expiration_settings_delete_type,
                     typeOption(ExpiryMode.NONE),
@@ -291,7 +329,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = false,
                 CardModel(
                     R.string.activity_expiration_settings_delete_type,
                     typeOption(ExpiryMode.NONE),
@@ -339,7 +376,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = false,
                 CardModel(
                     R.string.activity_expiration_settings_delete_type,
                     typeOption(ExpiryMode.NONE),
@@ -387,7 +423,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = false,
                 CardModel(
                     R.string.activity_expiration_settings_delete_type,
                     typeOption(ExpiryMode.NONE),
@@ -441,7 +476,6 @@ class ExpirationSettingsViewModelTest {
             viewModel.uiState.value
         ).isEqualTo(
             UiState(
-                showGroupFooter = false,
                 CardModel(
                     R.string.activity_expiration_settings_delete_type,
                     typeOption(ExpiryMode.NONE),