Merge branch 'release-into-master-merged'

Author: thisconnect

CHANGELOG.md

@@ -3,7 +3,6 @@
 ## Unreleased
 - Reduced support for BitBox01
 - Fix a bug that would prevent the app to perform firmware upgrade when offline.
-- Upgraded to Qt 6.8.2, dropping support for macOS 11 and Ubuntu 20.04.
 
 # 4.47.0
 - Bundle BitBox02 firmware version v9.22.0
@@ -24,6 +23,7 @@
 - Create desktop shortcut by default on Windows during installation
 - Migrate from deprecated Walletconnect web3wallet to Reown, add Sepolia, Arbitrum, Base, and Optimism to supported chains
 - Added BTC Direct buy option
+- Upgraded to Qt 6.8.2, dropping support for macOS 11 and Ubuntu 20.04.
 
 # 4.46.3
 - Fix camera access on linux

backend/accounts/transaction_test.go

@@ -277,6 +277,14 @@ func TestOrderedTransactionsDeductedAmount(t *testing.T) {
 			Amount:             amount,
 			Fee:                &fee,
 		},
+		{
+			// timestamp is nil, deductedAmount is still set
+			Timestamp: nil,
+			Height:    15,
+			Type:      TxTypeSend,
+			Amount:    amount,
+			Fee:       &fee,
+		},
 	}
 
 	orderedTxs := NewOrderedTransactions(txs)
@@ -285,4 +293,5 @@ func TestOrderedTransactionsDeductedAmount(t *testing.T) {
 	requireAmountIsEqualTo(t, orderedTxs[1].DeductedAmount, 10)
 	requireAmountIsEqualTo(t, orderedTxs[2].DeductedAmount, 0)
 	requireAmountIsEqualTo(t, orderedTxs[3].DeductedAmount, 100)
+	requireAmountIsEqualTo(t, orderedTxs[4].DeductedAmount, 110)
 }

backend/backend.go

@@ -645,7 +645,7 @@ func (backend *Backend) Start() <-chan interface{} {
 
 	backend.environment.OnAuthSettingChanged(backend.config.AppConfig().Backend.Authentication)
 
-	if backend.DefaultAppConfig().Backend.StartInTestnet {
+	if backend.config.AppConfig().Backend.StartInTestnet {
 		if err := backend.config.ModifyAppConfig(func(c *config.AppConfig) error { c.Backend.StartInTestnet = false; return nil }); err != nil {
 			backend.log.WithError(err).Error("Can't set StartInTestnet to false")
 		}

backend/coins/btc/handlers/handlers.go

@@ -121,14 +121,18 @@ func (handlers *Handlers) formatAmountAsJSON(amount coin.Amount, isFee bool) For
 
 func (handlers *Handlers) formatAmountAtTimeAsJSON(amount coin.Amount, timeStamp *time.Time) FormattedAmount {
 	accountCoin := handlers.account.Coin()
-	conversions, estimated := coin.ConversionsAtTime(
-		amount,
-		handlers.account.Coin(),
-		false,
-		handlers.account.Config().RateUpdater,
-		util.FormatBtcAsSat(handlers.account.Config().BtcCurrencyUnit),
-		timeStamp,
-	)
+	conversions := map[string]string{}
+	estimated := false
+	if timeStamp != nil {
+		conversions, estimated = coin.ConversionsAtTime(
+			amount,
+			handlers.account.Coin(),
+			false,
+			handlers.account.Config().RateUpdater,
+			util.FormatBtcAsSat(handlers.account.Config().BtcCurrencyUnit),
+			timeStamp,
+		)
+	}
 	return FormattedAmount{
 		Amount:      accountCoin.FormatAmount(amount, false),
 		Unit:        accountCoin.GetFormatUnit(false),
@@ -195,12 +199,12 @@ func (handlers *Handlers) getTxInfoJSON(txInfo *accounts.TransactionData, detail
 		timestamp = txInfo.CreatedTimestamp
 	}
 
-	var deductedAmountAtTime FormattedAmount
+	deductedAmountAtTime := handlers.formatAmountAtTimeAsJSON(txInfo.DeductedAmount, timestamp)
+
 	if timestamp != nil {
 		t := timestamp.Format(time.RFC3339)
 		formattedTime = &t
 		amountAtTime = handlers.formatAmountAtTimeAsJSON(txInfo.Amount, timestamp)
-		deductedAmountAtTime = handlers.formatAmountAtTimeAsJSON(txInfo.DeductedAmount, timestamp)
 	}
 
 	addresses := []string{}

backend/exchanges/btcdirect.go

@@ -61,7 +61,7 @@ func isRegionSupportedBtcDirect(region string) bool {
 func IsBtcDirectSupported(coinCode coin.Code) bool {
 	supportedCoins := []coin.Code{
 		coin.CodeBTC, coin.CodeTBTC, coin.CodeLTC, coin.CodeTLTC, coin.CodeETH, coin.CodeSEPETH,
-		"eth-erc20-usdt", "eth-erc20-usdc", "eth-erc20-link"}
+		"eth-erc20-usdc", "eth-erc20-link"}
 
 	coinSupported := slices.Contains(supportedCoins, coinCode)
 
@@ -80,7 +80,7 @@ func BtcDirectDeals() *ExchangeDealsList {
 		ExchangeName: BTCDirectName,
 		Deals: []*ExchangeDeal{
 			{
-				Fee:     3, // 3%
+				Fee:     3.9, // 3.9%
 				Payment: CardPayment,
 				IsFast:  true,
 			},

cmd/servewallet/main.go

@@ -103,18 +103,6 @@ func (webdevEnvironment) NativeLocale() string {
 	if v == "" {
 		v = os.Getenv("LANG")
 	}
-	// try macOS specific AppleLocale
-	if v == "" && runtime.GOOS == "darwin" {
-		cmd := exec.Command("defaults", "read", "-g", "AppleLocale") // may return something like en_US@rg=chzzzz
-		out, err := cmd.Output()
-		if err == nil {
-			v = strings.Split(string(out), "@")[0]
-		}
-	}
-	// If still empty, provide a default
-	if v == "" {
-		v = "en_US" // Default to English (United States)
-	}
 	// Strip charset from the LANG. It is unsupported by JS Date formatting
 	// used in the frontend and breaks UI in unexpected ways.
 	// We are always UTF-8 anyway.

frontends/qt/BitBox.pro

@@ -59,9 +59,10 @@ unix:!macx {
 
 SOURCES += \
         main.cpp \
-        filedialog.cpp
+        filedialog.cpp \
+        urlhandler.cpp
 
-HEADERS += libserver.h webclass.h filedialog.h
+HEADERS += libserver.h webclass.h filedialog.h urlhandler.h
 
 unix:macx {
     CONFIG += sdk_no_version_check

frontends/qt/main.cpp

@@ -38,6 +38,7 @@
 #include <QSystemTrayIcon>
 #include <QMessageBox>
 #include <QtGlobal>
+#include <QtSystemDetection>
 #if defined(_WIN32)
 #if QT_VERSION_MAJOR >= 6
 #include <private/qguiapplication_p.h>
@@ -55,6 +56,7 @@
 #include "filedialog.h"
 #include "libserver.h"
 #include "webclass.h"
+#include "urlhandler.h"
 
 #define APPNAME "BitBoxApp"
 
@@ -85,25 +87,6 @@ class BitBoxApp : public SingleApplication
         Mode::User | Mode::SecondaryNotification | Mode::ExcludeAppVersion | Mode::ExcludeAppPath)
     {
     }
-
-#if defined(Q_OS_MACOS)
-    bool event(QEvent *event) override
-    {
-        if (event->type() == QEvent::FileOpen) {
-            QFileOpenEvent* openEvent = static_cast<QFileOpenEvent*>(event);
-            if (!openEvent->url().isEmpty()) {
-                // This is only supported on macOS and is used to handle URIs that are opened with
-                // the BitBoxApp, such as "aopp:..." links. The event is received and handled both
-                // if the BitBoxApp is launched and also when it is already running, in which case
-                // it is brought to the foreground automatically.
-
-                handleURI(openEvent->url().toString().toUtf8().constData());
-            }
-        }
-
-        return QApplication::event(event);
-    }
-#endif
 };
 
 class WebEnginePage : public QWebEnginePage {
@@ -318,6 +301,12 @@ int main(int argc, char *argv[])
     }
 
     BitBoxApp a(argc, argv);
+    // The URI scheme handler for aopp is handled via OS events on macOS. The other platforms invoke
+    // the process with the uri as a command line param.
+#if defined(Q_OS_MACOS)
+    UrlHandler url_handler;
+    url_handler.setup();
+#endif
     // These three are part of the SingleApplication instance ID - if changed, the user should close
     // th existing app before launching the new one.
     // See https://github.com/BitBoxSwiss/SingleApplication/blob/c557da5d0cb63b8002c1ba99ec18f257620009b1/singleapplication_p.cpp#L135-L137

frontends/qt/resources/MacOS/entitlements.plist

@@ -3,8 +3,17 @@
 <plist version="1.0">
   <dict>
     <!-- needed for QtWebEngine, otherwise there is a gray screen at launch -->
+    <!-- all these are copied from QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Resources/QtWebEngineProcess.entitlements. -->
+    <!-- see https://doc.qt.io/qt-6/qtwebengine-deploying.html#macos-specific-deployment-steps -->
     <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
     <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.disable-executable-page-protection</key>
+    <true/>
+
     <!-- needed for USB HID access, who knows why -->
     <key>com.apple.security.cs.allow-dyld-environment-variables</key>
     <true/>

frontends/qt/urlhandler.cpp

@@ -0,0 +1,34 @@
+// Copyright 2025 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "urlhandler.h"
+#include "libserver.h"
+
+#include <iostream>
+#include <QDesktopServices>
+
+UrlHandler::UrlHandler(QObject *parent) : QObject(parent) {
+}
+
+void UrlHandler::setup() {
+    // This is only supported on macOS and is used to handle URIs that are opened with
+    // the BitBoxApp using "aopp:..." links. The event is received and handled both
+    // if the BitBoxApp is launched and also when it is already running, in which case
+    // it is brought to the foreground automatically.
+    QDesktopServices::setUrlHandler("aopp", this, "handleUrlSlot");
+}
+
+void UrlHandler::handleUrlSlot(const QUrl &url) {
+    handleURI(url.toString().toUtf8().constData());
+}