Skip to content

Commit 7c0baef

Browse files
committed
Merge branch 'reset-to-default-inconsistency-droid-764'
2 parents ab1424d + a69b261 commit 7c0baef

File tree

2 files changed

+9
-5
lines changed
  • android/app/src

2 files changed

+9
-5
lines changed

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialogTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ class MtuDialogTest {
125125
val mockedClickHandler: () -> Unit = mockk(relaxed = true)
126126
setContentWithTheme {
127127
testMtuDialog(
128+
mtuInitial = VALID_DUMMY_MTU_VALUE,
128129
onResetMtu = mockedClickHandler,
129130
)
130131
}

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt

+8-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator
1818
import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
1919
import com.ramcosta.composedestinations.spec.DestinationStyle
2020
import net.mullvad.mullvadvpn.R
21+
import net.mullvad.mullvadvpn.compose.button.NegativeButton
2122
import net.mullvad.mullvadvpn.compose.button.PrimaryButton
2223
import net.mullvad.mullvadvpn.compose.textfield.MtuTextField
2324
import net.mullvad.mullvadvpn.compose.util.LaunchedEffectCollect
@@ -119,11 +120,13 @@ fun MtuDialog(
119120
}
120121
)
121122

122-
PrimaryButton(
123-
modifier = Modifier.fillMaxWidth(),
124-
text = stringResource(R.string.reset_to_default_button),
125-
onClick = onResetMtu
126-
)
123+
if (mtuInitial != null) {
124+
NegativeButton(
125+
modifier = Modifier.fillMaxWidth(),
126+
text = stringResource(R.string.reset_to_default_button),
127+
onClick = onResetMtu
128+
)
129+
}
127130

128131
PrimaryButton(
129132
modifier = Modifier.fillMaxWidth(),

0 commit comments

Comments
 (0)