diff --git a/src/cryptoadvance/specter/controller.py b/src/cryptoadvance/specter/controller.py index a5672aa70c..4bc106db0c 100644 --- a/src/cryptoadvance/specter/controller.py +++ b/src/cryptoadvance/specter/controller.py @@ -788,9 +788,23 @@ def fees(blocks): res = app.specter.estimatesmartfee(int(blocks)) return res -@app.route('/wallets//send/new', methods=['GET', 'POST']) +@app.route('/wallets//send') @login_required def wallet_send(wallet_alias): + app.specter.check() + try: + wallet = app.specter.wallet_manager.get_by_alias(wallet_alias) + except SpecterError as se: + app.logger.error("SpecterError while wallet_send: %s" % se) + return render_template("base.jinja", error=se, specter=app.specter, rand=rand) + if len(wallet.pending_psbts) > 0: + return redirect(url_for('wallet_sendpending', wallet_alias=wallet_alias)) + else: + return redirect(url_for('wallet_sendnew', wallet_alias=wallet_alias)) + +@app.route('/wallets//send/new', methods=['GET', 'POST']) +@login_required +def wallet_sendnew(wallet_alias): app.specter.check() try: wallet = app.specter.wallet_manager.get_by_alias(wallet_alias) diff --git a/src/cryptoadvance/specter/templates/wallet/send/components/send_nav.jinja b/src/cryptoadvance/specter/templates/wallet/send/components/send_nav.jinja index fed9dfaa51..fda6b0f0fc 100644 --- a/src/cryptoadvance/specter/templates/wallet/send/components/send_nav.jinja +++ b/src/cryptoadvance/specter/templates/wallet/send/components/send_nav.jinja @@ -9,7 +9,7 @@ {% macro send_nav(active_menuitem, wallet_alias) -%}
diff --git a/src/cryptoadvance/specter/templates/wallet/send/import/wallet_importpsbt.jinja b/src/cryptoadvance/specter/templates/wallet/send/import/wallet_importpsbt.jinja index cfdfa1dbc2..a83fd6b160 100644 --- a/src/cryptoadvance/specter/templates/wallet/send/import/wallet_importpsbt.jinja +++ b/src/cryptoadvance/specter/templates/wallet/send/import/wallet_importpsbt.jinja @@ -5,7 +5,7 @@ {{ send_nav('wallet_importpsbt', wallet_alias) }}

Import PSBT transaction:

Paste base64-encoded PSBT transaction here to import. -
+
diff --git a/src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja b/src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja index b84558defb..418c825989 100644 --- a/src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja +++ b/src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja @@ -2,14 +2,14 @@ {% set tab = 'wallet_send' %} {% block content %} {% from 'wallet/send/components/send_nav.jinja' import send_nav %} - {{ send_nav('wallet_send', wallet_alias) }} + {{ send_nav('wallet_sendnew', wallet_alias) }} - +

Sending to:

Recipient address:
diff --git a/src/cryptoadvance/specter/templates/wallet/send/pending/components/pending_psbt_item.jinja b/src/cryptoadvance/specter/templates/wallet/send/pending/components/pending_psbt_item.jinja index 0c02186aec..61f2b81fda 100644 --- a/src/cryptoadvance/specter/templates/wallet/send/pending/components/pending_psbt_item.jinja +++ b/src/cryptoadvance/specter/templates/wallet/send/pending/components/pending_psbt_item.jinja @@ -24,7 +24,7 @@
- + diff --git a/src/cryptoadvance/specter/templates/wallet/send/sign/wallet_send_sign_psbt.jinja b/src/cryptoadvance/specter/templates/wallet/send/sign/wallet_send_sign_psbt.jinja index ab9bc85f94..9b1cd0cc4d 100644 --- a/src/cryptoadvance/specter/templates/wallet/send/sign/wallet_send_sign_psbt.jinja +++ b/src/cryptoadvance/specter/templates/wallet/send/sign/wallet_send_sign_psbt.jinja @@ -60,7 +60,7 @@
{% from 'wallet/components/explorer_link.jinja' import explorer_link %} -
+
Sending {{ psbt["amount"] | btcamount }} BTC to