Merge pull request #953 from radixdlt/fix/ABW-3380-seed-phrases-desig…

…n-tweaks

Update position and color of warnings on seed phrases screen

app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/mnemonic/AddSingleMnemonicScreen.kt

@@ -54,11 +54,11 @@ import com.babylon.wallet.android.presentation.ui.composables.DSR
 import com.babylon.wallet.android.presentation.ui.composables.InfoLink
 import com.babylon.wallet.android.presentation.ui.composables.RadixCenteredTopAppBar
 import com.babylon.wallet.android.presentation.ui.composables.RadixSnackbarHost
-import com.babylon.wallet.android.presentation.ui.composables.RedWarningText
 import com.babylon.wallet.android.presentation.ui.composables.SecureScreen
 import com.babylon.wallet.android.presentation.ui.composables.SeedPhraseInputForm
 import com.babylon.wallet.android.presentation.ui.composables.SeedPhraseSuggestions
 import com.babylon.wallet.android.presentation.ui.composables.SnackbarUIMessage
+import com.babylon.wallet.android.presentation.ui.composables.WarningText
 import com.babylon.wallet.android.utils.BiometricAuthenticationResult
 import com.babylon.wallet.android.utils.biometricAuthenticate
 import com.radixdlt.sargon.Bip39WordCount
@@ -319,7 +319,7 @@ private fun SeedPhraseView(
 
  if (shouldDisplayInvalidSeedPhraseWarning) {
  Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingDefault))
- RedWarningText(
+ WarningText(
  modifier = Modifier.fillMaxWidth(),
  text = AnnotatedString(stringResource(R.string.importMnemonic_checksumFailure))
  )

app/src/main/java/com/babylon/wallet/android/presentation/onboarding/restore/mnemonics/RestoreMnemonicsScreen.kt

@@ -54,12 +54,12 @@ import com.babylon.wallet.android.designsystem.theme.RadixWalletTheme
 import com.babylon.wallet.android.presentation.ui.composables.InfoLink
 import com.babylon.wallet.android.presentation.ui.composables.RadixCenteredTopAppBar
 import com.babylon.wallet.android.presentation.ui.composables.RadixSnackbarHost
-import com.babylon.wallet.android.presentation.ui.composables.RedWarningText
 import com.babylon.wallet.android.presentation.ui.composables.SecureScreen
 import com.babylon.wallet.android.presentation.ui.composables.SeedPhraseInputForm
 import com.babylon.wallet.android.presentation.ui.composables.SeedPhraseSuggestions
 import com.babylon.wallet.android.presentation.ui.composables.SimpleAccountCard
 import com.babylon.wallet.android.presentation.ui.composables.SnackbarUIMessage
+import com.babylon.wallet.android.presentation.ui.composables.WarningText
 import com.babylon.wallet.android.utils.biometricAuthenticateSuspend
 import com.babylon.wallet.android.utils.formattedSpans
 import com.radixdlt.sargon.Account
@@ -435,7 +435,7 @@ private fun SeedPhraseView(
  }
  if (shouldDisplaySeedPhraseWarning) {
  Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingDefault))
- RedWarningText(
+ WarningText(
  modifier = Modifier.fillMaxWidth(),
  text = AnnotatedString(stringResource(R.string.importMnemonic_checksumFailure))
  )

app/src/main/java/com/babylon/wallet/android/presentation/settings/securitycenter/seedphrases/SeedPhrasesScreen.kt

@@ -34,8 +34,8 @@ import com.babylon.wallet.android.presentation.ui.composables.DSR
 import com.babylon.wallet.android.presentation.ui.composables.GrayBackgroundWrapper
 import com.babylon.wallet.android.presentation.ui.composables.InfoLink
 import com.babylon.wallet.android.presentation.ui.composables.RadixCenteredTopAppBar
-import com.babylon.wallet.android.presentation.ui.composables.RedWarningText
 import com.babylon.wallet.android.presentation.ui.composables.SimpleAccountCard
+import com.babylon.wallet.android.presentation.ui.composables.WarningText
 import com.babylon.wallet.android.presentation.ui.modifier.throttleClickable
 import com.babylon.wallet.android.utils.BiometricAuthenticationResult
 import com.babylon.wallet.android.utils.biometricAuthenticate
@@ -162,7 +162,6 @@ fun SeedPhraseCard(
  val mnemonicNeedsRecovery = data.mnemonicState == DeviceFactorSourceData.MnemonicState.NeedRecover
  Column(
  modifier = modifier,
- horizontalAlignment = Alignment.CenterHorizontally,
  verticalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingSmall)
  ) {
  Row(
@@ -171,9 +170,9 @@ fun SeedPhraseCard(
  horizontalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingMedium)
  ) {
  val icon = if (mnemonicNeedsRecovery) DSR.ic_warning_error else DSR.ic_seed_phrases
- val tint = if (mnemonicNeedsRecovery) RadixTheme.colors.red1 else RadixTheme.colors.gray1
+ val tint = if (mnemonicNeedsRecovery) RadixTheme.colors.orange1 else RadixTheme.colors.gray1
  val text = if (mnemonicNeedsRecovery) {
- stringResource(id = R.string.securityProblems_no9_securityCenterBody)
+ stringResource(id = R.string.securityProblems_no9_securityFactors)
  } else {
  stringResource(id = R.string.displayMnemonics_cautionAlert_revealButtonLabel)
  }
@@ -223,7 +222,10 @@ fun SeedPhraseCard(
  }
  if (data.mnemonicState == DeviceFactorSourceData.MnemonicState.NotBackedUp) {
  Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
- RedWarningText(text = AnnotatedString(stringResource(id = R.string.securityProblems_no3_seedPhrases)))
+ WarningText(
+ text = AnnotatedString(stringResource(id = R.string.securityProblems_no3_seedPhrases)),
+ contentColor = RadixTheme.colors.orange1
+ )
  }
  Spacer(modifier = Modifier.height(RadixTheme.dimensions.paddingXSmall))
  data.accounts.forEach { account ->

app/src/main/java/com/babylon/wallet/android/presentation/settings/troubleshooting/importlegacywallet/ImportLegacyWalletScreen.kt

@@ -87,12 +87,12 @@ import com.babylon.wallet.android.presentation.ui.composables.InfoLink
 import com.babylon.wallet.android.presentation.ui.composables.LedgerListItem
 import com.babylon.wallet.android.presentation.ui.composables.RadixCenteredTopAppBar
 import com.babylon.wallet.android.presentation.ui.composables.RadixSnackbarHost
-import com.babylon.wallet.android.presentation.ui.composables.RedWarningText
 import com.babylon.wallet.android.presentation.ui.composables.SecureScreen
 import com.babylon.wallet.android.presentation.ui.composables.SeedPhraseInputForm
 import com.babylon.wallet.android.presentation.ui.composables.SeedPhraseSuggestions
 import com.babylon.wallet.android.presentation.ui.composables.SimpleAccountCard
 import com.babylon.wallet.android.presentation.ui.composables.SnackbarUIMessage
+import com.babylon.wallet.android.presentation.ui.composables.WarningText
 import com.babylon.wallet.android.presentation.ui.modifier.applyIf
 import com.babylon.wallet.android.utils.BiometricAuthenticationResult
 import com.babylon.wallet.android.utils.biometricAuthenticate
@@ -842,7 +842,7 @@ private fun VerifyWithYourSeedPhrasePage(
  seedPhraseInputState.shouldDisplayInvalidSeedPhraseWarning()
  }
  if (shouldDisplayInvalidSeedPhraseWarning) {
- RedWarningText(
+ WarningText(
  modifier = Modifier
  .fillMaxWidth()
  .padding(vertical = RadixTheme.dimensions.paddingDefault),

app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/RedWarningText.kt → app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/WarningText.kt

@@ -6,14 +6,16 @@ import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import com.babylon.wallet.android.designsystem.theme.RadixTheme
 
 @Composable
-fun RedWarningText(
+fun WarningText(
  modifier: Modifier = Modifier,
- text: AnnotatedString
+ text: AnnotatedString,
+ contentColor: Color = RadixTheme.colors.red1
 ) {
  Row(
  modifier = modifier,
@@ -25,12 +27,12 @@ fun RedWarningText(
  id = com.babylon.wallet.android.designsystem.R.drawable.ic_warning_error
  ),
  contentDescription = null,
- tint = RadixTheme.colors.red1
+ tint = contentColor
  )
  androidx.compose.material3.Text(
  text = text,
  style = RadixTheme.typography.body1StandaloneLink,
- color = RadixTheme.colors.red1
+ color = contentColor
  )
  }
 }

app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/persona/RequiredPersonaInformationInfo.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.withStyle
 import com.babylon.wallet.android.R
 import com.babylon.wallet.android.presentation.model.toDisplayResource
-import com.babylon.wallet.android.presentation.ui.composables.RedWarningText
+import com.babylon.wallet.android.presentation.ui.composables.WarningText
 import kotlinx.collections.immutable.ImmutableList
 import rdx.works.core.sargon.PersonaDataField
 
@@ -25,7 +25,7 @@ fun RequiredPersonaInformationInfo(
  }
  append(requiredFields.map { stringResource(id = it.toDisplayResource()) }.joinToString())
  }
- RedWarningText(
+ WarningText(
  modifier = modifier,
  text = finalText
  )