diff --git a/src/helpers/wallet.js b/src/helpers/wallet.js
index 438870f..926be39 100644
--- a/src/helpers/wallet.js
+++ b/src/helpers/wallet.js
@@ -510,16 +510,18 @@ export async function encryptKeystore(
 
 export async function generateAddressIterator(
   xkey,
+  xkeyId,
   walletId,
   accountIndex,
   addressIndex,
 ) {
+  // let xkeyId = await DashHd.toId(xkey);
   let key = await xkey.deriveAddress(addressIndex);
   let address = await DashHd.toAddr(key.publicKey);
 
   console.log(
     'generateAddressIterator',
-    {xkey, key, address, accountIndex, addressIndex},
+    {xkey, xkeyId, key, address, accountIndex, addressIndex},
   )
 
   store.addresses.getItem(address)
@@ -536,6 +538,7 @@ export async function generateAddressIterator(
           ...$addr,
           updatedAt: Date.now(),
           walletId,
+          xkeyId,
           accountIndex,
           addressIndex,
           usageIndex: xkey.index,
@@ -548,6 +551,7 @@ export async function generateAddressIterator(
     addressIndex,
     accountIndex,
     usageIndex: xkey.index,
+    xkeyId,
   }
 }
 
@@ -564,14 +568,21 @@ export async function batchAddressGenerate(
 
   let account = await wallet.derivedWallet.deriveAccount(accountIndex);
   let xkey = await account.deriveXKey(usageIndex);
+  let xkeyId = await DashHd.toId(xkey);
+
+  if (usageIndex !== DashHd.RECEIVE) {
+    let xkeyReceive = await account.deriveXKey(DashHd.RECEIVE);
+    xkeyId = await DashHd.toId(xkeyReceive);
+  }
 
   for (let addrIdx = addressIndex; addrIdx < batchLimit; addrIdx++) {
     addresses.push(
-      generateAddressIterator(
+      await generateAddressIterator(
         xkey,
+        xkeyId,
         wallet.id,
         accountIndex,
-        addressIndex,
+        addrIdx,
       )
     )
   }
@@ -581,6 +592,7 @@ export async function batchAddressGenerate(
     finalAddressIndex: batchLimit,
   }
 }
+
 export async function batchAddressUsageGenerate(
   wallet,
   accountIndex = 0,
@@ -594,6 +606,7 @@ export async function batchAddressUsageGenerate(
   let account = await wallet.derivedWallet.deriveAccount(accountIndex);
   let xkeyReceive = await account.deriveXKey(DashHd.RECEIVE);
   let xkeyChange = await account.deriveXKey(DashHd.CHANGE);
+  let xkeyId = await DashHd.toId(xkeyReceive);
 
   console.log(
     'batchAddressUsageGenerate',
@@ -604,6 +617,7 @@ export async function batchAddressUsageGenerate(
     addresses.push(
       await generateAddressIterator(
         xkeyReceive,
+        xkeyId,
         wallet.id,
         accountIndex,
         addrIdx,
@@ -612,6 +626,7 @@ export async function batchAddressUsageGenerate(
     addresses.push(
       await generateAddressIterator(
         xkeyChange,
+        xkeyId,
         wallet.id,
         accountIndex,
         addrIdx,
@@ -668,6 +683,7 @@ export async function initWallet(
         accountIndex: a.accountIndex,
         addressIndex: a.addressIndex,
         usageIndex: a.usageIndex,
+        xkeyId: a.xkeyId,
       }
     )
   }
@@ -712,56 +728,56 @@ export async function initWallet(
   }
 }
 
-export async function checkWalletFunds(addr, wallet = {}) {
-  const HOUR = 1000 * 60 * 60;
-
-  let {
-    address,
-    accountIndex,
-    addressIndex,
-    usageIndex,
-  } = addr
-  let updatedAt = Date.now()
-  let $addr = await store.addresses.getItem(address) || {}
-
-  $addr = {
-    walletId: wallet.id,
-    accountIndex,
-    addressIndex,
-    usageIndex,
-    ...$addr,
-  }
-  // console.log('checkWalletFunds $addr', $addr)
-  let walletFunds = $addr?.insight
-
-  if (
-    !walletFunds?.updatedAt ||
-    updatedAt - walletFunds?.updatedAt > HOUR
-  ) {
-    // console.info('check insight api for addr', addr)
-
-    let insightRes = await dashsight.getInstantBalance(address)
-
-    if (insightRes) {
-      let { addrStr, ...res } = insightRes
-      walletFunds = res
-
-      $addr.insight = {
-        ...walletFunds,
-        updatedAt,
-      }
-
-      store.addresses.setItem(
-        address,
-        $addr,
-      )
-    }
-  }
-
-  // console.info('check addr funds', addr, walletFunds)
-
-  return $addr
-}
+// export async function checkWalletFunds(addr, wallet = {}) {
+//   const HOUR = 1000 * 60 * 60;
+
+//   let {
+//     address,
+//     accountIndex,
+//     addressIndex,
+//     usageIndex,
+//   } = addr
+//   let updatedAt = Date.now()
+//   let $addr = await store.addresses.getItem(address) || {}
+
+//   $addr = {
+//     walletId: wallet.id,
+//     accountIndex,
+//     addressIndex,
+//     usageIndex,
+//     ...$addr,
+//   }
+//   // console.log('checkWalletFunds $addr', $addr)
+//   let walletFunds = $addr?.insight
+
+//   if (
+//     !walletFunds?.updatedAt ||
+//     updatedAt - walletFunds?.updatedAt > HOUR
+//   ) {
+//     // console.info('check insight api for addr', addr)
+
+//     let insightRes = await dashsight.getInstantBalance(address)
+
+//     if (insightRes) {
+//       let { addrStr, ...res } = insightRes
+//       walletFunds = res
+
+//       $addr.insight = {
+//         ...walletFunds,
+//         updatedAt,
+//       }
+
+//       store.addresses.setItem(
+//         address,
+//         $addr,
+//       )
+//     }
+//   }
+
+//   // console.info('check addr funds', addr, walletFunds)
+
+//   return $addr
+// }
 
 export async function updateAddrFunds(
   wallet, insightRes,
@@ -771,10 +787,8 @@ export async function updateAddrFunds(
   let $addr = await store.addresses.getItem(addrStr) || {}
   let {
     walletId,
-    accountIndex,
-    addressIndex,
-    usageIndex,
   } = $addr
+
   // console.log(
   //   'checkWalletFunds $addr',
   //   $addr,
@@ -783,15 +797,7 @@ export async function updateAddrFunds(
   //   walletId === wallet?.id
   // )
 
-  if (walletId === wallet?.id) {
-    $addr = {
-      walletId: wallet.id,
-      accountIndex,
-      addressIndex,
-      usageIndex,
-      ...$addr,
-    }
-
+  if (walletId && walletId === wallet?.id) {
     $addr.insight = {
       ...res,
       updatedAt,
@@ -802,10 +808,10 @@ export async function updateAddrFunds(
       $addr,
     )
 
-    // funds += res?.balance || 0
-    // walletFunds.balance = funds
     return res
   }
+
+  return { balance: 0 }
 }
 
 export async function updateAllFunds(wallet, walletFunds) {
@@ -842,9 +848,9 @@ export async function updateAllFunds(wallet, walletFunds) {
 
   // remove insight balances from address
   for (const addr of addrKeys) {
-    let { insight, ...$addr } = await store.addresses.getItem(addr) || {}
+    let { _insight, ...$addr } = await store.addresses.getItem(addr) || {}
 
-    // walletFunds.balance = funds - (insight?.balance || 0)
+    // walletFunds.balance = funds - (_insight?.balance || 0)
 
     store.addresses.setItem(
       addr,
@@ -906,12 +912,19 @@ export async function batchGenAcctAddrs(
   batchSize = 20,
 ) {
   console.log('batchGenAcctAddrs account', account, usageIndex)
+  let filterQuery = {
+    accountIndex: account.accountIndex,
+  }
+
+  if (usageIndex >= 0) {
+    filterQuery.usageIndex = usageIndex
+  }
+
   let acctAddrsLen = await getFilteredStoreLength(
     store.addresses,
-    {
-      accountIndex: account.accountIndex,
-    }
+    filterQuery,
   )
+  console.log('getFilteredStoreLength res', acctAddrsLen)
   let addrUsageIdx = account.usage?.[usageIndex] || 0
   let addrIdx = addrUsageIdx
   let batSize = batchSize
@@ -1076,12 +1089,10 @@ export async function deriveTxWallet(
   let cachedAddrs = {}
   let privateKeys = {}
   let coreUtxos
-  let changeAddr
   let tmpWallet
 
   if (Array.isArray(fundAddrs) && fundAddrs.length > 0) {
     fundAddrs.sort(sortAddrs)
-    changeAddr = fundAddrs[0].address
 
     for (let w of fundAddrs) {
       tmpWallet = await deriveWalletData(
@@ -1110,7 +1121,6 @@ export async function deriveTxWallet(
       fundAddrs.addressIndex,
     )
     privateKeys[tmpWallet.address] = tmpWallet.addressKey.privateKey
-    changeAddr = tmpWallet.address
     cachedAddrs[fundAddrs.address] = {
       checked_at: fundAddrs.updatedAt,
       hdpath: `m/44'/${DashWallet.COIN_TYPE}'/${fundAddrs.accountIndex}'/${DashHd.RECEIVE}`,
@@ -1126,7 +1136,6 @@ export async function deriveTxWallet(
 
   return {
     privateKeys,
-    changeAddr,
     cachedAddrs,
     coreUtxos,
   }
@@ -1135,6 +1144,7 @@ export async function deriveTxWallet(
 export async function createOptimalTx(
   fromWallet,
   fundAddrs,
+  changeAddrs,
   recipient,
   amount,
 ) {
@@ -1147,10 +1157,11 @@ export async function createOptimalTx(
     amountSats,
   })
 
+  let changeAddr = changeAddrs[0]
+
   let {
     privateKeys,
     coreUtxos,
-    changeAddr,
   } = await deriveTxWallet(fromWallet, fundAddrs)
 
   let optimalUtxos = selectOptimalUtxos(
@@ -1227,6 +1238,7 @@ export async function createOptimalTx(
 export async function createStandardTx(
   fromWallet,
   fundAddrs,
+  changeAddrs,
   recipient,
   amount,
   fullTransfer = false,
@@ -1244,9 +1256,9 @@ export async function createStandardTx(
   let {
     privateKeys,
     coreUtxos,
-    changeAddr,
     cachedAddrs,
   } = await deriveTxWallet(fromWallet, fundAddrs)
+  let changeAddr = changeAddrs[0]
 
   let recipientAddr = recipient?.address || recipient
 
@@ -1333,6 +1345,7 @@ export async function createStandardTx(
 export async function createTx(
   fromWallet,
   fundAddrs,
+  changeAddrs,
   recipient,
   amount,
   fullTransfer = false,
@@ -1344,9 +1357,22 @@ export async function createTx(
   });
 
   if (fullTransfer) {
-    tmpTx = await createStandardTx(fromWallet, fundAddrs, recipient, amount, fullTransfer)
+    tmpTx = await createStandardTx(
+      fromWallet,
+      fundAddrs,
+      changeAddrs,
+      recipient,
+      amount,
+      fullTransfer,
+    )
   } else {
-    tmpTx = await createOptimalTx(fromWallet, fundAddrs, recipient, amount)
+    tmpTx = await createOptimalTx(
+      fromWallet,
+      fundAddrs,
+      changeAddrs,
+      recipient,
+      amount,
+    )
   }
 
   let [txInfo, keys, changeAddr] = tmpTx
diff --git a/src/main.js b/src/main.js
index 89cd6e8..222830e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -175,7 +175,7 @@ let contactsList = await setupContactsList(
           if (!contactData.incoming) {
             return;
           }
-          let contactAccountID = Object.values(contactData?.incoming || {})?.[0]?.accountIndex
+          let contactAccountID = Object.values(contactData.incoming || {})?.[0]?.accountIndex
           console.log('contact click data', contactData)
 
           let shareAccount = await deriveWalletData(
@@ -257,7 +257,7 @@ let contactsList = await setupContactsList(
 
             let created = (new Date()).toISOString()
             let usage = [0,0]
-            usage[shareAccount.usageIndex] = shareAccount.addressIndex
+            // usage[shareAccount.usageIndex] = shareAccount.addressIndex
 
             newAccount = await store.accounts.setItem(
               shareAccount.xkeyId,
@@ -358,6 +358,14 @@ async function getUserInfo() {
         $alias
       )
       wallets = $wallets
+      console.log(
+        'getUserInfo $alias',
+        {
+          $alias,
+          $wallets,
+          $userInfo,
+        }
+      )
 
       Object.entries(($userInfo?.info || {}))
         .forEach(
@@ -531,11 +539,12 @@ async function main() {
     mainApp, appDialogs, appState, appTools,
     store, userInfo, contactsList, walletFunds,
     setupDialog, deriveWalletData, getAddrsWithFunds,
-    createTx, sendTx, updateAllFunds,
+    sendTx, updateAllFunds,
   })
 
   appDialogs.requestQr = await requestQrRig({
-    mainApp, setupDialog, appDialogs, appState, userInfo,
+    mainApp, setupDialog, appDialogs, appState, userInfo, store,
+    deriveWalletData, batchGenAcctAddrs,
   })
 
   appDialogs.pairQr = await pairQrRig({
@@ -621,45 +630,47 @@ async function main() {
 
       if (fde.intent === 'receive') {
         let receiveWallet
+        let selectedWallet = wallets?.[appState.selectedWallet]
+
+        console.log('selectedWallet', wallet, selectedWallet)
+
+        // if (wallet?.xpub) {
+        //   wallet.addressIndex = (
+        //     selectedWallet?.addressIndex ?? -1
+        //   ) + 1
+        //   receiveWallet = await deriveWalletData(
+        //     appState.phrase,
+        //     wallet.accountIndex,
+        //     wallet.addressIndex,
+        //   )
+        // }
 
-        if (wallet?.xpub) {
-          wallet.addressIndex = (
-            appState.selectedWallet?.addressIndex || 0
-          ) + 1
-          receiveWallet = await deriveWalletData(
-            appState.phrase,
-            wallet.accountIndex,
-            wallet.addressIndex,
-          )
-        }
-
-        if (receiveWallet?.xkeyId) {
-          let tmpWallet = await store.accounts.getItem(
-            receiveWallet.xkeyId,
+        if (wallet?.xkeyId) {
+          let tmpAcct = await store.accounts.getItem(
+            wallet.xkeyId,
           ) || {}
 
-          tmpWallet.usage = tmpWallet?.usage || [0,0]
-          tmpWallet.usage[
-            receiveWallet.usageIndex
-          ] = receiveWallet.addressIndex
+          // tmpAcct.usage = tmpAcct?.usage || [0,0]
+          // tmpAcct.usage[
+          //   wallet.usageIndex
+          // ] = wallet.addressIndex
 
           // state.wallet =
-          let tmpAcct = await store.accounts.setItem(
-            receiveWallet.xkeyId,
-            {
-              ...tmpWallet,
-              updatedAt: (new Date()).toISOString(),
-              address: receiveWallet.address,
-            }
-          )
+          // tmpAcct = await store.accounts.setItem(
+          //   wallet.xkeyId,
+          //   {
+          //     ...tmpAcct,
+          //     updatedAt: (new Date()).toISOString(),
+          //     address: wallet.address,
+          //   }
+          // )
 
           batchGenAcctAddrs(receiveWallet, tmpAcct)
 
           console.log(
-            `${fde.intent} FROM CONTACT`,
+            `${fde.intent} TO SELECTED WALLET`,
             {
-              stateWallet: wallet,
-              receiveWallet,
+              wallet,
               tmpAcct,
             }
           )
@@ -683,7 +694,7 @@ async function main() {
                 </footer>
               `,
               amount: 0,
-              wallet: receiveWallet,
+              wallet,
               contacts: appState.contacts,
             },
             'afterend',
@@ -705,9 +716,9 @@ async function main() {
     }
   })
 
-  console.warn('batchGenAcctsAddrs', { wallet })
+  // console.warn('batchGenAcctsAddrs', { wallet })
   batchGenAcctsAddrs(wallet)
-    .then(accts => console.warn('batchGenAcctsAddrs', { accts }))
+    // .then(accts => console.warn('batchGenAcctsAddrs', { accts }))
 
   bodyNav.render({
     data: {
@@ -964,8 +975,9 @@ async function main() {
           return false
         }
 
+        // Updates Insight info for Change Address
         if (
-          checkAddr &&
+          // checkAddr &&
           appState?.sentTransactions?.[data.txid]
         ) {
           // console.log('data.vout.filter', vout, data)
@@ -1032,6 +1044,37 @@ async function main() {
               storedAddr.insight.updatedAt = 0
               store.addresses.setItem(addr, storedAddr)
             }
+
+            // let selectedWallet = wallets?.[appState.selectedWallet]
+            // wallet.addressIndex = (
+            //   selectedWallet?.addressIndex || 0
+            // ) + 1
+            // let walletTemp = await deriveWalletData(
+            //   appState.phrase,
+            //   storedAddr.accountIndex,
+            //   storedAddr.addressIndex,
+            //   storedAddr.usageIndex,
+            // )
+
+            let tmpWalletAcct = await store.accounts.getItem(
+              storedAddr.xkeyId,
+            ) || {}
+
+            let { addresses, finalAddressIndex } = await batchGenAcctAddrs(
+              wallet,
+              tmpWalletAcct,
+              tmpWalletAcct.usage[storedAddr.usageIndex],
+            )
+
+            console.log(
+              'socket batch generate addresses for wallet',
+              {
+                // walletTemp,
+                tmpWalletAcct,
+                finalAddressIndex,
+                addresses,
+              }
+            )
           })
 
         return newTx;
diff --git a/src/rigs/request-qr.js b/src/rigs/request-qr.js
index 0fa3f18..79142ca 100644
--- a/src/rigs/request-qr.js
+++ b/src/rigs/request-qr.js
@@ -7,13 +7,16 @@ import {
   generatePaymentRequestURI,
   fixedDash,
   roundUsing,
+  getPartialHDPath,
+  getAddressIndexFromUsage,
 } from '../helpers/utils.js'
 
 export let requestQrRig = (async function (globals) {
   'use strict';
 
   let {
-    mainApp, setupDialog, appDialogs, appState, userInfo,
+    mainApp, setupDialog, appDialogs, appState, userInfo, store,
+    deriveWalletData, batchGenAcctAddrs,
   } = globals;
 
   let requestQr = await setupDialog(
@@ -23,6 +26,8 @@ export let requestQrRig = (async function (globals) {
       address: '',
       submitTxt: html`<svg width="24" height="24" viewBox="0 0 24 24"><use xlink:href="#icon-arrow-circle-down"></use></svg> Receive Payment`,
       submitAlt: 'Receive Payment',
+      generateAddrTxt: 'Generate New Address',
+      generateAddrAlt: 'Generate new address',
       cancelTxt: 'Cancel',
       cancelAlt: `Cancel`,
       placement: 'wide',
@@ -32,21 +37,72 @@ export let requestQrRig = (async function (globals) {
       footer: state => html`<footer class="center">
         <sub>Share this QR code to receive funds</sub>
       </footer>`,
+      // showAmount: state => {
+      //   if (!state.amount) {
+      //     return ''
+      //   }
+
+      //   return html`
+      //     <article>
+      //       <figure>
+      //         <figcaption>Amount</figcaption>
+      //         <div class="big">
+      //           <svg width="32" height="33" viewBox="0 0 32 33">
+      //             <use xlink:href="#icon-dash-mark"></use>
+      //           </svg>
+      //           ${state.amount}
+      //         </div>
+      //       </figure>
+      //     </article>
+      //   `
+      // },
+      getContact: state => {
+        let to = state.contact?.info?.name
+        if (!to && state.contact?.alias) {
+          to = `@${state.contact?.alias}`
+        }
+        if (!to) {
+          to = state.to || ''
+        }
+        return to
+      },
+      showFrom: state => {
+        let contact = state.getContact(state)
+
+        if (contact) {
+          return html`From <span>${contact}</span>`
+        }
+
+        if (state.amount) {
+          return html`Amount`
+        }
+
+        return html``
+      },
       showAmount: state => {
-        if (!state.amount) {
-          return ''
+        let output = html``
+
+        if (state.amount) {
+          output = html`
+            <div class="big">
+              <svg width="26" height="27" viewBox="0 0 32 33">
+                <use xlink:href="#icon-dash-mark"></use>
+              </svg>
+              ${state.amount}
+            </div>
+          `
         }
 
+        return output
+      },
+      showContactAndAmount: state => {
         return html`
           <article>
             <figure>
-              <figcaption>Amount</figcaption>
-              <div class="big">
-                <svg width="32" height="33" viewBox="0 0 32 33">
-                  <use xlink:href="#icon-dash-mark"></use>
-                </svg>
-                ${state.amount}
-              </div>
+              <figcaption class="txt-small">
+                ${state.showFrom(state)}
+              </figcaption>
+              ${state.showAmount(state)}
             </figure>
           </article>
         `
@@ -66,22 +122,49 @@ export let requestQrRig = (async function (globals) {
           />
         `
       },
+      generateNextAddress: state => {
+        return html`
+          <div class="">
+            <button
+              class="pill rounded"
+              type="submit"
+              name="intent"
+              value="generate_address"
+              title="${state.generateAddrAlt}"
+            >
+              <span>
+                <i class="icon-plus-circle"></i>
+                <!-- <svg class="rotate-x-to-plus" width="24" height="24" viewBox="0 0 24 24">
+                  <use xlink:href="#icon-x"></use>
+                </svg> -->
+                <!-- <svg class="plus-circle" width="26" height="26" viewBox="0 0 16 16">
+                  <use xlink:href="#icon-plus-circle"></use>
+                </svg> -->
+                ${state.generateAddrTxt}
+              </span>
+            </button>
+          </div>
+        `
+      },
       content: state => html`
         ${state.header(state)}
 
         <fieldset class="share solo">
           <aside>
-            ${state.showAmount(state)}
-            <span class="qr" title="Open QR Code in new Window">${qrSvg(
-              generatePaymentRequestURI(state),
-              {
-                indent: 0,
-                padding: 4,
-                size: 'mini',
-                container: 'svg-viewbox',
-                join: true,
-              }
-            )}</span>
+            ${state.generateNextAddress(state)}
+            ${state.showContactAndAmount(state)}
+            <span class="qr" title="Open QR Code in new Window">
+              ${qrSvg(
+                generatePaymentRequestURI(state),
+                {
+                  indent: 0,
+                  padding: 4,
+                  size: 'mini',
+                  container: 'svg-viewbox',
+                  join: true,
+                }
+              )}
+            </span>
             <input readonly value="${generatePaymentRequestURI(state)}" />
             <button id="pair-copy" class="pill rounded copy" title="Copy URI (${generatePaymentRequestURI(state)})">
               <i class="icon-copy"></i>
@@ -153,17 +236,112 @@ export let requestQrRig = (async function (globals) {
 
           let fde = formDataEntries(event)
 
+          // getPartialHDPath,
+          // getAddressIndexFromUsage,
+
+          let tmpAcct = await store.accounts.getItem(
+            state.wallet.xkeyId,
+          ) || {}
+          let tmpAcctWallet = getAddressIndexFromUsage(state.wallet, tmpAcct)
+
+          let storedPath = getPartialHDPath(tmpAcctWallet)
+          let oldPath = getPartialHDPath(state.wallet)
+
+          let nextAddrIndex = (tmpAcctWallet?.addressIndex ?? -1)
+
+          if (nextAddrIndex < state.wallet.addressIndex) {
+            nextAddrIndex = state.wallet.addressIndex
+          }
+
+          if (fde?.intent === 'generate_address') {
+            nextAddrIndex = nextAddrIndex + 1
+          }
+
+          state.wallet = await deriveWalletData(
+            appState.phrase,
+            tmpAcctWallet.accountIndex,
+            nextAddrIndex,
+            tmpAcctWallet.usageIndex,
+          )
+          state.selectedWallet = state.wallet
+
+          // tmpAcct.usage = tmpAcct?.usage// || [0,0]
+          tmpAcct.usage[
+            state.wallet.usageIndex
+          ] = state.wallet.addressIndex
+
+          let newPath = getPartialHDPath(state.wallet)
+
+          if (fde?.intent === 'generate_address') {
+            tmpAcct = await store.accounts.setItem(
+              state.wallet.xkeyId,
+              {
+                ...tmpAcct,
+                updatedAt: (new Date()).toISOString(),
+                address: state.wallet.address,
+              }
+            )
+
+            batchGenAcctAddrs(
+              state.wallet,
+              tmpAcct,
+              state.wallet.usageIndex,
+            )
+              .then(a => {
+                console.log(
+                  `${fde.intent} BATCH GEN ADDRS`,
+                  a
+                )
+              })
+
+            console.log(
+              'GENERATE NEW ADDRESS',
+              {state, event, fde, tmpAcct},
+              [
+                storedPath,
+                oldPath,
+                newPath,
+              ],
+            )
+
+            await requestQr.render(
+              {
+                wallet: state.wallet,
+                selectedWallet: state.wallet,
+                amount: state.amount,
+                contact: state.contact,
+                to: state.to,
+              },
+              'afterend',
+            )
+
+            return;
+          }
           if (fde?.intent === 'select_address') {
             // console.log('SELECT AN ADDRESS', {state, event, fde})
 
+            console.log(
+              'SELECT AN ADDRESS',
+              {state, event, fde, tmpAcct},
+              [
+                storedPath,
+                oldPath,
+                newPath,
+              ]
+            )
+
             await appDialogs.sendOrReceive.render({
               action: 'receive',
               amount: state.amount || 0,
-              wallet: state.wallet,
+              // wallet: state.wallet,
+              wallet: state.selectedWallet || state.wallet,
+              // selectedWallet: state.wallet,
               account: appState.account,
               contacts: appState.contacts,
               userInfo,
-              to: null,
+              to: state.to || null,
+              contact: state.contact,
+              // to: state.contact?.alias ? `@${state.contact?.alias}` : null,
             })
             appDialogs.sendOrReceive.showModal()
 
diff --git a/src/rigs/send-or-request.js b/src/rigs/send-or-request.js
index ec20284..5f09702 100644
--- a/src/rigs/send-or-request.js
+++ b/src/rigs/send-or-request.js
@@ -1,5 +1,5 @@
 import { lit as html } from '../helpers/lit.js'
-import { AMOUNT_REGEX } from '../helpers/constants.js'
+import { AMOUNT_REGEX, USAGE } from '../helpers/constants.js'
 import {
   formDataEntries,
   parseAddressField,
@@ -7,6 +7,8 @@ import {
   toDASH,
   toDash,
   roundUsing,
+  getPartialHDPath,
+  getAddressIndexFromUsage,
 } from '../helpers/utils.js'
 
 export let sendOrReceiveRig = (async function (globals) {
@@ -417,9 +419,9 @@ export let sendOrReceiveRig = (async function (globals) {
             return;
           }
 
-          let inWallet, outWallet, address, contact
+          let inWallet, outWallet, address, changeAddress, contact
           let to = String(fde.to), amount = Number(fde.amount)
-          let receiveWallet = {}, sendWallet = {}
+          let fundWallet = {}, receiveWallet = {}, sendWallet = {}
 
           if (
             fde.intent === 'send' &&
@@ -441,6 +443,83 @@ export let sendOrReceiveRig = (async function (globals) {
             inWallet = Object.values(contact?.incoming)?.[0]
           }
 
+          if (!inWallet) {
+            // state.wallet.addressIndex = (
+            //   state.wallet?.addressIndex ?? -1
+            // ) + 1
+            // state.wallet.addressIndex = state.wallet?.addressIndex ?? 0
+            let mainWallet = await deriveWalletData(appState.phrase)
+            let tmpAcct = await store.accounts.getItem(
+              mainWallet.xkeyId,
+            ) || {}
+            let tmpAcctWallet = getAddressIndexFromUsage(
+              state.wallet,
+              tmpAcct
+            )
+            receiveWallet = await deriveWalletData(
+              appState.phrase,
+              tmpAcctWallet.accountIndex,
+              tmpAcctWallet.addressIndex,
+              tmpAcctWallet.usageIndex,
+            )
+          } else {
+            // inWallet.addressIndex = inWallet.addressIndex + 1
+            receiveWallet = await deriveWalletData(
+              appState.phrase,
+              inWallet.accountIndex,
+              inWallet.addressIndex,
+            )
+
+            // await appTools.storedData.encryptItem(
+            //   store.contacts,
+            //   inWallet.xkeyId,
+            //   {
+            //     ...contact,
+            //     updatedAt: (new Date()).toISOString(),
+            //     incoming: {
+            //       ...contact.incoming,
+            //       [`${inWallet.walletId}/${inWallet.xkeyId}`]: {
+            //         ...inWallet,
+            //         address: receiveWallet.address,
+            //         addressIndex: receiveWallet.addressIndex,
+            //       }
+            //     },
+            //   },
+            //   false,
+            // )
+
+            // let tmpAcct = await store.accounts.getItem(
+            //   receiveWallet.xkeyId,
+            // ) || {}
+            // let changeWallet = {
+            //   ...receiveWallet,
+            //   usageIndex: USAGE.CHANGE,
+            // }
+            // let tmpAcctWallet = getAddressIndexFromUsage(
+            //   changeWallet,
+            //   tmpAcct,
+            // )
+            // let derivedChangeWallet = await deriveWalletData(
+            //   appState.phrase,
+            //   tmpAcctWallet.accountIndex,
+            //   tmpAcctWallet.addressIndex,
+            //   tmpAcctWallet.usageIndex,
+            // )
+            // console.log(
+            //   'derive change wallet',
+            //   {
+            //     contact,
+            //     tmpAcct,
+            //     tmpAcctWallet,
+            //     receiveWallet,
+            //     changeWallet,
+            //     derivedChangeWallet,
+            //   }
+            // )
+
+            inWallet.address = receiveWallet.address
+          }
+
           if (fde.intent === 'send') {
             console.log(
               `CONFIRM ${fde.intent} TO`,
@@ -471,10 +550,11 @@ export let sendOrReceiveRig = (async function (globals) {
                   `AVAILABLE Ð ${walletFunds?.balance}`,
                 ]
               )
-              state.wallet.addressIndex = (
-                state.wallet?.addressIndex || 0
-              ) + 1
-              receiveWallet = await deriveWalletData(
+              // state.wallet.addressIndex = (
+              //   state.wallet?.addressIndex ?? -1
+              // ) + 1
+              state.wallet.addressIndex = state.wallet?.addressIndex ?? 0
+              fundWallet = await deriveWalletData(
                 appState.phrase,
                 state.wallet.accountIndex,
                 state.wallet.addressIndex,
@@ -486,9 +566,10 @@ export let sendOrReceiveRig = (async function (globals) {
               await appDialogs.requestQr.render(
                 {
                   name: 'Insufficient wallet funds',
-                  wallet: receiveWallet,
-                  // contact,
-                  // to,
+                  wallet: fundWallet,
+                  selectedWallet: state.wallet,
+                  contact,
+                  to,
                   amount: amountNeeded,
                   // footer: state => html`<footer class="center">
                   //   <sub>Fund this wallet with at least Ð ${fixedDash(state.amount)} to complete this transaction</sub>
@@ -505,6 +586,39 @@ export let sendOrReceiveRig = (async function (globals) {
             }
 
             if (amount > 0) {
+              // let changeAddrs = await findInStore()
+
+              let tmpAcct = await store.accounts.getItem(
+                state.wallet.xkeyId,
+              ) || {}
+              let changeWallet = {
+                ...state.wallet,
+                usageIndex: USAGE.CHANGE,
+              }
+              let tmpAcctWallet = getAddressIndexFromUsage(
+                changeWallet,
+                tmpAcct,
+              )
+              let derivedChangeWallet = await deriveWalletData(
+                appState.phrase,
+                tmpAcctWallet.accountIndex,
+                tmpAcctWallet.addressIndex,
+                tmpAcctWallet.usageIndex,
+              )
+              changeAddress = derivedChangeWallet.address
+              console.log(
+                'derive change wallet',
+                {
+                  changeAddress,
+                  contact,
+                  tmpAcct,
+                  tmpAcctWallet,
+                  stateWallet: state.wallet,
+                  changeWallet,
+                  derivedChangeWallet,
+                }
+              )
+
               let fundingAddrs = await getAddrsWithFunds(
                 state.wallet,
               )
@@ -512,11 +626,13 @@ export let sendOrReceiveRig = (async function (globals) {
                 fundingAddrs || {}
               )
               let leftoverBalance = walletFunds.balance - amount
-              let fullTransfer = leftoverBalance <= 0.0010_0200
+              // let fullTransfer = leftoverBalance <= 0.0010_0200
+              let fullTransfer = leftoverBalance <= 0.0001_0200
 
               let { tx, changeAddr, fee } = await createTx(
                 state.wallet,
                 fundingAddrs,
+                [changeAddress],
                 address,
                 amount,
                 fullTransfer,
@@ -573,69 +689,64 @@ export let sendOrReceiveRig = (async function (globals) {
           }
 
           if (fde.intent === 'receive') {
+            console.log(
+              fde.intent,
+              state.wallet,
+              state.selectedWallet,
+              receiveWallet,
+            )
             if (!inWallet && !state.wallet?.xpub) {
               return;
             }
 
-            if (!inWallet) {
-              state.wallet.addressIndex = (
-                state.wallet?.addressIndex || 0
-              ) + 1
-              receiveWallet = await deriveWalletData(
-                appState.phrase,
-                state.wallet.accountIndex,
-                state.wallet.addressIndex,
-              )
-            } else {
-              inWallet.addressIndex = inWallet.addressIndex + 1
-              receiveWallet = await deriveWalletData(
-                appState.phrase,
-                inWallet.accountIndex,
-                inWallet.addressIndex,
-              )
-
-              await appTools.storedData.encryptItem(
-                store.contacts,
-                inWallet.xkeyId,
-                {
-                  ...contact,
-                  updatedAt: (new Date()).toISOString(),
-                  incoming: {
-                    ...contact.incoming,
-                    [`${inWallet.walletId}/${inWallet.xkeyId}`]: {
-                      ...inWallet,
-                      address: receiveWallet.address,
-                      addressIndex: receiveWallet.addressIndex,
-                    }
-                  },
-                },
-                false,
-              )
-
-              inWallet.address = receiveWallet.address
-            }
-
             if (receiveWallet?.xkeyId) {
-              let tmpWallet = await store.accounts.getItem(
+              let tmpAcct = await store.accounts.getItem(
                 receiveWallet.xkeyId,
               ) || {}
+              let tmpAcctWallet = getAddressIndexFromUsage(state.wallet, tmpAcct)
+
+              let storedPath = getPartialHDPath(tmpAcctWallet)
+              let oldPath = getPartialHDPath(receiveWallet)
+
+              if (receiveWallet.xkeyId === state.wallet.xkeyId) {
+                state.wallet = await deriveWalletData(
+                  appState.phrase,
+                  tmpAcctWallet.accountIndex,
+                  (tmpAcctWallet?.addressIndex ?? 0),
+                  tmpAcctWallet.usageIndex,
+                )
+              }
 
-              tmpWallet.usage = tmpWallet?.usage || [0,0]
-              tmpWallet.usage[
+              tmpAcct.usage = tmpAcct?.usage // || [0,0]
+              tmpAcct.usage[
                 receiveWallet.usageIndex
               ] = receiveWallet.addressIndex
 
-              // state.wallet =
-              let tmpAcct = await store.accounts.setItem(
-                receiveWallet.xkeyId,
-                {
-                  ...tmpWallet,
-                  updatedAt: (new Date()).toISOString(),
-                  address: receiveWallet.address,
-                }
+              let newPath = getPartialHDPath(receiveWallet)
+
+              batchGenAcctAddrs(
+                receiveWallet,
+                tmpAcct,
+                receiveWallet.usageIndex,
               )
+                .then(a => {
+                  console.log(
+                    `${fde.intent} BATCH GEN ADDRS`,
+                    a
+                  )
+                })
 
-              batchGenAcctAddrs(receiveWallet, tmpAcct)
+              // state.wallet =
+              // let tmpAcct = await store.accounts.setItem(
+              //   receiveWallet.xkeyId,
+              //   {
+              //     ...tmpWallet,
+              //     updatedAt: (new Date()).toISOString(),
+              //     address: receiveWallet.address,
+              //   }
+              // )
+
+              // batchGenAcctAddrs(receiveWallet, tmpAcct)
                 // .then(a => {
                 //   console.log(
                 //     `${fde.intent} TO CONTACT BATCH GEN ADDRS`,
@@ -647,12 +758,18 @@ export let sendOrReceiveRig = (async function (globals) {
                 `${fde.intent} FROM CONTACT`,
                 `Ð ${fde.amount || 0}`,
                 {
+                  to,
                   contact,
                   stateWallet: state.wallet,
                   inWallet,
                   receiveWallet,
                   amount,
-                }
+                },
+                [
+                  storedPath,
+                  oldPath,
+                  newPath,
+                ],
               )
 
               sendOrReceive.close(fde.intent)
@@ -679,6 +796,7 @@ export let sendOrReceiveRig = (async function (globals) {
                     </footer>
                   `,
                   wallet: receiveWallet,
+                  selectedWallet: state.wallet,
                   contact,
                   to,
                   amount: Number(fde.amount),