Merge master into staging-ln

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ env:
   # https://docs.github.com/en/packages/guides/pushing-and-pulling-docker-images
   #
   # Keep this in sync with default in scripts/github-ci.sh.
-  CI_IMAGE: ghcr.io/bitboxswiss/bitbox-wallet-app-ci:25
+  CI_IMAGE: ghcr.io/bitboxswiss/bitbox-wallet-app-ci:26
   GITHUB_BUILD_DIR: ${{github.workspace}}
 
 jobs:
@@ -181,9 +181,53 @@ jobs:
         run: |
           make gomobileinit
           (cd $GOPATH/$GO_SRC_DIR; make ios)
+  windows:
+    runs-on: windows-2019
+    defaults:
+      run:
+        shell: bash
+    env:
+      MINGW_BIN: /C/mingw64/bin
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with: 
+          submodules: recursive
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          # Take Go version to install from go.mod
+          go-version-file: 'go.mod'
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.2'
+          host: 'windows'
+          target: 'desktop'
+          arch: 'win64_msvc2019_64'
+          modules: 'qtwebengine qtwebchannel qtpositioning'
+      - name: Link Visual Studio editions
+        # This is needed due to our build expecting the Community edition, but Enterprise being pre-installed
+        shell: cmd
+        run: |
+          mklink /J "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise"
+      - name: Build Windows app
+        run: |
+          make qt-windows
+          cd frontends/qt
+          makensis setup.nsi
+      - name: Upload Installer
+        uses: actions/upload-artifact@v4
+        with:
+          path: frontends/qt/BitBox-installer.exe
+          name: BitBoxApp-Windows-${{ github.sha }}.exe
 
   report-artifacts:
-    needs: [android, qt-linux, macos]
+    needs: [android, qt-linux, macos, windows]
     runs-on: ubuntu-22.04
     if: ${{ !cancelled() && github.event_name == 'push' }}
     steps:
@@ -199,24 +243,24 @@ jobs:
         if: job.status == 'success'
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MM_WEBHOOK_URL }}
-          PAYLOAD: |-
-            {
-              "channel": "eng-artifacts",
-              "text": "**New artifacts built**\n([${{ github.ref_name }}](https://github.com/${{ github.repository }}/tree/${{ github.ref_name }}), [${{ steps.vars.outputs.git_sha_short }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}), [artifacts](https://github.com/${{ github.repository }}/actions/runs/${{github.run_id}}#artifacts))\n* Android - [APK](${{needs.android.outputs.artifact-url}})\n* Linux - [AppImage](${{needs.qt-linux.outputs.artifact-url-ai}}), [DEB](${{needs.qt-linux.outputs.artifact-url-deb}}), [RPM](${{needs.qt-linux.outputs.artifact-url-rpm}})\n* MacOS - [Zip](${{needs.macos.outputs.artifact-url}})",
-              "icon_emoji": "white_check_mark",
-              "props": {"card": "Repository: [${{ github.repository }}](https://github.com/${{ github.repository }})"}
-            }
+          MATTERMOST_ICON_URL: https://cdn4.iconfinder.com/data/icons/basic-ui-2-line/32/check-mark-checklist-complete-done-512.png
+          MATTERMOST_CHANNEL: eng-artifacts
+          TEXT: |
+            **New artifacts built**
+            ([${{ github.ref_name }}](https://github.com/${{ github.repository }}/tree/${{ github.ref_name }}), [${{ steps.vars.outputs.git_sha_short }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}), [artifacts](https://github.com/${{ github.repository }}/actions/runs/${{github.run_id}}#artifacts))
+            * Android - [APK](${{needs.android.outputs.artifact-url}})
+            * Linux - [AppImage](${{needs.qt-linux.outputs.artifact-url-ai}}), [DEB](${{needs.qt-linux.outputs.artifact-url-deb}}), [RPM](${{needs.qt-linux.outputs.artifact-url-rpm}})
+            * MacOS - [Zip](${{needs.macos.outputs.artifact-url}})
+            * Windows - [EXE](${{needs.windows.outputs.artifact-url}})
 
       - name: Message for failure
         uses: mattermost/action-mattermost-notify@master
         continue-on-error: true
         if: job.status == 'failure'
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MM_WEBHOOK_URL }}
-          PAYLOAD: |-
-            {
-              "channel": "eng-build-failures",
-              "text": "**Oh no! [${{ steps.vars.outputs.git_sha_short }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}) failed to build.**\nSee [run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) form more details.",
-              "icon_emoji": "warning",
-              "props": {"card": "Repository: [${{ github.repository }}](https://github.com/${{ github.repository }})\n\nbranch: [${{ github.ref_name }}](https://github.com/${{ github.repository }}/tree/${{ github.ref_name }})\n\ncommit: [${{ steps.vars.outputs.git_sha_short }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})"}
-            }
+          MATTERMOST_ICON_URL: https://cdn4.iconfinder.com/data/icons/basic-ui-2-line/32/exclamation-mark-triangle-sign-caution-1024.png
+          MATTERMOST_CHANNEL: eng-build-failures
+          TEXT: |
+            **Oh no! [${{ steps.vars.outputs.git_sha_short }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}) failed to build.**
+            See [run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for more details.

.golangci.yml

@@ -86,7 +86,7 @@ linters:
     - wsl
     - execinquery
     - ireturn
-    - copyloopvar
+    - exportloopref
     - intrange
     - wrapcheck
     - varnamelen

CHANGELOG.md

@@ -1,18 +1,33 @@
 # Changelog
 
 ## Unreleased
+- Fix long transaction notes to show fully on multiple lines when necessary
+- Improve send-to-self transactions in account overview
+- Use native scrollbars on macOS, iOS and Android
+
+# 4.46.3
+- Fix camera access on linux
+
+# 4.46.2
+- Fix Linux blank screen issue related to the local mimetype database
+
+# 4.46.1
+- Fix Android app crash on old Android versions
 
 # 4.46.0
 - Android: enable export logs feature
-- Label UTXOs that were created as change, as such, in coin control
-- Remove support for deprecated the Ethereum Goerli network
+- Label change UTXOs as "change" in coin control
+- Remove support for the deprecated Ethereum Goerli network
 - Revamp transaction history in account overview to improve legibility
 - Fix qrscanner when rotating the device or resizing the window
 - macOS: create a universal build that runs natively on arm64 and amd64
 - Show fiat amount at the time of the transaction in transaction history
 - Add BTC Direct private trading desk information
 - Android: fix stuck back button after closing a dialog
 - Fix authentication view glitch at startup
+- Remove "No priority" from fee options
+- Display skeleton screens (placeholder) in the account page during data loading to enhance UX
+- Fix Moonpay widget loading issues
 
 # 4.45.0
 - Bundle BitBox02 firmware version v9.21.0

Makefile

@@ -22,8 +22,8 @@ catch:
 envinit:
 	# Keep golangci-lint version in sync with what's in .github/workflows/ci.yml.
 	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.61.0
-	go install github.com/vektra/mockery/v2@latest
-	go install github.com/matryer/moq@latest
+	go install github.com/vektra/mockery/v2@v2.46.0
+	go install github.com/matryer/moq@v0.4.0
 	go install golang.org/x/tools/cmd/goimports@latest
 	$(MAKE) gomobileinit
 gomobileinit:

backend/accounts.go

@@ -1192,7 +1192,6 @@ func (backend *Backend) initPersistedAccounts() {
 	// will not be loaded, unless they have been marked as watch-only.
 outer:
 	for _, account := range backend.filterAccounts(&persistedAccounts, keystoreConnectedOrWatch) {
-		account := account
 		coin, err := backend.Coin(account.CoinCode)
 		if err != nil {
 			backend.log.Errorf("skipping persisted account %s/%s, could not find coin",
@@ -1379,7 +1378,6 @@ func (backend *Backend) ReinitializeAccounts() {
 func (backend *Backend) uninitAccounts(force bool) {
 	keep := []accounts.Interface{}
 	for _, account := range backend.accounts {
-		account := account
 
 		belongsToKeystore := false
 		if backend.keystore != nil {

backend/accounts/feetarget.go

@@ -43,7 +43,6 @@ func NewFeeTargetCode(code string) (FeeTargetCode, error) {
 	case string(FeeTargetCodeMempoolFastest):
 	case string(FeeTargetCodeMempoolHalfHour):
 	case string(FeeTargetCodeMempoolHour):
-	case string(FeeTargetCodeMempoolEconomy):
 	default:
 		return "", errp.WithStack(errp.Newf("Unrecognized fee target code %s", code))
 	}
@@ -72,9 +71,6 @@ const (
 	// FeeTargetCodeMempoolHour is the mempool hour fee target.
 	FeeTargetCodeMempoolHour FeeTargetCode = "mHour"
 
-	// FeeTargetCodeMempoolEconomy is the mempool economy fee target.
-	FeeTargetCodeMempoolEconomy FeeTargetCode = "mEconomy"
-
 	// FeeTargetCodeCustom means that the actual feerate is supplied separately instead of being
 	// estimated automatically.
 	FeeTargetCodeCustom FeeTargetCode = "custom"
@@ -92,7 +88,6 @@ type MempoolSpaceFees struct {
 	FastestFee  int64 `json:"fastestFee"`
 	HalfHourFee int64 `json:"halfHourFee"`
 	HourFee     int64 `json:"hourFee"`
-	EconomyFee  int64 `json:"economyFee"`
 	MinimumFee  int64 `json:"minimumFee"`
 }
 
@@ -106,8 +101,6 @@ func (fees MempoolSpaceFees) GetFeeRate(code FeeTargetCode) btcutil.Amount {
 		feeRatePerByte = fees.HalfHourFee
 	case FeeTargetCodeMempoolHour:
 		feeRatePerByte = fees.HourFee
-	case FeeTargetCodeMempoolEconomy:
-		feeRatePerByte = fees.EconomyFee
 	}
 	return btcutil.Amount(feeRatePerByte * 1000)
 }

backend/aopp_test.go

@@ -153,7 +153,6 @@ func TestAOPPSuccess(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		test := test
 		t.Run("", func(t *testing.T) {
 			handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, "POST", r.Method)

backend/coins/btc/account.go

@@ -336,7 +336,6 @@ func (account *Account) Initialize() error {
 		account.coin.Blockchain(), account.notifier, account.log)
 
 	for _, signingConfiguration := range signingConfigurations {
-		signingConfiguration := signingConfiguration
 
 		var subacc subaccount
 		subacc.signingConfiguration = signingConfiguration
@@ -496,7 +495,6 @@ func (account *Account) feeTargets() FeeTargets {
 	var feeTargets FeeTargets
 	if mempoolFees != nil {
 		feeTargets = FeeTargets{
-			{blocks: 12, code: accounts.FeeTargetCodeMempoolEconomy},
 			{blocks: 3, code: accounts.FeeTargetCodeMempoolHour},
 			{blocks: 2, code: accounts.FeeTargetCodeMempoolHalfHour},
 			{blocks: 1, code: accounts.FeeTargetCodeMempoolFastest},

backend/coins/btc/db/transactionsdb/transactionsdb_test.go

@@ -201,12 +201,10 @@ func TestTxQuick(t *testing.T) {
 		) bool {
 			txInRefs := make([]*wire.TxIn, len(txIns))
 			for k, v := range txIns {
-				v := v
 				txInRefs[k] = &v
 			}
 			txOutRefs := make([]*wire.TxOut, len(txOuts))
 			for k, v := range txOuts {
-				v := v
 				txOutRefs[k] = &v
 			}
 			expectedTx := &wire.MsgTx{
@@ -248,7 +246,6 @@ func TestTxQuick(t *testing.T) {
 		require.NoError(t, quick.Check(f, nil))
 
 		for txHash := range allUnverifiedTxHashes {
-			txHash := txHash
 			t.Run("", func(t *testing.T) {
 				expectedHeaderTimestamp := time.Unix(time.Now().Unix(), 123)
 				require.NoError(t, tx.MarkTxVerified(txHash, expectedHeaderTimestamp))
@@ -348,7 +345,6 @@ func TestInputQuick(t *testing.T) {
 		require.NoError(t, quick.Check(f, nil))
 
 		for _, outPoint := range allOutpoints {
-			outPoint := outPoint
 			t.Run("", func(t *testing.T) {
 				tx.DeleteInput(outPoint)
 				txHash, err := tx.Input(outPoint)
@@ -447,7 +443,6 @@ func TestOutputsQuick(t *testing.T) {
 
 		// Test deletion
 		for outPoint := range allOutputs {
-			outPoint := outPoint
 			t.Run("", func(t *testing.T) {
 				delete(allOutputs, outPoint)
 				tx.DeleteOutput(outPoint)

backend/coins/btc/electrum/electrum.go

@@ -152,7 +152,6 @@ func NewElectrumConnection(serverInfos []*config.ServerInfo, log *logrus.Entry,
 	retryTimeout := 30 * time.Second
 
 	for _, serverInfo := range serverInfos {
-		serverInfo := serverInfo
 		servers = append(servers, &failover.Server[*client]{
 			Name: serverInfo.Server,
 			Connect: func() (*client, error) {

backend/coins/btc/electrum/electrum_test.go

@@ -34,7 +34,6 @@ func TestDownloadCert(t *testing.T) {
 		{"1.2.3.4:123", ""},
 	}
 	for _, testcase := range tt {
-		testcase := testcase
 		t.Run(testcase.targetServer, func(t *testing.T) {
 			// Set up a fake ElectrumX node.
 			var didHandshake bool
@@ -84,7 +83,6 @@ func TestEstablishConnectionTLS(t *testing.T) {
 		{"1.2.3.4:123", ""},
 	}
 	for _, testcase := range tt {
-		testcase := testcase
 		t.Run(testcase.targetServer, func(t *testing.T) {
 			// Set up a fake ElectrumX node.
 			var didHandshake bool

backend/coins/btc/feetarget_test.go

@@ -63,7 +63,6 @@ func TestFeeTargets(t *testing.T) {
 
 	// non-empty slice, with all nil feeRates
 	feeTargets = FeeTargets{
-		{blocks: 12, code: accounts.FeeTargetCodeMempoolEconomy},
 		{blocks: 3, code: accounts.FeeTargetCodeMempoolHour},
 		{blocks: 2, code: accounts.FeeTargetCodeMempoolHalfHour},
 		{blocks: 1, code: accounts.FeeTargetCodeMempoolFastest},
@@ -72,7 +71,6 @@ func TestFeeTargets(t *testing.T) {
 
 	// non-empty slice, with all nil feeRates
 	feeTargets = FeeTargets{
-		{blocks: 12, code: accounts.FeeTargetCodeMempoolEconomy},
 		{blocks: 3, code: accounts.FeeTargetCodeMempoolHour},
 		{blocks: 2, code: accounts.FeeTargetCodeMempoolHalfHour},
 		{blocks: 1, code: accounts.FeeTargetCodeMempoolFastest},
@@ -81,22 +79,20 @@ func TestFeeTargets(t *testing.T) {
 
 	// non-empty slice, with some nil feeRates
 	feeTargetsSlice := []*FeeTarget{
-		{blocks: 12, code: accounts.FeeTargetCodeMempoolEconomy},
 		{blocks: 3, code: accounts.FeeTargetCodeMempoolHour, feeRatePerKb: amt(12)},
 		{blocks: 2, code: accounts.FeeTargetCodeMempoolHalfHour},
 		{blocks: 1, code: accounts.FeeTargetCodeMempoolFastest, feeRatePerKb: amt(123)},
 	}
 	feeTargets = feeTargetsSlice
-	require.Equal(t, feeTargetsSlice[3], feeTargets.highest())
+	require.Equal(t, feeTargetsSlice[2], feeTargets.highest())
 
 	// non-empty slice, with unsorted not-nil feeRates
 	feeTargetsSlice = []*FeeTarget{
 		{blocks: 3, code: accounts.FeeTargetCodeMempoolHour, feeRatePerKb: amt(12)},
-		{blocks: 12, code: accounts.FeeTargetCodeMempoolEconomy, feeRatePerKb: amt(1)},
 		{blocks: 1, code: accounts.FeeTargetCodeMempoolFastest, feeRatePerKb: amt(1234)},
 		{blocks: 2, code: accounts.FeeTargetCodeMempoolHalfHour, feeRatePerKb: amt(123)},
 	}
 	feeTargets = feeTargetsSlice
-	require.Equal(t, feeTargetsSlice[2], feeTargets.highest())
+	require.Equal(t, feeTargetsSlice[1], feeTargets.highest())
 
 }

backend/coins/btc/handlers/handlers.go

@@ -209,10 +209,10 @@ func (handlers *Handlers) getTxInfoJSON(txInfo *accounts.TransactionData, detail
 		Time:         formattedTime,
 		Addresses:    addresses,
 		Note:         handlers.account.TxNote(txInfo.InternalID),
+		Fee:          feeString,
 	}
 
 	if detail {
-		txInfoJSON.Fee = feeString
 		switch handlers.account.Coin().(type) {
 		case *btc.Coin:
 			txInfoJSON.VSize = txInfo.VSize

backend/coins/btc/maketx/maketx.go

@@ -185,7 +185,6 @@ func NewTxSpendAll(
 	previousOutputs := make(PreviousOutputs, len(spendableOutputs))
 	outputsSum := btcutil.Amount(0)
 	for outPoint, output := range spendableOutputs {
-		outPoint := outPoint // avoid reference reuse due to range loop
 		selectedOutPoints = append(selectedOutPoints, outPoint)
 		outputsSum += btcutil.Amount(output.TxOut.Value)
 		inputs = append(inputs, wire.NewTxIn(&outPoint, nil, nil))
@@ -272,7 +271,6 @@ func NewTx(
 		inputs := make([]*wire.TxIn, len(selectedOutPoints))
 		previousOutputs := make(PreviousOutputs, len(selectedOutPoints))
 		for i, outPoint := range selectedOutPoints {
-			outPoint := outPoint // avoids referencing the same variable across loop iterations
 			inputs[i] = wire.NewTxIn(&outPoint, nil, nil)
 			previousOutputs[outPoint] = &transactions.SpendableOutput{
 				TxOut: spendableOutputs[outPoint].TxOut,

backend/coins/btc/maketx/txsize_internal_test.go

@@ -141,14 +141,11 @@ func TestEstimateTxSize(t *testing.T) {
 	}
 
 	for _, useSegwit := range []bool{false, true} {
-		useSegwit := useSegwit
 		for _, outputScriptType := range scriptTypes {
-			outputScriptType := outputScriptType
 			t.Run(fmt.Sprintf("output=%s,noChange,segwit=%v", outputScriptType, useSegwit), func(t *testing.T) {
 				testEstimateTxSize(t, useSegwit, outputScriptType, "")
 			})
 			for _, changeScriptType := range scriptTypes {
-				changeScriptType := changeScriptType
 				t.Run(fmt.Sprintf("output=%s,change=%s,segwit=%v", outputScriptType, changeScriptType, useSegwit), func(t *testing.T) {
 					testEstimateTxSize(t, useSegwit, outputScriptType, changeScriptType)
 				})

backend/coins/coin/amount_test.go

@@ -27,7 +27,6 @@ import (
 
 func TestNewAmountFromString(t *testing.T) {
 	for decimals := 0; decimals <= 20; decimals++ {
-		decimals := decimals // avoids referencing the same variable across loop iterations
 		unit := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(decimals)), nil)
 		t.Run(fmt.Sprintf("decimals=%d", decimals), func(t *testing.T) {
 			require.NoError(t, quick.Check(func(amount int64) bool {
@@ -46,7 +45,6 @@ func TestNewAmountFromString(t *testing.T) {
 		"1/1000",
 		"0.123456789", // only up to 8 decimals allowed
 	} {
-		fail := fail // avoids referencing the same variable across loop iterations
 		t.Run(fail, func(t *testing.T) {
 			_, err := coin.NewAmountFromString(fail, big.NewInt(1e8))
 			require.Error(t, err)