diff options
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r-- | wallet/src/main/res/navigation/nav_graph.xml | 14 | ||||
-rw-r--r-- | wallet/src/main/res/values/strings.xml | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index e3d526e..3170216 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -141,6 +141,16 @@ </fragment> <fragment + android:id="@+id/promptPullPayment" + android:name="net.taler.wallet.peer.PullPaymentFragment" + android:label="@string/pay_peer_title"> + <action + android:id="@+id/action_promptPullPayment_to_nav_main" + app:destination="@id/nav_main" + app:popUpTo="@id/nav_main" /> + </fragment> + + <fragment android:id="@+id/nav_transactions" android:name="net.taler.wallet.transactions.TransactionsFragment" android:label="@string/transactions_title" @@ -276,6 +286,10 @@ app:destination="@id/promptTip" /> <action + android:id="@+id/action_global_prompt_pull_payment" + app:destination="@id/promptPullPayment" /> + + <action android:id="@+id/action_global_pending_operations" app:destination="@id/nav_pending_operations" /> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index 96a3453..8601b14 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -98,6 +98,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="transaction_refresh">Coin expiry change fee</string> <string name="transaction_peer_push_debit">Push payment</string> <string name="transaction_peer_pull_credit">Invoice</string> + <string name="transaction_peer_pull_debit">Invoice paid</string> <string name="payment_title">Payment</string> <string name="payment_fee">+%s payment fee</string> @@ -127,6 +128,9 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="send_peer_warning">Warning: Funds will leave the wallet immediately.</string> <string name="send_peer_payment_instruction">Let the payee scan this QR code to receive:</string> + <string name="pay_peer_title">Pay invoice</string> + <string name="pay_peer_intro">Do you want to pay this invoice?</string> + <string name="withdraw_initiated">Withdrawal initiated</string> <string name="withdraw_title">Withdrawal</string> <string name="withdraw_total">Withdraw</string> |