Skip to content
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

Jump to bottom

[Bug] in landscape marking as paid with cash keeps user on collect payment screen #12632

Closed
wants to merge 8 commits into from
Closed

[Bug] in landscape marking as paid with cash keeps user on collect payment screen #12632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f09c54
Don't throttle
backwardstruck Sep 17, 2024
e0a2513
Update nav graph
backwardstruck Sep 17, 2024
df9e5e8
Merge branch 'trunk' into 11661-in-landscape-marking-as-paid-with-cas…
backwardstruck Sep 17, 2024
9651d75
Merge branch 'trunk' into 11661-in-landscape-marking-as-paid-with-cas…
backwardstruck Sep 17, 2024
827475a
Update nav graph to include <include app:graph="@navigation/nav_g…
backwardstruck Sep 17, 2024
6e02a58
Merge branch 'trunk' into 11661-in-landscape-marking-as-paid-with-cas…
backwardstruck Sep 18, 2024
89d5c03
Try manually removing from backstack
backwardstruck Sep 18, 2024
ab03fd1
Merge branch 'trunk' into 11661-in-landscape-marking-as-paid-with-cas…
backwardstruck Sep 23, 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
16 changes: 15 additions & 1 deletion ...kotlin/com/woocommerce/android/ui/payments/methodselection/SelectPaymentMethodFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderActivity
import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderPaymentStatus
import com.woocommerce.android.util.ChromeCustomTabUtils
import com.woocommerce.android.util.UiHelpers
import com.woocommerce.android.util.WooLog
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowDialog
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowSnackbar
import dagger.hilt.android.AndroidEntryPoint
Expand Down Expand Up @@ -244,8 +245,11 @@ class SelectPaymentMethodFragment : BaseFragment(R.layout.fragment_select_paymen
// We should pop the back stack to show the [OrderDetailsFragment].
findNavController().popBackStack()
} else {
if (isFragmentInBackStack(R.id.selectPaymentMethodFragment)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is one partial fix if we can't come up with a better solution. But it only takes us back to the order detail screen.

findNavController().popBackStack()
}
SelectPaymentMethodFragmentDirections.actionSelectPaymentMethodFragmentToOrderList().run {
findNavController().navigateSafely(this)
findNavController().navigateSafely(this, true)
}
}
}
Expand Down Expand Up @@ -305,6 +309,16 @@ class SelectPaymentMethodFragment : BaseFragment(R.layout.fragment_select_paymen
}
}

private fun isFragmentInBackStack(destinationId: Int): Boolean {
return try {
findNavController().getBackStackEntry(destinationId)
true
} catch (e: IllegalArgumentException) {
WooLog.e(WooLog.T.POS, "Unable to find fragment", e)
false
}
}

private fun ReturnResultToWooPos.asWooPosCardReaderPaymentResult() =
when (this) {
is ReturnResultToWooPos.Success -> WooPosCardReaderPaymentStatus.Success
Expand Down
2 changes: 1 addition & 1 deletion WooCommerce/src/main/res/navigation/nav_graph_payment_flow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
app:popUpToInclusive="false" />
<action
android:id="@+id/action_selectPaymentMethodFragment_to_orderList"
app:popUpTo="@+id/orders"
app:destination="@+id/orders"
app:popUpToInclusive="false" />
<action
android:id="@+id/action_selectPaymentMethodFragment_to_orderDetailFragment"
Expand Down
Loading