Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
benarc
2022-03-07 04:05:43 +00:00
7 changed files with 80 additions and 64 deletions
+2 -2
View File
@@ -364,12 +364,12 @@ new Vue({
},
decodeRequest: function () {
this.parse.show = true
let req = this.parse.data.request.toLowerCase()
if (this.parse.data.request.startsWith('lightning:')) {
this.parse.data.request = this.parse.data.request.slice(10)
} else if (this.parse.data.request.startsWith('lnurl:')) {
this.parse.data.request = this.parse.data.request.slice(6)
} else if (this.parse.data.request.indexOf('lightning=lnurl1') !== -1) {
} else if (req.indexOf('lightning=lnurl1') !== -1) {
this.parse.data.request = this.parse.data.request
.split('lightning=')[1]
.split('&')[0]
+1 -1
View File
@@ -560,6 +560,6 @@ async def api_fiat_as_sats(data: ConversionData):
return output
else:
output[data.from_.upper()] = data.amount
output["sats"] = await fiat_amount_as_satoshis(data.amount, data.to)
output["sats"] = await fiat_amount_as_satoshis(data.amount, data._from)
output["BTC"] = output["sats"] / 100000000
return output
+1 -1
View File
@@ -43,7 +43,7 @@ class LndRestWallet(Wallet):
self.macaroon = load_macaroon(macaroon)
self.auth = {"Grpc-Metadata-macaroon": self.macaroon}
self.cert = getenv("LND_REST_CERT")
self.cert = getenv("LND_REST_CERT", True)
async def status(self) -> StatusResponse:
try: