summaryrefslogtreecommitdiff
path: root/wallet/src/main/res
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2024-01-30 18:55:55 -0600
committerTorsten Grote <t@grobox.de>2024-02-02 15:56:57 -0300
commitf004af7b746a436e7317d5c27f8f261bd7a407f0 (patch)
treef9b4ad5b3fa40d4e53d5dd640439f3ae6bc02de8 /wallet/src/main/res
parent636b11b195cd250b96e7de4bea5fa32fc374d2a2 (diff)
downloadtaler-android-f004af7b746a436e7317d5c27f8f261bd7a407f0.tar.gz
taler-android-f004af7b746a436e7317d5c27f8f261bd7a407f0.tar.bz2
taler-android-f004af7b746a436e7317d5c27f8f261bd7a407f0.zip
[wallet] Redirect to details view after payment, deprecate proposalId, and remove pending op actions
bug 0008297
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r--wallet/src/main/res/layout/list_item_pending_operation.xml6
-rw-r--r--wallet/src/main/res/navigation/nav_graph.xml4
2 files changed, 4 insertions, 6 deletions
diff --git a/wallet/src/main/res/layout/list_item_pending_operation.xml b/wallet/src/main/res/layout/list_item_pending_operation.xml
index bd606c3..210715c 100644
--- a/wallet/src/main/res/layout/list_item_pending_operation.xml
+++ b/wallet/src/main/res/layout/list_item_pending_operation.xml
@@ -31,12 +31,6 @@
android:textSize="24sp"
tools:text="My Pending Operation" />
- <Button
- android:id="@+id/button_pending_action_1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- tools:text="Cancel Operation" />
-
<TextView
android:id="@+id/pending_subtext"
android:layout_width="wrap_content"
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index 672bb77..18b9122 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -97,6 +97,10 @@
android:id="@+id/action_promptPayment_to_alreadyPaid"
app:destination="@id/alreadyPaid"
app:popUpTo="@id/nav_main" />
+ <action
+ android:id="@+id/action_promptPayment_to_nav_transactions_detail_payment"
+ app:destination="@id/nav_transactions_detail_payment"
+ app:popUpTo="@id/nav_main" />
</fragment>
<fragment