Merge remote-tracking branch 'arcbtc/FastAPI' into FastAPI

lnbits/extensions/livestream/views.py

@@ -21,8 +21,9 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 
 @livestream_ext.get("/track/{track_id}", name="livestream.track_redirect_download")
-async def track_redirect_download(track_id, request: Request):
+async def track_redirect_download(track_id, p: str = Query(...)):
-    payment_hash = request.path_params["p"]
+    print("BOO", track_id, p)
+    payment_hash = p
     track = await get_track(track_id)
     ls = await get_livestream_by_track(track_id)
     payment: Payment = await get_wallet_payment(ls.wallet, payment_hash)

lnbits/extensions/satspay/templates/satspay/index.html

@@ -509,6 +509,13 @@
           .then(function (response) {
             self.ChargeLinks.push(mapCharge(response.data))
             self.formDialogCharge.show = false
+            self.formDialogCharge.data = {
+              onchain: false,
+              lnbits: false,
+              description: '',
+              time: null,
+              amount: null
+            }
           })
           .catch(function (error) {
             LNbits.utils.notifyApiError(error)