Master into staging ln - Githubissues

BitBoxSwiss / bitbox-wallet-app

The BitBoxApp for desktop and mobile.

https://bitbox.swiss/app

Apache License 2.0

245 stars 82 forks source link

Master into staging ln #2782

Closed Beerosagos closed 2 weeks ago

Beerosagos commented 2 weeks ago

Conflicts:

backend/handlers/handlers.go
backend/util/util.go
frontends/web/package.json
frontends/web/src/api/account.ts
frontends/web/src/components/forms/label.tsx
frontends/web/src/components/icon/logo.tsx
frontends/web/src/components/sidebar/sidebar.tsx
frontends/web/src/routes/account/summary/accountssummary.tsx
frontends/web/src/routes/account/summary/balancerow.tsx
frontends/web/src/routes/account/summary/summarybalance.tsx
go.mod
go.sum
vendor/modules.txt

I also updated:

backend/config/config_test.go
frontends/web/src/routes/lightning/guide.tsx

To adapt to the changes and fix a CI error.