From b64f471040de722fe5a6939915cfcffbaa76cb44 Mon Sep 17 00:00:00 2001
From: Denis Davidyuk <denis_davidyuk@hotmail.com>
Date: Thu, 11 Jan 2024 20:09:32 +0700
Subject: [PATCH 1/3] chore: fix typo in NameDetails

---
 src/pages/aens/NameDetails.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/aens/NameDetails.vue b/src/pages/aens/NameDetails.vue
index 6189fa9df..fbc1d3ba5 100644
--- a/src/pages/aens/NameDetails.vue
+++ b/src/pages/aens/NameDetails.vue
@@ -101,13 +101,13 @@ export default {
     },
     async extendName() {
       const initialAccountIdx = this.$store.state.accounts.activeIdx;
-      const requredAccountIdx = this.$store.state.accounts.list
+      const requiredAccountIdx = this.$store.state.accounts.list
         .findIndex(({ address }) => address === this.details.info.ownership.current);
-      if (initialAccountIdx !== requredAccountIdx) {
-        this.$store.commit('accounts/setActiveIdx', requredAccountIdx);
+      if (initialAccountIdx !== requiredAccountIdx) {
+        this.$store.commit('accounts/setActiveIdx', requiredAccountIdx);
       }
       await this.$store.dispatch('names/updatePointer', { name: this.name, address: this.address });
-      if (initialAccountIdx !== requredAccountIdx) {
+      if (initialAccountIdx !== requiredAccountIdx) {
         this.$store.commit('accounts/setActiveIdx', initialAccountIdx);
       }
     },

From 2230bfc96f09983c11aa21a620e5794a2634132d Mon Sep 17 00:00:00 2001
From: Denis Davidyuk <denis_davidyuk@hotmail.com>
Date: Thu, 11 Jan 2024 20:11:41 +0700
Subject: [PATCH 2/3] fix: pointer setting in NameDetails

---
 src/pages/aens/NameDetails.vue | 5 +----
 src/store/plugins/ui/names.js  | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/aens/NameDetails.vue b/src/pages/aens/NameDetails.vue
index fbc1d3ba5..4ddce2b27 100644
--- a/src/pages/aens/NameDetails.vue
+++ b/src/pages/aens/NameDetails.vue
@@ -17,10 +17,7 @@
       {{ $t('name.details.set-default') }}
     </AeButton>
 
-    <AeButton
-      :disabled="!address"
-      @click="extendName"
-    >
+    <AeButton @click="extendName">
       {{ $t('name.details.to-extend') }}
     </AeButton>
 
diff --git a/src/store/plugins/ui/names.js b/src/store/plugins/ui/names.js
index 95c15c4f0..2f2e2d902 100644
--- a/src/store/plugins/ui/names.js
+++ b/src/store/plugins/ui/names.js
@@ -156,7 +156,11 @@ export default (store) => {
         rootState: { sdk }, state, commit, dispatch,
       }, { name, address }) {
         const nameEntry = await sdk.api.getNameEntryByName(name);
-        await sdk.aensUpdate(name, [address]);
+        await sdk.aensUpdate(
+          name,
+          address ? { account_pubkey: address } : {},
+          { extendPointers: true },
+        );
         const prevAddr = getAddressByNameEntry(nameEntry);
         if (prevAddr && state.names[prevAddr] && state.names[prevAddr].hash === nameEntry.id) {
           commit('set', { address: prevAddr });

From b31d6cb7b0eab76bc0a2425d71ba1dda91aaedaf Mon Sep 17 00:00:00 2001
From: Denis Davidyuk <denis_davidyuk@hotmail.com>
Date: Thu, 11 Jan 2024 20:15:15 +0700
Subject: [PATCH 3/3] fix: `pointers` format returned by middleware

---
 src/lib/utils.js                  |  1 +
 src/pages/aens/AuctionBid.vue     |  3 +-
 src/pages/aens/AuctionDetails.vue |  4 +--
 src/pages/aens/NameDetails.vue    | 18 +++++-----
 src/pages/aens/NameList.vue       |  7 ++--
 src/pages/aens/NameTransfer.vue   |  2 +-
 src/store/plugins/ui/names.js     | 58 +++++++++++++++++++++++--------
 7 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/src/lib/utils.js b/src/lib/utils.js
index 4ea9549b4..cd1d237a0 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -36,5 +36,6 @@ export class DOMRect {
   get bottom() { return this.top + this.height; }
 }
 
+// name entry returned by node, not middleware
 export const getAddressByNameEntry = (nameEntry) => ((nameEntry.pointers
   && nameEntry.pointers.find(({ key }) => key === 'account_pubkey')) || {}).id;
diff --git a/src/pages/aens/AuctionBid.vue b/src/pages/aens/AuctionBid.vue
index 2c270b972..3135a505c 100644
--- a/src/pages/aens/AuctionBid.vue
+++ b/src/pages/aens/AuctionBid.vue
@@ -139,8 +139,7 @@ export default {
           const sdk = await Promise.resolve(this.$store.state.sdk);
           const res = await sdk.middleware.api.getNameById(name);
           if (res.status !== 'auction') throw new Error(`Unexpected name status: ${res.status}`);
-          // TODO: remove after resolving https://github.com/aeternity/ae_mdw/issues/509
-          const { auctionEnd, lastBid } = res.auction ?? res.info;
+          const { auctionEnd, lastBid } = res.info;
           this.auctionEnd = auctionEnd;
           this.lastBid = new BigNumber(lastBid.tx.nameFee).shiftedBy(-MAGNITUDE);
         })();
diff --git a/src/pages/aens/AuctionDetails.vue b/src/pages/aens/AuctionDetails.vue
index c15233307..2307e3134 100644
--- a/src/pages/aens/AuctionDetails.vue
+++ b/src/pages/aens/AuctionDetails.vue
@@ -90,9 +90,7 @@ export default {
   methods: {
     async updateAuctionEntry() {
       const sdk = await Promise.resolve(this.$store.state.sdk);
-      const res = await sdk.middleware.api.getNameById(this.name);
-      // TODO: remove after resolving https://github.com/aeternity/ae_mdw/issues/509
-      const { auctionEnd, bids } = res.auction ?? res.info;
+      const { info: { auctionEnd, bids } } = await sdk.middleware.api.getNameById(this.name);
       this.auctionEnd = auctionEnd;
       this.bids = await Promise.all(bids.map(async (txId) => {
         const { tx } = await sdk.middleware.api.getTxByIndex(txId);
diff --git a/src/pages/aens/NameDetails.vue b/src/pages/aens/NameDetails.vue
index 4ddce2b27..5614f0ca3 100644
--- a/src/pages/aens/NameDetails.vue
+++ b/src/pages/aens/NameDetails.vue
@@ -6,7 +6,7 @@
     :left-button-to="{ name: 'name-list' }"
   >
     <DetailsList
-      :object="details"
+      :object="{ ...details, nameHash }"
       :field-renderers="fieldRenderers"
     />
 
@@ -37,6 +37,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex';
+import { TxBuilderHelper } from '@aeternity/aepp-sdk';
 import prefixedAmount from '../../filters/prefixedAmount';
 import Page from '../../components/Page.vue';
 import DetailsList from '../../components/mobile/DetailsList.vue';
@@ -62,7 +63,7 @@ export default {
       name: Name,
       nameHash: NameId,
       owner: OwnerId,
-      createdAtHeight: CreatedAtHeight,
+      createdAt: CreatedAtHeight,
       expiresAt: ExpiresAtHeight,
       pointers: DetailsNamePointers,
     },
@@ -74,16 +75,15 @@ export default {
     ...mapGetters(['currentNetwork']),
     ...mapState('names', {
       details({ owned }) {
-        const entry = owned && owned.names.find(({ name }) => name === this.name);
-        return {
-          ...entry,
-          owner: entry.accountId ?? entry.info.ownership.current,
-        };
+        return owned?.names.find(({ name }) => name === this.name);
       },
       isDefaultName(state, { getDefault }) {
         return this.address && this.name === getDefault(this.address);
       },
     }),
+    nameHash() {
+      return TxBuilderHelper.produceNameId(this.name);
+    },
   },
   async mounted() {
     const id = setInterval(() => this.$store.dispatch('names/fetchOwned'), 3000);
@@ -99,7 +99,7 @@ export default {
     async extendName() {
       const initialAccountIdx = this.$store.state.accounts.activeIdx;
       const requiredAccountIdx = this.$store.state.accounts.list
-        .findIndex(({ address }) => address === this.details.info.ownership.current);
+        .findIndex(({ address }) => address === this.details.owner);
       if (initialAccountIdx !== requiredAccountIdx) {
         this.$store.commit('accounts/setActiveIdx', requiredAccountIdx);
       }
@@ -110,7 +110,7 @@ export default {
     },
     async goToTransactionDetails() {
       const { hash } = await this.$store.state.sdk.middleware.api
-        .getTxByIndex(this.details.info.claims[0]);
+        .getTxByIndex(this.details.createdAtTxIdx);
       await this.$router.push(ENV_MOBILE_DEVICE
         ? { name: 'transaction-details', params: { hash } }
         : `${this.currentNetwork.explorerUrl}/transactions/${hash}`);
diff --git a/src/pages/aens/NameList.vue b/src/pages/aens/NameList.vue
index 09c67c0f2..0de5f9200 100644
--- a/src/pages/aens/NameList.vue
+++ b/src/pages/aens/NameList.vue
@@ -11,13 +11,13 @@
         <ListItemAccount
           v-for="entry in owned.names"
           :key="entry.name"
-          :address="entry.accountId || entry.info.ownership.current"
+          :address="entry.owner"
           :name="entry.name"
           :to="{ name: 'name-details', params: { name: entry.name } }"
           subtitle="address"
         >
           <NamePending
-            v-if="entry.pending"
+            v-if="entry.status === 'pending'"
             slot="right"
           />
         </ListItemAccount>
@@ -27,13 +27,12 @@
     <template v-if="owned && owned.bids.length">
       <h2>{{ $t('name.list.active-bids') }}</h2>
       <AeCard fill="maximum">
-        <!-- TODO: remove `auction || info` after resolving https://github.com/aeternity/ae_mdw/issues/509 -->
         <ListItemAccount
           v-for="bid in owned.bids"
           :key="bid.name"
           :name="bid.name"
           :balance="bid.nameFee"
-          :address="(bid.auction || bid.info).lastBid.tx.accountId"
+          :address="bid.owner"
           :to="{ name: 'auction-details', params: { name: bid.name } }"
         />
       </AeCard>
diff --git a/src/pages/aens/NameTransfer.vue b/src/pages/aens/NameTransfer.vue
index 457492122..337762da0 100644
--- a/src/pages/aens/NameTransfer.vue
+++ b/src/pages/aens/NameTransfer.vue
@@ -107,7 +107,7 @@ export default {
   mounted() {
     const initialAccountIdx = this.$store.state.accounts.activeIdx;
     const requredAccountIdx = this.$store.state.accounts.list
-      .findIndex(({ address }) => address === this.nameEntry.info.ownership.current);
+      .findIndex(({ address }) => address === this.nameEntry.owner);
     if (initialAccountIdx !== requredAccountIdx) {
       this.$store.commit('accounts/setActiveIdx', requredAccountIdx);
       this.$once('hook:destroyed', () => this.$store
diff --git a/src/store/plugins/ui/names.js b/src/store/plugins/ui/names.js
index 2f2e2d902..08d7caa8e 100644
--- a/src/store/plugins/ui/names.js
+++ b/src/store/plugins/ui/names.js
@@ -45,7 +45,7 @@ export default (store) => {
         sdk.then ? undefined : defaults[`${address}-${sdk.getNetworkId()}`]
       ),
       isPending: ({ owned }) => (name) => (
-        !!((owned && owned.names.find((t) => t.name === name)) || {}).pending
+        !!((owned && owned.names.find((t) => t.name === name)) || {}).status === 'pending'
       ),
     },
     mutations: {
@@ -119,10 +119,12 @@ export default (store) => {
           .then(
             ({ transactions }) => transactions
               .filter(({ tx: { type } }) => type === 'NameClaimTx')
-              .map(({ tx, ...otherTx }) => ({
-                ...otherTx,
-                ...tx,
-                pending: true,
+              .map(({ tx }) => ({
+                name: tx.name,
+                owner: address,
+                pointers: [],
+                status: 'pending',
+                nameFee: new BigNumber(tx.nameFee).shiftedBy(-MAGNITUDE),
               })),
             (error) => {
               if (!isAccountNotFoundError(error)) handleUnknownError(error);
@@ -130,23 +132,51 @@ export default (store) => {
             },
           );
 
+        /**
+         * Name object structure
+         * @property {string} name - name ending with .chain
+         * @property {string} owner - address
+         * @property {array} pointers - array of objects with key and value
+         * @property {number | undefined} createdAt - block height
+         * @property {number | undefined} createdAtTxIdx - transaction index
+         * @property {number | undefined} expiresAt - block height
+         * @property {'auction' | 'name' | 'pending'} status
+         * @property {BigNumber | undefined} nameFee
+         */
         const names = (await Promise.all(
           rootState.accounts.list.map(({ address }) => Promise.all([
             getPendingNameClaimTransactions(address),
             sdk.middleware.api.getNamesOwnedBy(address)
-              .then(({ active, topBid }) => [active, topBid]),
+              .then(({ active, topBid }) => [
+                ...active.map(({ name, info }) => ({
+                  name,
+                  owner: address,
+                  pointers: Object.entries(info.pointers).map(([key, id]) => ({
+                    // TODO: find a better wrapper for mdw api
+                    key: key === 'accountPubkey' ? 'account_pubkey' : key,
+                    id,
+                  })),
+                  createdAt: info.activeFrom,
+                  createdAtTxIdx: info.claims[0],
+                  expiresAt: info.expireHeight,
+                  status: 'name',
+                })),
+                ...topBid.map(({ name, info }) => ({
+                  name,
+                  owner: address,
+                  pointers: [],
+                  createdAt: info.lastBid.blockHeight,
+                  createdAtTxIdx: info.lastBid.txIndex,
+                  status: 'auction',
+                  nameFee: new BigNumber(info.lastBid.tx.nameFee).shiftedBy(-MAGNITUDE),
+                })),
+              ]),
           ])),
-        )).flat(Infinity);
+        )).flat(2);
 
         commit('setOwned', {
           names: names.filter(({ status }) => status !== 'auction'),
-          bids: names.filter(({ status }) => status === 'auction')
-            .map((bid) => ({
-              ...bid,
-              // TODO: remove after resolving https://github.com/aeternity/ae_mdw/issues/509
-              nameFee: new BigNumber((bid.auction ?? bid.info).lastBid.tx.nameFee)
-                .shiftedBy(-MAGNITUDE),
-            })),
+          bids: names.filter(({ status }) => status === 'auction'),
         });
       },
       setDefault({ rootState: { sdk }, commit }, { name, address }) {