Merge remote-tracking branch 'origin/master' into dashboard_tab

PIVX-Labs · Sep 25, 2023 · f470f3b · f470f3b
2 parents 562aa67 + e468186
commit f470f3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/Activity.vue b/scripts/Activity.vue
@@ -181,7 +181,7 @@ async function parseTXs(arrTXs) {
             // Check all addresses to find our own, caching them for performance
             for (const strAddr of cTx.receivers.concat(cTx.senders)) {
                 // If a previous Tx checked this address, skip it, otherwise, check it against our own address(es)
-                if (!(await wallet.getMasterKey().isOwnAddress(strAddr))) {
+                if (!(await wallet.isOwnAddress(strAddr))) {
                     // External address, this is not a self-only Tx
                     fSendToSelf = false;
                 }
@@ -208,7 +208,7 @@ async function parseTXs(arrTXs) {
                 const arrExternalAddresses = (
                     await Promise.all(
                         cTx[where].map(async (addr) => [
-                            await wallet.getMasterKey().isOwnAddress(addr),
+                            await wallet.isOwnAddress(addr),
                             addr,
                         ])
                     )

diff --git a/scripts/global.js b/scripts/global.js
@@ -780,7 +780,7 @@ export async function openSendQRScanner() {
  */
 export async function openExplorer(strAddress = '') {
     if (wallet.isLoaded() && wallet.isHD() && !strAddress) {
-        const xpub = await wallet.getxpub();
+        const xpub = await wallet.getXPub();
         window.open(cExplorer.url + '/xpub/' + xpub, '_blank');
     } else {
         const address = strAddress || (await wallet.getAddress());