CMM-839 odie link UI with wordpress rs #22285

adalpari · 2025-10-14T14:21:02Z

Description

This PR links the new AI Bot Support UI to the rust layer.
Now the user can completely interact and create bot conversations in the new chat.
Some improvements to the UI/UX have been done as well like adding UI states, empty list, pull-to-refresh, typing indicator, progress indicator... Also there's a better handling of the plurals when showing the ellapsed time sinde the message was created.

Note: Pagination is not supported yet.

Testing instructions

Note: the entry point to this screen is hardcoded, and a TODO has been added to avoid merging this PR until those hardcoded lines are removed. So, don't pay attention to that part of the code.

Log into a WP.COM site
Go to "Me screen" -> Help and support -> Contact support

Play with the bot conversations and check everything works as expected

Screen.Recording.2025-10-15.at.12.40.49.mov

wpmobilebot · 2025-10-14T18:30:07Z

Project dependencies changes

list

! Upgraded Dependencies
net.java.dev.jna:jna:5.18.1, (changed from 5.18.0)
rs.wordpress.api:android:trunk-1a64cb921601fd34bfe6030919960676d45a19c0, (changed from trunk-d0c9eebab77e8701810077ac1fba7d39ef8d121f)
rs.wordpress.api:kotlin:trunk-1a64cb921601fd34bfe6030919960676d45a19c0, (changed from trunk-d0c9eebab77e8701810077ac1fba7d39ef8d121f)

tree

 +--- project :libs:fluxc
-|    \--- rs.wordpress.api:android:trunk-d0c9eebab77e8701810077ac1fba7d39ef8d121f
-|         +--- com.squareup.okhttp3:okhttp:4.12.0 -> 5.2.0 (*)
-|         +--- com.squareup.okhttp3:okhttp-tls:4.12.0
-|         |    +--- com.squareup.okhttp3:okhttp:4.12.0 -> 5.2.0 (*)
-|         |    +--- com.squareup.okio:okio:3.6.0 -> 3.16.0 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.24 (*)
-|         +--- net.java.dev.jna:jna:5.18.0
-|         +--- rs.wordpress.api:kotlin:trunk-d0c9eebab77e8701810077ac1fba7d39ef8d121f
-|         |    +--- com.squareup.okhttp3:okhttp:4.12.0 -> 5.2.0 (*)
-|         |    +--- com.squareup.okhttp3:okhttp-tls:4.12.0 (*)
-|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.2.20 (*)
-|         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.2.20 (*)
+|    \--- rs.wordpress.api:android:trunk-1a64cb921601fd34bfe6030919960676d45a19c0
+|         +--- com.squareup.okhttp3:okhttp:4.12.0 -> 5.2.0 (*)
+|         +--- com.squareup.okhttp3:okhttp-tls:4.12.0
+|         |    +--- com.squareup.okhttp3:okhttp:4.12.0 -> 5.2.0 (*)
+|         |    +--- com.squareup.okio:okio:3.6.0 -> 3.16.0 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.24 (*)
+|         +--- net.java.dev.jna:jna:5.18.1
+|         +--- rs.wordpress.api:kotlin:trunk-1a64cb921601fd34bfe6030919960676d45a19c0
+|         |    +--- com.squareup.okhttp3:okhttp:4.12.0 -> 5.2.0 (*)
+|         |    +--- com.squareup.okhttp3:okhttp-tls:4.12.0 (*)
+|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.2.20 (*)
+|         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.2.20 (*)
-+--- rs.wordpress.api:android:trunk-d0c9eebab77e8701810077ac1fba7d39ef8d121f (*)
++--- rs.wordpress.api:android:trunk-1a64cb921601fd34bfe6030919960676d45a19c0 (*)
 \--- com.automattic:encryptedlogging:1.1.1
-     \--- net.java.dev.jna:jna:5.17.0 -> 5.18.0
+     \--- net.java.dev.jna:jna:5.17.0 -> 5.18.1

Copilot

Pull Request Overview

Links the new AI Bot Support UI to the WordPress.rs backend and wires it into the Help flow. Key updates include integrating a repository + ViewModel for conversations/messages, replacing time strings with Android plurals, and adding UI states (empty list, pull-to-refresh, typing indicator, and progress).

Introduces AIBotSupportRepository with WordPress.rs client and mapping functions.
Updates UI: conversations list with empty state and pull-to-refresh; conversation detail with typing indicator and send gating.
Replaces relative time formatting with plurals and moves non-Compose time util to use Resources.

Reviewed Changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
gradle/libs.versions.toml	Bumps wordpress-rs to a new trunk hash to enable API usage.
WordPress/src/main/res/values/strings.xml	Adds AI bot empty state and generic error strings; removes singular time strings in favor of plurals.
WordPress/src/main/res/values/plurals.xml	Adds minutes/hours/days/weeks plurals for relative time.
WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt	Temporarily routes Contact Us to AI Bot screen; adds startActivity call with token/user.
WordPress/src/main/java/org/wordpress/android/support/aibot/util/ConversationUtils.kt	Switches relative time formatting to use Resources and plurals.
WordPress/src/main/java/org/wordpress/android/support/aibot/ui/ConversationsListScreen.kt	Adds empty state, pull-to-refresh, resources wiring, and previews.
WordPress/src/main/java/org/wordpress/android/support/aibot/ui/ConversationDetailScreen.kt	Adds typing indicator, loading overlay, Resources usage, and send gating.
WordPress/src/main/java/org/wordpress/android/support/aibot/ui/AIBotSupportViewModel.kt	Adds repository integration, UI state flows, and message send/refresh/init flows.
WordPress/src/main/java/org/wordpress/android/support/aibot/ui/AIBotSupportActivity.kt	Wires ViewModel to composables, collects UI states, navigation, and error toasts.
WordPress/src/main/java/org/wordpress/android/support/aibot/repository/AIBotSupportRepository.kt	New repository with rs client, request helpers, and mapping to UI models.
WordPress/src/main/java/org/wordpress/android/support/aibot/model/BotMessage.kt	Removes unused field from BotMessage.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-10-15T10:17:10Z

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/ConversationsListScreen.kt

 import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalResources


LocalResources is not a Compose platform ambient. Use LocalContext.current.resources instead. Replace this import with import androidx.compose.ui.platform.LocalContext and derive Resources via LocalContext.current.resources.

Suggested change

import androidx.compose.ui.platform.LocalResources

import androidx.compose.ui.platform.LocalContext

I got a warning in AS saying just the opposite...

Copilot · 2025-10-15T10:17:10Z

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/ConversationsListScreen.kt

    onConversationClick: (BotConversation) -> Unit
 ) {
    val conversations by conversations.collectAsState()
+    val resources = LocalResources.current


LocalResources.current is invalid. Get Resources from LocalContext: val resources = LocalContext.current.resources.

#22285 (comment)

Copilot · 2025-10-15T10:17:10Z

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/ConversationDetailScreen.kt

 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import androidx.compose.ui.platform.LocalResources


LocalResources isn't a valid Compose ambient. Replace with LocalContext and retrieve resources via LocalContext.current.resources.

#22285 (comment)

Copilot · 2025-10-15T10:17:11Z

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/ConversationDetailScreen.kt

        }
    }

+    val resources = LocalResources.current


Use LocalContext.current.resources instead of LocalResources.current.

#22285 (comment)

Copilot · 2025-10-15T10:17:11Z

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/ConversationDetailScreen.kt

-                listState.animateScrollToItem(conversation.messages.size + 1) // +1 for spacer
+                // +2 for welcome header and spacer, +1 if typing indicator is showing
+                val itemCount = conversation.messages.size + 2 + if (isBotTyping) 1 else 0
+                listState.animateScrollToItem(itemCount)


Off-by-one when scrolling to the bottom: animateScrollToItem expects a valid index (0..lastIndex). Use itemCount - 1 (clamped) to avoid IndexOutOfBounds when there are exactly itemCount items.

Suggested change

listState.animateScrollToItem(itemCount)

listState.animateScrollToItem((itemCount - 1).coerceAtLeast(0))

This is because of extra UI elements not includued in the list (see the comment)

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/ConversationsListScreen.kt

Copilot · 2025-10-15T10:17:11Z

...Press/src/main/java/org/wordpress/android/support/aibot/repository/AIBotSupportRepository.kt

+    private var userId: Long = 0
+
+    private val wpComApiClient: WpComApiClient by lazy {
+        check(accessToken != null || userId != 0L) { "Repository not initialized" }


Both accessToken and userId are required for the client; the OR condition allows initialization with only one set, leading to a possible NPE on accessToken!!. Change to logical AND: check(accessToken != null && userId != 0L) { "Repository not initialized" }.

Suggested change

check(accessToken != null || userId != 0L) { "Repository not initialized" }

check(accessToken != null && userId != 0L) { "Repository not initialized" }

emmm, that's not the way it works... It wull fail if "condition 1 OR condition 2" fail. So, it looks correct to me...

WordPress/src/main/java/org/wordpress/android/support/aibot/ui/AIBotSupportViewModel.kt

WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt

…ake the repo testable

adalpari · 2025-10-15T10:44:06Z

WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt

-            } else {
-                createNewZendeskTicket()
-            }
+            // TODO: Again, this TODO is preventing the PR to pass


Again, don't pay attention to this code. It will be removed before merging the PR

sonarqubecloud · 2025-10-15T11:46:04Z

Quality Gate passed

Issues
8 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

adalpari added 30 commits October 13, 2025 12:22

Creating library

ee9bde8

Creating list screen

df7aa44

Adding conversation screen

488c373

Adding the + and the welcome items

1fee31d

Navigating to the new ai support

036fec7

Renaming

817feb0

Some refactor

b74f1ab

Extracting common methods

77423c4

Accessing the API

5ac7784

Modifying fields

6324b04

Fixing message visibuil

d677ce0

Some styling

e14fe06

Extracting strings

d804184

Improving previews in code

82f1da0

Previewing dark mode

54e8621

Removing unused func

2b6c494

Some styling

959072d

Extracting model classes

0195829

Some refactoring

368ea9a

Creating repository

8ecf787

Compile fix

a473461

Creating conversation

e33a47a

Removing userWantsToTalkToHuman

15cb4b5

Add conversation request function

9b7a67b

Load real data

be0347f

Adding loading spinner

e4b81f6

detekt

53463e8

Username

f17a90f

manifest fix

e80af2d

Merge branch 'trunk' into feature/CMM-837-Oddie-bot-support-UI

8cb5d72

adalpari added 2 commits October 14, 2025 20:19

Showing user/bot interaction

180b985

Fixing new conversation creation

da2150a

adalpari added 14 commits October 15, 2025 08:39

Merge branch 'trunk' into feature/CMM-839-Odie-link-UI-with-wordpress-rs

7810fad

Merge trunk and fixes

c9edfe2

Using proper plurals

59d6c50

Theme fix

114c1f5

Initialization error

910aac9

Basic error handling

e2489a6

Error handling when loading conversations

4284bbb

Handling empty list

69bbe25

Sending message error handling

0546031

Removing last message when error

865bbd3

Better handling the can send

ea53ca7

Adding pull to refresh

5b4e4db

detekt and style

b729a0a

Check fix

c0cffe1

adalpari requested a review from Copilot October 15, 2025 10:12

Copilot AI reviewed Oct 15, 2025

View reviewed changes

adalpari marked this pull request as ready for review October 15, 2025 10:30

adalpari requested a review from a team as a code owner October 15, 2025 10:30

adalpari added the [Type] Task label Oct 15, 2025

adalpari added 2 commits October 15, 2025 12:30

Small suggested changes and typos

dbbf5e8

Extracting WpComApiClient construction to WpComApiClientProvider to m…

6617f08

…ake the repo testable

adalpari requested a review from jkmassel October 15, 2025 10:43

adalpari commented Oct 15, 2025

View reviewed changes

adalpari added 3 commits October 15, 2025 13:27

Adding tests for AIBotSupportRepository

fe7ff77

Creating tests for AIBotSupportViewModel

6358099

Injecting the IO dispatcher instead of using static reference

fc3eb5b

	import androidx.compose.ui.platform.LocalResources
	import androidx.compose.ui.platform.LocalContext

	listState.animateScrollToItem(itemCount)
	listState.animateScrollToItem((itemCount - 1).coerceAtLeast(0))

	check(accessToken != null \|\| userId != 0L) { "Repository not initialized" }
	check(accessToken != null && userId != 0L) { "Repository not initialized" }

CMM-839 odie link UI with wordpress rs #22285

Are you sure you want to change the base?

CMM-839 odie link UI with wordpress rs #22285

Uh oh!

Conversation

adalpari commented Oct 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing instructions

Uh oh!

wpmobilebot commented Oct 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Project dependencies changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adalpari Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Oct 15, 2025

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

adalpari commented Oct 14, 2025 •

edited

Loading

wpmobilebot commented Oct 14, 2025 •

edited

Loading