BitBoxSwiss / bitbox-wallet-app

The BitBoxApp for desktop and mobile.
https://bitbox.swiss/app
Apache License 2.0
251 stars 82 forks source link

Merge master into staging ln #2723

Closed Beerosagos closed 3 months ago

Beerosagos commented 3 months ago

Conflicts: backend/backend.go backend/handlers/handlers.go frontends/web/src/api/coins.ts frontends/web/src/components/forms/index.tsx frontends/web/src/components/sidebar/sidebar.tsx frontends/web/src/contexts/providers.tsx go.mod

Also updated all the digitalbitbox github imports into the new domain name BitBoxSwiss in the backend lightning-related files

Beerosagos commented 3 months ago

just out of interest: how do you update go.mod and go.sum, when you have a conflict?

I usually fix go.mod and then run go mod tidy, which should update everything else. But I'm not sure if fixing go.mod manually is actually necessary, or if go mod tidy can take care of it directly.. cc @benma