Merge branch 'main' into wallet

# Conflicts:
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
#	libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/ResolvedSuggestion.kt

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/CreateDmConfirmationBottomSheet.kt

@@ -8,6 +8,7 @@
 
 package io.element.android.libraries.matrix.ui.components
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -22,9 +23,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.designsystem.atomic.molecules.ButtonRowMolecule
+import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
+import io.element.android.libraries.designsystem.components.BigIcon
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
@@ -33,6 +38,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
+import io.element.android.libraries.designsystem.theme.components.OutlinedButton
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.R
@@ -48,10 +54,23 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun CreateDmConfirmationBottomSheet(
     matrixUser: MatrixUser,
+    enableKeyShareOnInvite: Boolean,
+    isUserIdentityUnknown: Boolean,
     onSendInvite: () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val titleContent = if (enableKeyShareOnInvite && isUserIdentityUnknown) {
+        stringResource(R.string.screen_bottom_sheet_create_dm_unknown_user_title)
+    } else {
+        stringResource(R.string.screen_bottom_sheet_create_dm_title)
+    }
+    val descriptionContent = if (enableKeyShareOnInvite && isUserIdentityUnknown) {
+        stringResource(R.string.screen_bottom_sheet_create_dm_unknown_user_content)
+    } else {
+        stringResource(R.string.screen_bottom_sheet_create_dm_message, matrixUser.getFullName())
+    }
+
     ModalBottomSheet(
         modifier = modifier,
         onDismissRequest = onDismiss,
@@ -63,47 +82,95 @@ fun CreateDmConfirmationBottomSheet(
                 .padding(top = 24.dp, bottom = 16.dp, start = 16.dp, end = 16.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Avatar(
-                avatarData = matrixUser.getAvatarData(AvatarSize.DmCreationConfirmation),
-                avatarType = AvatarType.User,
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            Text(
-                text = stringResource(R.string.screen_bottom_sheet_create_dm_title),
-                style = ElementTheme.typography.fontHeadingMdBold,
-                color = ElementTheme.colors.textPrimary,
-                textAlign = TextAlign.Center,
-            )
-            Spacer(modifier = Modifier.height(8.dp))
-            Text(
-                text = stringResource(R.string.screen_bottom_sheet_create_dm_message, matrixUser.getFullName()),
-                style = ElementTheme.typography.fontBodyMdRegular,
-                color = ElementTheme.colors.textSecondary,
-                textAlign = TextAlign.Center,
-            )
-            Spacer(modifier = Modifier.height(40.dp))
-            Button(
-                modifier = Modifier.fillMaxWidth(),
-                onClick = onSendInvite,
-                leadingIcon = IconSource.Vector(CompoundIcons.UserAdd()),
-                text = stringResource(R.string.screen_bottom_sheet_create_dm_confirmation_button_title),
-            )
-            Spacer(modifier = Modifier.height(16.dp))
-            TextButton(
-                modifier = Modifier.fillMaxWidth(),
-                onClick = onDismiss,
-                text = stringResource(CommonStrings.action_cancel),
-            )
+            if (isUserIdentityUnknown) {
+                IconTitleSubtitleMolecule(
+                    modifier = Modifier.padding(
+                        bottom = 16.dp,
+                        start = 16.dp,
+                        end = 16.dp,
+                    ),
+                    title = titleContent,
+                    subTitle = descriptionContent,
+                    iconStyle = BigIcon.Style.Default(CompoundIcons.UserAddSolid()),
+                )
+                MatrixUserRow(matrixUser)
+                Spacer(modifier = Modifier.height(32.dp))
+                ButtonRowMolecule(
+                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+                ) {
+                    OutlinedButton(
+                        modifier = Modifier.weight(1f),
+                        text = stringResource(CommonStrings.action_cancel),
+                        onClick = onDismiss
+                    )
+                    Button(
+                        modifier = Modifier.weight(1f),
+                        text = stringResource(CommonStrings.action_continue),
+                        onClick = onSendInvite
+                    )
+                }
+                Spacer(modifier = Modifier.height(32.dp))
+            } else {
+                Avatar(
+                    avatarData = matrixUser.getAvatarData(AvatarSize.DmCreationConfirmation),
+                    avatarType = AvatarType.User,
+                )
+                Spacer(modifier = Modifier.height(16.dp))
+                Text(
+                    text = titleContent,
+                    style = ElementTheme.typography.fontHeadingMdBold,
+                    color = ElementTheme.colors.textPrimary,
+                    textAlign = TextAlign.Center,
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+                Text(
+                    text = descriptionContent,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                    textAlign = TextAlign.Center,
+                )
+                Spacer(modifier = Modifier.height(40.dp))
+                Button(
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = onSendInvite,
+                    leadingIcon = IconSource.Vector(CompoundIcons.UserAdd()),
+                    text = stringResource(R.string.screen_bottom_sheet_create_dm_confirmation_button_title),
+                )
+                Spacer(modifier = Modifier.height(16.dp))
+                TextButton(
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = onDismiss,
+                    text = stringResource(CommonStrings.action_cancel),
+                )
+            }
         }
     }
 }
 
 @PreviewsDayNight
 @Composable
-internal fun CreateDmConfirmationBottomSheetPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) = ElementPreview {
+internal fun CreateDmConfirmationBottomSheetPreview(@PreviewParameter(
+    CreateDmConfirmationBottomSheetStateProvider::class
+) state: CreateDmConfirmationBottomSheetState) = ElementPreview {
     CreateDmConfirmationBottomSheet(
-        matrixUser = matrixUser,
+        matrixUser = state.matrixUser,
+        enableKeyShareOnInvite = state.enableKeyShareOnInvite,
+        isUserIdentityUnknown = state.isUserIdentityUnknown,
         onSendInvite = {},
         onDismiss = {},
     )
 }
+
+data class CreateDmConfirmationBottomSheetState(
+    val matrixUser: MatrixUser,
+    val enableKeyShareOnInvite: Boolean,
+    val isUserIdentityUnknown: Boolean,
+)
+
+class CreateDmConfirmationBottomSheetStateProvider : PreviewParameterProvider<CreateDmConfirmationBottomSheetState> {
+    override val values = sequenceOf(
+        CreateDmConfirmationBottomSheetState(matrixUser = aMatrixUser(), enableKeyShareOnInvite = false, isUserIdentityUnknown = false),
+            CreateDmConfirmationBottomSheetState(matrixUser = aMatrixUser(), enableKeyShareOnInvite = true, isUserIdentityUnknown = false),
+            CreateDmConfirmationBottomSheetState(matrixUser = aMatrixUser(), enableKeyShareOnInvite = true, isUserIdentityUnknown = true),
+        )
+}

libraries/matrixui/src/main/res/values-ja/translations.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"招待を送信"</string>
+  <string name="screen_bottom_sheet_create_dm_message">"%1$s とチャットを始めますか？"</string>
+  <string name="screen_bottom_sheet_create_dm_title">"招待を送信しますか？"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"この人物とのチャットがありません。続行する前に、まず招待してください。"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"この新しい連絡先と新規にチャットを開始しますか？"</string>
+  <string name="screen_invites_invited_you">"%1$s (%2$s) があなたを招待しました"</string>
+</resources>

libraries/matrixui/src/main/res/values-vi/translations.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_invites_invited_you">"%1$s(%2$s ) đã mời bạn"</string>
+</resources>

libraries/matrixui/src/main/res/values/localazy.xml

@@ -3,5 +3,7 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Send invite"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Would you like to start a chat with %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Send invite?"</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_content">"You currently don’t have any chats with this person. Confirm inviting them before continuing."</string>
+  <string name="screen_bottom_sheet_create_dm_unknown_user_title">"Start a chat with this new contact?"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) invited you"</string>
 </resources>