From ea844c9298e4a32f51bfd965e59e4598067c64a0 Mon Sep 17 00:00:00 2001
From: Pigpig105 <81789882+Pigpig105@users.noreply.github.com>
Date: Fri, 3 Feb 2023 19:49:09 -0800
Subject: [PATCH 1/2] Update wallet-profile.js

---
 .../src/components/wallet-profile.js          | 57 +++++++++++++++++--
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/qortal-ui-core/src/components/wallet-profile.js b/qortal-ui-core/src/components/wallet-profile.js
index 65e2ec6c..475dfea8 100644
--- a/qortal-ui-core/src/components/wallet-profile.js
+++ b/qortal-ui-core/src/components/wallet-profile.js
@@ -12,6 +12,7 @@ class WalletProfile extends connect(store)(LitElement) {
             wallet: { type: Object },
             nodeConfig: { type: Object },
             accountInfo: { type: Object },
+            imageUrl: { type: String },
             theme: { type: String, reflect: true }
         }
     }
@@ -30,6 +31,7 @@ class WalletProfile extends connect(store)(LitElement) {
             names: [],
             addressInfo: {}
         }
+        this.imageUrl = ''
         this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
     }
 
@@ -56,9 +58,9 @@ class WalletProfile extends connect(store)(LitElement) {
                     margin: 0;
                     font-size: 18px;
                     font-weight:500;
-                    display: inline-block;
                     width:100%;
                     padding-bottom:8px;
+                    display: flex;
                 }
 
                 #blocksMinted {
@@ -76,16 +78,37 @@ class WalletProfile extends connect(store)(LitElement) {
                     margin-top:8px;
                     font-size:11px;
                 }
+
+                .round-fullinfo {
+                    position: relative;
+                    width: 69px;
+                    height: 69px;
+                    border-radius: 50%;
+                }
+
+                .full-info-logo {
+                    width: 69px;
+                    height: 69px;
+                    border-radius: 50%;
+                }
+
+                .inline-block-child {
+                    flex: 1;
+                }
             </style>
 
 
             <div id="profileInMenu">
                 <div style="padding: 8px 0;">
-                    <span id="accountName">
-                        ${this.accountInfo.names.length !== 0 ? this.accountInfo.names[0].name : ''}
-                    </span>
-                    ${this.accountInfo.addressInfo ? html`<span style="margin-bottom: 8px; display: inline-block; font-size: 14px;">${translate("walletprofile.minterlevel")} - <span style="color: #03a9f4;">${this.accountInfo.addressInfo.level} ${this.accountInfo.addressInfo.flags === 1 ? html`<strong>(F)</strong>` : ''}</span>` : ''}
-                    <p id="blocksMinted">${translate("walletprofile.blocksminted")} - ${this.accountInfo.addressInfo.blocksMinted + this.accountInfo.addressInfo.blocksMintedAdjustment}</p>
+                    <div id="accountName">
+                        <div id="child inline-block-child" class="full-info-logo">${this.getAvatar()}</div>
+                        &nbsp;&nbsp;&nbsp;
+                        <div id="inline-block-child">
+                            <div>${this.accountInfo.names.length !== 0 ? this.accountInfo.names[0].name : ''}</div>
+                            <div>${this.accountInfo.addressInfo ? html`<span style="margin-bottom: 8px; display: inline-block; font-size: 14px;">${translate("walletprofile.minterlevel")} - <span style="color: #03a9f4;">${this.accountInfo.addressInfo.level} ${this.accountInfo.addressInfo.flags === 1 ? html`<strong>(F)</strong>` : ''}</span>` : ''}</div>
+                            <p id="blocksMinted">${translate("walletprofile.blocksminted")} - ${this.accountInfo.addressInfo.blocksMinted + this.accountInfo.addressInfo.blocksMintedAdjustment}</p>
+                        </div>
+                    </div>
                     <p id="address">${this.wallet.addresses[0].address}</p>
                 </div>
             </div>
@@ -106,6 +129,28 @@ class WalletProfile extends connect(store)(LitElement) {
         this.toast = container.appendChild(toast)
     }
 
+    async getAllWithAddress(myAddress) {
+        await this.getAddressUserAvatar(myAddress)
+    }
+
+    getAvatar() {
+        let numberBlocks = (this.accountInfo.addressInfo.blocksMinted + this.accountInfo.addressInfo.blocksMintedAdjustment);
+        if (Number.isNaN(numberBlocks) || numberBlocks == "" || numberBlocks === null) {
+            return html`<img class="round-fullinfo" src="/img/incognito.png">`
+        } else {
+            const avatarNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]
+            const avatarUrl = avatarNode.protocol + '://' + avatarNode.domain + ':' + avatarNode.port
+            const url = `${avatarUrl}/arbitrary/THUMBNAIL/${this.accountInfo.names[0].name}/qortal_avatar?async=true&apiKey=${this.getApiKey()}`
+            return html`<img class="round-fullinfo" src="${url}" onerror="this.src='/img/incognito.png';" />`
+        }
+    }
+
+    getApiKey() {
+        const apiNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node];
+        let apiKey = apiNode.apiKey;
+        return apiKey;
+    }
+
     stateChanged(state) {
         this.wallet = state.app.wallet
         this.nodeConfig = state.app.nodeConfig

From d46721dced19abb581b9c5dd8f655ccbc70374dc Mon Sep 17 00:00:00 2001
From: Pigpig105 <81789882+Pigpig105@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:47:28 -0800
Subject: [PATCH 2/2] Update wallet-profile.js

---
 .../src/components/wallet-profile.js          | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/qortal-ui-core/src/components/wallet-profile.js b/qortal-ui-core/src/components/wallet-profile.js
index 475dfea8..874a5951 100644
--- a/qortal-ui-core/src/components/wallet-profile.js
+++ b/qortal-ui-core/src/components/wallet-profile.js
@@ -44,16 +44,13 @@ class WalletProfile extends connect(store)(LitElement) {
                     background: var(--sidetopbar);
                     color: var(--black);
                 }
-
                 #profileInMenu:hover {
                 }
-
                 #accountIcon {
                     font-size:48px;
                     color: var(--mdc-theme-primary);
                     display: inline-block;
                 }
-
                 #accountName {
                     margin: 0;
                     font-size: 18px;
@@ -62,14 +59,12 @@ class WalletProfile extends connect(store)(LitElement) {
                     padding-bottom:8px;
                     display: flex;
                 }
-
                 #blocksMinted {
                     margin:0;
                     margin-top: 0;
-                    font-size: 11px;
+                    font-size: 12px;
                     color: #03a9f4;
                 }
-
                 #address {
                     white-space: nowrap;
                     overflow: hidden;
@@ -78,26 +73,21 @@ class WalletProfile extends connect(store)(LitElement) {
                     margin-top:8px;
                     font-size:11px;
                 }
-
                 .round-fullinfo {
                     position: relative;
-                    width: 69px;
-                    height: 69px;
+                    width: 68px;
+                    height: 68px;
                     border-radius: 50%;
                 }
-
                 .full-info-logo {
-                    width: 69px;
-                    height: 69px;
+                    width: 68px;
+                    height: 68px;
                     border-radius: 50%;
                 }
-
                 .inline-block-child {
                     flex: 1;
                 }
             </style>
-
-
             <div id="profileInMenu">
                 <div style="padding: 8px 0;">
                     <div id="accountName">
@@ -134,15 +124,10 @@ class WalletProfile extends connect(store)(LitElement) {
     }
 
     getAvatar() {
-        let numberBlocks = (this.accountInfo.addressInfo.blocksMinted + this.accountInfo.addressInfo.blocksMintedAdjustment);
-        if (Number.isNaN(numberBlocks) || numberBlocks == "" || numberBlocks === null) {
-            return html`<img class="round-fullinfo" src="/img/incognito.png">`
-        } else {
-            const avatarNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]
-            const avatarUrl = avatarNode.protocol + '://' + avatarNode.domain + ':' + avatarNode.port
-            const url = `${avatarUrl}/arbitrary/THUMBNAIL/${this.accountInfo.names[0].name}/qortal_avatar?async=true&apiKey=${this.getApiKey()}`
-            return html`<img class="round-fullinfo" src="${url}" onerror="this.src='/img/incognito.png';" />`
-        }
+        const avatarNode = store.getState().app.nodeConfig.knownNodes[store.getState().app.nodeConfig.node]
+        const avatarUrl = avatarNode.protocol + '://' + avatarNode.domain + ':' + avatarNode.port
+        const url = `${avatarUrl}/arbitrary/THUMBNAIL/${this.accountInfo.names[0].name}/qortal_avatar?async=true&apiKey=${this.getApiKey()}`
+        return html`<img class="round-fullinfo" src="${url}" onerror="this.src='/img/incognito.png';" />`
     }
 
     getApiKey() {