diff --git a/changelog.d/5825.bugfix b/changelog.d/5825.bugfix
new file mode 100644
index 0000000000..77560027ba
--- /dev/null
+++ b/changelog.d/5825.bugfix
@@ -0,0 +1 @@
+Changed copy and list order in member profile screen.
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index 545e9f7190..6d9f798543 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -182,10 +182,19 @@ class RoomMemberProfileController @Inject constructor(
// More
buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
+ if (!state.isMine) {
+ buildProfileAction(
+ id = "direct",
+ editable = false,
+ title = stringProvider.getString(R.string.room_member_open_or_create_dm),
+ action = { callback?.onOpenDmClicked() }
+ )
+ }
+
buildProfileAction(
id = "overrideColor",
editable = false,
- title = stringProvider.getString(R.string.room_member_override_nick_color),
+ title = stringProvider.getString(R.string.room_member_override_display_name_colour),
subtitle = state.userColorOverride,
divider = !state.isMine,
action = { callback?.onOverrideColorClicked() }
@@ -194,13 +203,6 @@ class RoomMemberProfileController @Inject constructor(
if (!state.isMine) {
val membership = state.asyncMembership() ?: return
- buildProfileAction(
- id = "direct",
- editable = false,
- title = stringProvider.getString(R.string.room_member_open_or_create_dm),
- action = { callback?.onOpenDmClicked() }
- )
-
if (!state.isSpace && state.hasReadReceipt) {
buildProfileAction(
id = "read_receipt",
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index 760bbe9353..5d82cd855f 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -345,7 +345,7 @@ class RoomMemberProfileFragment @Inject constructor(
views.editText.hint = "#000000"
MaterialAlertDialogBuilder(requireContext())
- .setTitle(R.string.room_member_override_nick_color)
+ .setTitle(R.string.room_member_override_display_name_colour)
.setView(layout)
.setPositiveButton(R.string.ok) { _, _ ->
val newColor = views.editText.text.toString()
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index e5b784b7ea..f882fdf162 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2177,7 +2177,7 @@
Leave
"Leaving the room…"
- Override nick color
+ Override display name colour
Admins
Moderators