Merge remote-tracking branch 'upstream/dev'

Author: cipig

assets/config/0.5.4-coins.json

@@ -1096,7 +1096,7 @@
       },
       {
         "url": "electrum1.cipig.net:10000",
-        "ws_url": "electrum3.cipig.net:30000"
+        "ws_url": "electrum1.cipig.net:30000"
       }
     ],
     "explorer_url": [
@@ -2774,6 +2774,7 @@
     "name": "GRMS",
     "coingecko_id": "test-coin",
     "coinpaprika_id": "grms-grms",
+    "nomics_id": "GRMS",
     "electrum": [
       {
         "url": "89.108.102.188:17485"
@@ -4693,11 +4694,11 @@
       },
       {
         "url": "electrum2.cipig.net:10001",
-        "ws_url": "electrum3.cipig.net:30001"
+        "ws_url": "electrum2.cipig.net:30001"
       },
       {
         "url": "electrum1.cipig.net:10001",
-        "ws_url": "electrum3.cipig.net:30001"
+        "ws_url": "electrum1.cipig.net:30001"
       }
     ],
     "explorer_url": [
@@ -8583,6 +8584,58 @@
     "active": false,
     "currently_enabled": false
   },
+  "PRCY-BEP20": {
+    "coin": "PRCY-BEP20",
+    "name": "PRivaCY Coin",
+    "coinpaprika_id": "prcy-privacy-coin",
+    "coingecko_id": "privacy-coin",
+    "nomics_id": "PRCY",
+    "nodes": [
+      "http://bsc1.cipig.net:8655",
+      "http://bsc2.cipig.net:8655",
+      "http://bsc3.cipig.net:8655"
+    ],
+    "explorer_url": [
+      "https://bscscan.com/"
+    ],
+    "type": "BEP-20",
+    "active": false,
+    "currently_enabled": false
+  },
+  "PRCY-ERC20": {
+    "coin": "PRCY-ERC20",
+    "name": "PRivaCY Coin",
+    "coinpaprika_id": "prcy-privacy-coin",
+    "coingecko_id": "privacy-coin",
+    "nomics_id": "PRCY",
+    "nodes": [
+      "http://eth1.cipig.net:8555",
+      "http://eth2.cipig.net:8555",
+      "http://eth3.cipig.net:8555"
+    ],
+    "explorer_url": [
+      "https://etherscan.io/"
+    ],
+    "type": "ERC-20",
+    "active": false,
+    "currently_enabled": false
+  },
+  "PRCY-PLG20": {
+    "coin": "PRCY-PLG20",
+    "name": "PRivaCY Coin",
+    "coinpaprika_id": "prcy-privacy-coin",
+    "coingecko_id": "privacy-coin",
+    "nomics_id": "PRCY",
+    "nodes": [
+      "https://polygon-rpc.com"
+    ],
+    "explorer_url": [
+      "https://polygonscan.com/"
+    ],
+    "type": "Matic",
+    "active": false,
+    "currently_enabled": false
+  },
   "REP": {
     "coin": "REP",
     "name": "Reputation",
@@ -8843,6 +8896,7 @@
     "name": "Ubiq",
     "coinpaprika_id": "ubq-ubiq",
     "coingecko_id": "ubiq",
+    "nomics_id": "UBQ",
     "nodes": [
       "https://rpc.octano.dev/"
     ],

atomic_defi_design/Dex/Constants/Style.qml

@@ -453,6 +453,7 @@ QtObject {
                                           "POWR": "#05BCAA",
                                           "PPC": "#46BC60",
                                           "PRUX": "#FF8000",
+                                          "PRCY": "#012828",
                                           "QI": "#FFFFFF",
                                           "QIAIR": "#FEFEFE",
                                           "QKC": "#2175B4",

atomic_defi_design/Dex/Wallet/TransactionDetailsModal.qml

@@ -2,9 +2,12 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
 
+import Qaterial 1.0 as Qaterial
+
 import "../Components"
 import "../Constants"
 import App 1.0
+import Dex.Themes 1.0 as Dex
 
 // Open Transaction Details Modal
 BasicModal {
@@ -52,11 +55,17 @@ BasicModal {
         }
 
         // Transaction Hash
-        TextEditWithTitle {
+        TextEditWithTitle
+        {
+            id: txHash
             title: qsTr("Transaction Hash")
             text: !details ? "" :
                     details.tx_hash
             privacy: true
+            copy: true
+
+            onCopyNotificationTitle: qsTr("Transactions")
+            onCopyNotificationMsg: qsTr("txid copied to clipboard")
         }
 
         // Confirmations
@@ -96,6 +105,7 @@ BasicModal {
                 }
             }
         }
+
         // Notes
         TextAreaWithTitle {
             id: notes

atomic_defi_design/assets/images/coins/prcy.png

@@ -188,6 +188,7 @@
         <file>assets/images/coins/pnk.png</file>
         <file>assets/images/coins/powr.png</file>
         <file>assets/images/coins/ppc.png</file>
+        <file>assets/images/coins/prcy.png</file>
         <file>assets/images/coins/prux.png</file>
         <file>assets/images/coins/put.png</file>
         <file>assets/images/coins/qbt.png</file>

atomic_defi_design/qml.qrc

@@ -31,7 +31,7 @@ sudo apt-get install build-essential \
 # get llvm
 wget https://apt.llvm.org/llvm.sh
 chmod +x llvm.sh
-sudo ./llvm.sh 12
+sudo ./llvm.sh 12 all
 # set clang version
 sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 777
 sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 777
@@ -68,4 +68,5 @@ cd tar-1.32
 export FORCE_UNSAFE_CONFIGURE=1
 ./configure
 sudo make -j install
+sudo ln -s /bin/tar /usr/local/bin/tar
 sudo update-alternatives --install /usr/bin/tar tar /usr/local/bin/tar 777