From bfe484b63cfa2961910790728d8e1ec6d1463522 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 9 Nov 2023 15:03:45 +0100
Subject: [PATCH] Onboarding iteration #1776

---
 .../features/ftue/impl/welcome/WelcomeView.kt    | 16 +++-------------
 .../ftue/impl/src/main/res/values/localazy.xml   |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt
index cef0529fb8..3deb7cd0b0 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt
@@ -45,6 +45,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.theme.ElementTheme
@@ -79,14 +80,7 @@ fun WelcomeView(
                     color = ElementTheme.colors.textPrimary,
                     textAlign = TextAlign.Center,
                 )
-                Spacer(modifier = Modifier.height(8.dp))
-                Text(
-                    text = stringResource(R.string.screen_welcome_subtitle),
-                    style = ElementTheme.typography.fontBodyMdRegular,
-                    color = ElementTheme.colors.textPrimary,
-                    textAlign = TextAlign.Center,
-                )
-                Spacer(modifier = Modifier.height(40.dp))
+                Spacer(modifier = Modifier.height(80.dp))
                 InfoListOrganism(
                     items = listItems(),
                     textStyle = ElementTheme.typography.fontBodyMdMedium,
@@ -109,17 +103,13 @@ fun WelcomeView(
 
 @Composable
 private fun listItems() = persistentListOf(
-    InfoListItem(
-        message = stringResource(R.string.screen_welcome_bullet_1),
-        iconVector = Icons.Outlined.NewReleases,
-    ),
     InfoListItem(
         message = stringResource(R.string.screen_welcome_bullet_2),
         iconVector = Icons.Outlined.Lock,
     ),
     InfoListItem(
         message = stringResource(R.string.screen_welcome_bullet_3),
-        iconVector = Icons.Outlined.AddComment,
+        iconId = CommonDrawables.ic_compound_chat_problem,
     ),
 )
 
diff --git a/features/ftue/impl/src/main/res/values/localazy.xml b/features/ftue/impl/src/main/res/values/localazy.xml
index b398ba37d0..f89cc622f6 100644
--- a/features/ftue/impl/src/main/res/values/localazy.xml
+++ b/features/ftue/impl/src/main/res/values/localazy.xml
@@ -5,7 +5,7 @@
   <string name="screen_notification_optin_subtitle">"You can change your settings later."</string>
   <string name="screen_notification_optin_title">"Allow notifications and never miss a message"</string>
   <string name="screen_welcome_bullet_1">"Calls, polls, search and more will be added later this year."</string>
-  <string name="screen_welcome_bullet_2">"Message history for encrypted rooms won’t be available in this update."</string>
+  <string name="screen_welcome_bullet_2">"Message history for encrypted rooms isn’t available yet."</string>
   <string name="screen_welcome_bullet_3">"We’d love to hear from you, let us know what you think via the settings page."</string>
   <string name="screen_welcome_button">"Let\'s go!"</string>
   <string name="screen_welcome_subtitle">"Here’s what you need to know:"</string>