Skip to content

Fix crash on order details when tapping customer info buttons #12920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 14, 2024
Merged

Fix crash on order details when tapping customer info buttons #12920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5646312
Ignore click events when the view is not attached to a window
hichamboushaba Nov 13, 2024
aa2a8f7
Add a release note
hichamboushaba Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
21.2
-----

- [*] Fixed a crash that occurred when tapping on the customer shipping address in the order details screen [https://github.com/woocommerce/woocommerce-android/pull/12920]

21.1
-----
Expand Down
19 changes: 14 additions & 5 deletions ...ain/kotlin/com/woocommerce/android/ui/orders/details/views/OrderDetailCustomerInfoView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,7 @@ class OrderDetailCustomerInfoView @JvmOverloads constructor(
)

binding.customerInfoCustomerNoteSection.setOnClickListener {
val action =
OrderDetailFragmentDirections.actionOrderDetailFragmentToEditCustomerOrderNoteFragment(
order.id
)
findNavController().navigateSafely(action)
navigateToCustomerNote(order)
}
}
}
Expand Down Expand Up @@ -290,13 +286,26 @@ class OrderDetailCustomerInfoView @JvmOverloads constructor(
}
}

private fun navigateToCustomerNote(order: Order) {
if (!isAttachedToWindow) return

val action = OrderDetailFragmentDirections.actionOrderDetailFragmentToEditCustomerOrderNoteFragment(
order.id
)
findNavController().navigateSafely(action)
}

private fun navigateToShippingAddressEditingView(address: Address) {
if (!isAttachedToWindow) return
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simple and elegant solution. Great work!


OrderDetailFragmentDirections
.actionOrderDetailFragmentToShippingAddressEditingFragment(storedAddress = address)
.let { findNavController().navigateSafely(it) }
}

private fun navigateToBillingAddressEditingView(address: Address) {
if (!isAttachedToWindow) return

OrderDetailFragmentDirections
.actionOrderDetailFragmentToBillingAddressEditingFragment(storedAddress = address)
.let { findNavController().navigateSafely(it) }
Expand Down
Loading