Merge branch 'better_fiat_tracking' of https://github.com/lnbits/lnbits into better_fiat_tracking

This commit is contained in:
arcbtc
2024-12-19 13:36:30 +00:00
3 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ async def create_wallet(
user=user_id,
adminkey=uuid4().hex,
inkey=uuid4().hex,
currency='USD',
currency="USD",
)
await (conn or db).insert("wallets", wallet)
return wallet
+1 -1
View File
@@ -683,4 +683,4 @@ async def m029_create_audit_table(db: Connection):
created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
);
"""
)
)
+4 -1
View File
@@ -727,7 +727,10 @@ window.app = Vue.createApp({
this.$q.localStorage.set('lnbits.disclaimerShown', true)
}
// check blanace priority
if (this.$q.localStorage.getItem('lnbits.isPrioritySwapped')) {
if (
this.$q.localStorage.getItem('lnbits.isPrioritySwapped') &&
this.g.wallet.currency
) {
this.isPrioritySwapped = this.$q.localStorage.getItem(
'lnbits.isPrioritySwapped'
)