Merge pull request #3391

142c6bc cmake: prepare v0.17.2.1 (selsta)

CMakeLists.txt

@@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(VERSION_MAJOR "17")
 set(VERSION_MINOR "2")
-set(VERSION_REVISION "0")
+set(VERSION_REVISION "1")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 
 option(STATIC "Link libraries statically, requires static Qt")

main.qml

@@ -885,7 +885,7 @@ ApplicationWindow {
                 return recipient.address;
             });
             const amountsxmr = recipients.map(function (recipient) {
-                return walletManager.amountFromString(recipient.amount);
+                return recipient.amount;
             });
             currentWallet.createTransactionAsync(addresses, paymentId, amountsxmr, mixinCount, priority);
         }

src/CMakeLists.txt

@@ -20,7 +20,7 @@ file(GLOB SOURCE_FILES
     "libwalletqt/PendingTransaction.cpp"
     "libwalletqt/TransactionHistory.cpp"
     "libwalletqt/TransactionInfo.cpp"
-    "libwalletqt/QRCodeImageProvider.cpp" QR
+    "libwalletqt/QRCodeImageProvider.cpp"
     "libwalletqt/AddressBook.cpp"
     "libwalletqt/Subaddress.cpp"
     "libwalletqt/SubaddressAccount.cpp"

src/libwalletqt/Wallet.cpp

@@ -535,7 +535,7 @@ void Wallet::pauseRefresh()
 PendingTransaction *Wallet::createTransaction(
     const QVector<QString> &destinationAddresses,
     const QString &payment_id,
-    const QVector<quint64> &amounts,
+    const QVector<QString> &destinationAmounts,
     quint32 mixin_count,
     PendingTransaction::Priority priority)
 {
@@ -543,11 +543,15 @@ PendingTransaction *Wallet::createTransaction(
     for (const auto &address : destinationAddresses) {
         destinations.push_back(address.toStdString());
     }
+    std::vector<uint64_t> amounts;
+    for (const auto &amount : destinationAmounts) {
+        amounts.push_back(Monero::Wallet::amountFromString(amount.toStdString()));
+    }
     std::set<uint32_t> subaddr_indices;
     Monero::PendingTransaction *ptImpl = m_walletImpl->createTransactionMultDest(
         destinations,
         payment_id.toStdString(),
-        std::vector<uint64_t>(amounts.begin(), amounts.end()),
+        amounts,
         mixin_count,
         static_cast<Monero::PendingTransaction::Priority>(priority),
         currentSubaddressAccount(),
@@ -559,12 +563,12 @@ PendingTransaction *Wallet::createTransaction(
 void Wallet::createTransactionAsync(
     const QVector<QString> &destinationAddresses,
     const QString &payment_id,
-    const QVector<quint64> &amounts,
+    const QVector<QString> &destinationAmounts,
     quint32 mixin_count,
     PendingTransaction::Priority priority)
 {
-    m_scheduler.run([this, destinationAddresses, payment_id, amounts, mixin_count, priority] {
+    m_scheduler.run([this, destinationAddresses, payment_id, destinationAmounts, mixin_count, priority] {
-        PendingTransaction *tx = createTransaction(destinationAddresses, payment_id, amounts, mixin_count, priority);
+        PendingTransaction *tx = createTransaction(destinationAddresses, payment_id, destinationAmounts, mixin_count, priority);
         emit transactionCreated(tx, destinationAddresses, payment_id, mixin_count);
     });
 }

src/libwalletqt/Wallet.h

@@ -220,7 +220,7 @@ public:
     Q_INVOKABLE void createTransactionAsync(
         const QVector<QString> &destinationAddresses,
         const QString &payment_id,
-        const QVector<quint64> &amounts,
+        const QVector<QString> &destinationAmounts,
         quint32 mixin_count,
         PendingTransaction::Priority priority);
 
@@ -421,7 +421,7 @@ private:
     PendingTransaction *createTransaction(
         const QVector<QString> &destinationAddresses,
         const QString &payment_id,
-        const QVector<quint64> &amounts,
+        const QVector<QString> &destinationAmounts,
         quint32 mixin_count,
         PendingTransaction::Priority priority);
 

src/qt/utils.cpp

@@ -105,6 +105,7 @@ QString xdgMime(){
         "StartupNotify=true\n"
         "X-GNOME-Bugzilla-Bugzilla=GNOME\n"
         "X-GNOME-UsesNotifications=true\n"
+        "StartupWMClass=monero-wallet-gui\n"
     ).arg(QCoreApplication::applicationFilePath());
 }