[POS - Historical Orders] Refresh orders after the receipt was sent. #14805

toupper · 2025-10-23T10:47:54Z

Description

With this PR we refresh the selected POS order after the user sends the email recept and they are navigated back. We do so by passing a parameter to the back navigation event that is then read by the POS orders navigation logic.

Test Steps

Go to POS
Go Orders
On the selected Order details, tap on Email Receipt
Enter the email and tap send
When that ends succesfully and you are navigated back, see how the selected order is refreshed and the email appears in details and the list

Verify also that when the email is not sent, i.e. by tapping on the back button, the orders aren't refreshed.

Images/gif

Screen_Recording_20251024_112801_Woo.Dev.mp4

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

toupper · 2025-10-23T10:49:35Z

...e/src/main/kotlin/com/woocommerce/android/ui/woopos/emailreceipt/WooPosEmailReceiptScreen.kt

        onSendReceiptClicked = { viewModel.onUIEvent(WooPosEmailReceiptUIEvent.SendEmailClicked) },
        onBackClicked = { onNavigationEvent(WooPosNavigationEvent.GoBack) },
-        onEmailSent = { onNavigationEvent(WooPosNavigationEvent.GoBack) }
+        onEmailSent = { onNavigationEvent(WooPosNavigationEvent.GoBackWithResult(key = EMAIL_RECEIPT_SENT, true)) }


I was wondering if this logic needs to be in the view model, but given that we already have the onEmailSent callback and we don't add more model knowledge to the screen, I left it there.

toupper · 2025-10-23T10:52:08Z

...ain/kotlin/com/woocommerce/android/ui/woopos/root/navigation/WooPosNavigationEventHandler.kt

            popBackStack()
        }
+
+        is WooPosNavigationEvent.GoBackWithResult -> {


I considered adding a specific event like GoBackAfterReceiptSent, but I’d rather keep this generic so it’s reusable across flows. Using GoBackWithResult keeps the navigation API abstract and avoids event proliferation (“one event per case”).

wpmobilebot · 2025-10-23T10:52:47Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`e0ea365`
	Direct Download	`woocommerce-wear-prototype-build-pr14805-e0ea365.apk`

kidinov · 2025-10-23T12:02:43Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt

+                if (shouldRefresh) {
+                    viewModel.onRefresh()
+                    // clear so it doesn't retrigger on recomposition / process death restore
+                    entry.savedStateHandle[EMAIL_RECEIPT_REFRESH_ORDERS] = false


Probably we should remove this from the bundel, not set to false?

Yeah that's better, done in 02c24c8

kidinov · 2025-10-23T12:05:06Z

...e/src/main/kotlin/com/woocommerce/android/ui/woopos/emailreceipt/WooPosEmailReceiptScreen.kt

 import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography
 import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent

+const val EMAIL_RECEIPT_SENT = "email_receipt_sent"


I would consider placing this in the navigation because I believe it’s semantically related to that

That's true, done in ddf806d

kidinov · 2025-10-23T12:07:45Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt

    val viewModel: WooPosOrdersViewModel = hiltViewModel()
    val state by viewModel.state.collectAsState()

+    val entry = remember(navController) { navController.currentBackStackEntry }


Have you considered not passing navController inside the screen but passing the value to the screen from navigation composable? Both, I think, are fine, but separating the navigation part from the actual screen may be a bit cleaner.

Example:

@Composable fun MyNavHost() { val navController = rememberNavController() NavHost(navController = navController, startDestination = "screenA") { composable("screenA") { backStackEntry -> val result = backStackEntry.savedStateHandle .getStateFlow<String?>("selected_item", null) .collectAsState() ScreenA( selectedItem = result.value, onNavigateToScreenB = { navController.navigate("screenB") } ) } composable("screenB") { ScreenB( onItemSelected = { item -> navController.previousBackStackEntry ?.savedStateHandle ?.set("selected_item", item) navController.popBackStack() } ) } } } @Composable fun ScreenA(selectedItem: String?, onNavigateToScreenB: () -> Unit) { Column { Text("Selected: ${selectedItem ?: "None"}") Button(onClick = onNavigateToScreenB) { Text("Go to Screen B") } } } @Composable fun ScreenB(onItemSelected: (String) -> Unit) { Column { Button(onClick = { onItemSelected("Item 1") }) { Text("Select Item 1") } Button(onClick = { onItemSelected("Item 2") }) { Text("Select Item 2") } } }

Yeah, it's cleaner that way, done in 68e10c3

wpmobilebot · 2025-10-23T13:33:39Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`e0ea365`
	Direct Download	`woocommerce-prototype-build-pr14805-e0ea365.apk`

kidinov · 2025-10-23T14:31:31Z

...c/main/kotlin/com/woocommerce/android/ui/woopos/emailreceipt/WooPosEmailReceiptNavigation.kt

 import com.woocommerce.android.ui.woopos.root.navigation.WooPosNavigationEvent
 import com.woocommerce.android.ui.woopos.root.navigation.navigateOnce

+const val EMAIL_RECEIPT_SENT = "email_receipt_sent"


np: I'd recommend naming it EMAIL_RECEIPT_SENT_KEY - for clarity

codecov-commenter · 2025-10-23T14:44:34Z

Codecov Report

❌ Patch coverage is 49.15254% with 30 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.26%. Comparing base (3d4c7df) to head (e0ea365).

Files with missing lines	Patch %	Lines
...os/root/navigation/WooPosNavigationEventHandler.kt	0.00%	13 Missing ⚠️
.../android/ui/woopos/orders/WooPosOrdersViewModel.kt	66.66%	0 Missing and 7 partials ⚠️
...android/ui/woopos/orders/WooPosOrdersNavigation.kt	0.00%	6 Missing ⚠️
...android/ui/woopos/orders/WooPosOrdersDataSource.kt	87.50%	1 Missing and 1 partial ⚠️
...ui/woopos/root/navigation/WooPosNavigationEvent.kt	0.00%	1 Missing ⚠️
...ndroid/ui/woopos/root/navigation/WooPosRootHost.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #14805      +/-   ##
============================================
+ Coverage     38.25%   38.26%   +0.01%     
- Complexity    10080    10088       +8     
============================================
  Files          2132     2132              
  Lines        120683   120735      +52     
  Branches      16543    16556      +13     
============================================
+ Hits          46170    46202      +32     
- Misses        69831    69843      +12     
- Partials       4682     4690       +8

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

kidinov

The approach LGTM! But:

Notice that it doesn't work and the email is not actually appeared neither on the list or in the order details
The selection of the order is lost
I doubt that we need to show the PTR indicator. Check the iOS UX for reference.

Also, there is an issue not related to the changes in the PR inWooPosEmailReceiptRepository::sendReceiptByEmail there is an assumption that the order is stored in the database, which may not be the case when you open the POS after a clean install; therefore, sending fails. So:

We either need to take the order from the in-memory cache, but correct me if I am wrong, it contains just 1 page of orders at max
We need to fetch the order from the remote if it's not in the database.

…fresh-after

toupper · 2025-10-24T10:05:43Z

Thanks for the comment @kidinov!

Notice that it doesn't work and the email is not actually appeared neither on the list or in the order details
The selection of the order is lost
I doubt that we need to show the PTR indicator. Check the iOS UX for reference.

After merging from trunk, the order details are now displayed correctly.
Most importantly, after discussing with @staskus, we agreed that we don’t necessarily need to maintain full technical parity with iOS.

On iOS, the selected order is reloaded directly from the Email Receipt screen, but in our case, I’ve kept that logic within the POS Orders screen. This approach has the added benefit of making the email receipt action faster.

In this PR:
• We refresh only the selected order.
• We don’t show the Pull-to-Refresh indicator (since the user didn’t trigger it manually).
• Instead, we show a subtle LinearProgressIndicator to communicate that the order details are being refreshed.

Let me know what you think.

Also, there is an issue not related to the changes in the PR inWooPosEmailReceiptRepository::sendReceiptByEmail there is an assumption that the order is stored in the database, which may not be the case when you open the POS after a clean install; therefore, sending fails. So:

We either need to take the order from the in-memory cache, but correct me if I am wrong, it contains just 1 page of orders at max
We need to fetch the order from the remote if it's not in the database.

Good catch! Let's tackle that in a separate PR 👍

toupper · 2025-10-24T11:08:54Z

Also, there is an issue not related to the changes in the PR inWooPosEmailReceiptRepository::sendReceiptByEmail there is an assumption that the order is stored in the database, which may not be the case when you open the POS after a clean install; therefore, sending fails. So:

We either need to take the order from the in-memory cache, but correct me if I am wrong, it contains just 1 page of orders at max
We need to fetch the order from the remote if it's not in the database.

Done in #14817

…fresh-after # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt

kidinov · 2025-10-28T10:03:50Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDataSource.kt

    suspend fun loadMore(searchQuery: String? = null): Result<List<Order>> =
        withContext(Dispatchers.IO) { loadNextPage(searchQuery) }

+    suspend fun refreshOrderById(orderId: Long): Result<Order> {


You don't update the cache, so if I understand correctly, after returning back to this screen, the order will be displayed without the updated email as cached data firstly used

Good point, fixed it in 9052df4

kidinov · 2025-10-28T10:07:50Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt

        }
    }

+    fun onBackFromSuccesfullySendingEmailReceipt() {


There is a typo in succesfully

Good catch! Done in 7f696e1

kidinov · 2025-10-28T10:13:02Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt

        Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))

+        AnimatedVisibility(visible = state.isRefreshingSelectedDetails) {
+            LinearProgressIndicator(


We don't have a Woo POS-specific linear progress component, and the default one uses colors that do not match the POS colors or style. I'd suggest not having any loading element at all. It'll simplify the code and won't bother merchants with not really clear what and why reloading indicator

Nice, let's remove it then. Done in 7ca6800

kidinov · 2025-10-28T10:14:39Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt

+        }
+    }
+
+    private suspend fun applyOrderUpdate(updated: Order) {


Probably can be simplified to

private suspend fun applyOrderUpdate(updated: Order) { val current = _state.value as? WooPosOrdersState.Content ?: return val loaded = current.items as? WooPosOrdersState.Content.Items.Loaded ?: return val selectedId = loaded.items.keys.firstOrNull { it.isSelected }?.id val newItem = mapOrderItem(updated, selectedId) val newDetails = mapOrderDetails(updated) val newMap = loaded.items.entries.associate { (item, details) -> if (item.id == updated.id) newItem to newDetails else item to details } _state.value = current.copy( items = WooPosOrdersState.Content.Items.Loaded(newMap), selectedDetails = if (selectedId == updated.id) newDetails else current.selectedDetails ) }

Thanks, changed in e829d88

kidinov

It looks good to me; I'd just really consider removing the loading indicator, as this is more of a side effect of the temporary architecture we are currently using, and I think it's fine to not show it at the moment. If you think the loading indicator is needed, I think we need to consider using something else, not the one currently used, as I think it's not good for the current POS design language.

Also, there are a few minor suggestions - please take a look!

…fresh-after # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/root/navigation/WooPosNavigationEventHandler.kt

dangermattic · 2025-10-29T10:48:01Z

	1 Warning
⚠️	This PR is assigned to the milestone 23.6. This milestone is due in less than 2 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

…y code

Refresh orders after the receipt was sent.

fc360bc

toupper marked this pull request as draft October 23, 2025 10:48

toupper commented Oct 23, 2025

View reviewed changes

kidinov reviewed Oct 23, 2025

View reviewed changes

toupper added 3 commits October 23, 2025 15:04

Rename it also here

b865e68

Clear the flag so it won't retrigger on recomposition / restore

02c24c8

Move constant to navigation where it belongs better

ddf806d

toupper added 2 commits October 23, 2025 16:00

Move parameter logic to the navigation

68e10c3

Clean code with detekt

ed51cf4

toupper added type: task An internally driven task. feature: POS labels Oct 23, 2025

toupper added this to the 23.6 milestone Oct 23, 2025

toupper marked this pull request as ready for review October 23, 2025 14:23

toupper requested a review from kidinov October 23, 2025 14:23

kidinov self-assigned this Oct 23, 2025

kidinov reviewed Oct 23, 2025

View reviewed changes

kidinov self-requested a review October 23, 2025 14:55

kidinov reviewed Oct 23, 2025

View reviewed changes

toupper added 4 commits October 24, 2025 10:16

Merge branch 'trunk' into feat/WOOMOB-1154-POS-Order-details-email-re…

3255e3e

…fresh-after

Cleaner approach: fetch single order details

236f9e2

Add test for POS Orders data source

ac45e90

add tests for POSOrdersViewModel

1a1e7f7

toupper requested a review from kidinov October 24, 2025 10:06

toupper mentioned this pull request Oct 24, 2025

[POS Orders] Fetch order when sending receipt if it's not in DB #14817

Merged

1 task

Merge branch 'trunk' into feat/WOOMOB-1154-POS-Order-details-email-re…

0f1c841

…fresh-after # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt

kidinov reviewed Oct 28, 2025

View reviewed changes

kidinov approved these changes Oct 28, 2025

View reviewed changes

kidinov and others added 2 commits October 28, 2025 14:07

Fixed formatting

bbf37e4

Merge branch 'trunk' into feat/WOOMOB-1154-POS-Order-details-email-re…

1f4b87d

…fresh-after # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/root/navigation/WooPosNavigationEventHandler.kt

toupper added 7 commits October 29, 2025 11:49

Fix typo in method naming

7f696e1

add order to cache

9052df4

Remove the loading indicator after going back from the email

7ca6800

Simplify code

e829d88

Continue from previous commit: remove more references to non necessar…

75dfaef

…y code

Fix detekt issues

d9d0283

Fix test

e0ea365

toupper merged commit f8bb8f0 into trunk Oct 29, 2025
17 checks passed

toupper deleted the feat/WOOMOB-1154-POS-Order-details-email-refresh-after branch October 29, 2025 13:46

[POS - Historical Orders] Refresh orders after the receipt was sent. #14805

[POS - Historical Orders] Refresh orders after the receipt was sent. #14805

Uh oh!

Conversation

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

Uh oh!

Description

Test Steps

Images/gif

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

kidinov left a comment

Choose a reason for hiding this comment

Uh oh!

toupper commented Oct 24, 2025

Uh oh!

toupper commented Oct 24, 2025

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kidinov left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dangermattic commented Oct 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

toupper commented Oct 23, 2025 •

edited

Loading

wpmobilebot commented Oct 23, 2025 •

edited

Loading

kidinov Oct 23, 2025 •

edited

Loading

kidinov Oct 23, 2025 •

edited

Loading

wpmobilebot commented Oct 23, 2025 •

edited

Loading

codecov-commenter commented Oct 23, 2025 •

edited

Loading

kidinov Oct 28, 2025 •

edited

Loading

kidinov left a comment •

edited

Loading