From ecba3ba45d0ff697a7af9d09c23b3a705966a413 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 12:49:51 -0500
Subject: [PATCH 01/19] fix: wallet action button recieve page routing

---
 src/pages/wallet/WalletActionButtons.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages/wallet/WalletActionButtons.tsx b/src/pages/wallet/WalletActionButtons.tsx
index 86709483b..8307d9c1b 100644
--- a/src/pages/wallet/WalletActionButtons.tsx
+++ b/src/pages/wallet/WalletActionButtons.tsx
@@ -39,14 +39,11 @@ const WalletActionButtons = ({ denom }: { denom?: Denom }) => {
   const networkName = useNetworkName()
   const { pathname } = useLocation()
   const readNativeDenom = useNativeDenoms()
-  const token = readNativeDenom(denom ?? "")
+  const token = readNativeDenom(denom ?? "", pathname.split("/")[2])
   const addresses = useInterchainAddresses()
   const isLedger = useIsLedger()
 
-  const address = useMemo(() => {
-    if (!addresses) return ""
-    return addresses[token.chainID]
-  }, [addresses, token])
+  const address = useMemo(() => addresses?.[token.chainID], [addresses, token])
 
   const availableGasDenoms = useMemo(
     () => Object.keys(networks[chainID]?.gasPrices ?? {}),

From 28c21dd9a167b4e97dfef4b8c654aa9df03eb9a0 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 13:07:40 -0500
Subject: [PATCH 02/19] fix: icon

---
 public/icon-32.png | Bin 671 -> 1033 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/icon-32.png b/public/icon-32.png
index 430d60966f953d3777b4a973739f555314d79707..82df406f75adcb5a7348f6f454b7c953f8451ba7 100644
GIT binary patch
delta 1022
zcmV<a0|ES>1&Iid8Gi-<0047(dh`GQ010qNS#tmY3ljhU3ljkVnw%H_0004VQb$4n
zuFf3k00004XF*Lt006O%3;baP000A?Nkl<ZcmcgvO=uHQ5T1FPO;bfl6%-HR22n&W
z>7k-1m>flD&CQ>J$yJcni>0R|7i+!P9`tI8f*yoQYR~D#OMfp-4|?rtK}2Y?sBP2y
z>^LuN(#_^)6Pxsdz~;TT@B3!vy_s2n13+w+yp84rbQzO#`KU)JE=?x0qxI$yx`^j<
zxe=3a%0j0TnDOyJccSY8CO;J(kV%R9vwK3iBH;Oa&TkfR$#Ee;+GQW}3}*raG{TQw
zLehmI;@L!>4u35|l2Z{=t*qt!r_n|pW%5|fLco}C!HkoTiP<d;6eS>^ksu0)T0?T6
zNL2{bdl|nFRO2>}iqP+K!P%3l{$+K0Cao7(IT)yjk5)mF9EFnFA>D~F68ia+jnt46
z#K(u!SV?GwXm~wE00HYl?_mL<0S~0UZo|)v3E4bVZ-0c8kRgf=d0>y+0)Yu4ngNr-
zi1@%xUL~Msc%AH)-@Vog?>=wU5ZiJ6f@%z$b$g}Yy4V#Wi2P%N?kVe3Nq{Gu(WpQx
z)(O8)1!Kbm{Z|oMfh50rPK7Jy-F4>?ijT(zJyW&gyKoP$XZTMgWri+$V0JMJ?LrC(
zUUGw9Q-3RC?DlDPd)-VZ_8w>&IsoZ4Dg4F!2Bh^oNY^(auM&`Ti75m=FcsO*5h1Y;
ze{aa#0!{)T(Pw1e9uK1neH@AfW77ofgaZ2pfyQ?})pLKXy<&9w;qUM%uZS*x&uP#Z
z7`<$q!G>A~8<ykMS4R_zKl1$?2}52<-~PSf-G3}p=b5GgN?^6ek6=6!I0Rw-$-Lk_
z{Qva}$<%7boL=IFVwSJbZR=QiC11*p#zuQ5_1F=i-?-S5c>kz3-jaZ4$--+sMd3#C
z?Ff+}yu%)p;k2gXh9Q_t=3g`;myp>qG|&sJ;5OG3NiKm3o+*#l6(IXKwrLa`f%^PX
zc7MTXm9*YkC(tyP8w!}1%Lh!NZ|o->9LPykf~zmRK?DqPFdMEfTV8(8RMn4l1xU-e
zkw_s3_5jYvSV0r=@tdg2f7!Qv3)^pw`MBgptU^kC1COo!fyj<Q$Q_m$D!*6S$x6<I
zF&onYZxXlGb31umi|=H#lCbyAtz1b!^LGvwD)n5pS){rm&B)sYI+B+caz@-Lx_q$^
z8qh(wph%;wd>x=d!PsDD$tA?tklHUh)Mlq%&Of>3PD2+^W&1=j7q++4oVOm^`?#(N
sDC21|H!285<W;nGum_4}pVXbiKXCA!VMnrVjQ{`u07*qoM6N<$g0`#MsQ>@~

literal 671
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyw*!1aT!D1(r0;N~;kp*cHjX#|
z5rJ^g*g!$JI2yw+bT33i(|tW$3a%X}0!L=?$4q070Hxr{Ok)n~2kiuM9Sg4m#e*h%
zg(!xr@$dNvQS4s(7^qj<Ym;B+JM+X7`hhz=8=g58-}3MN=-u+lyXB=@)dQQ%3;S9%
zw*b9oRTAVE%<wzYkCiF<-`#{5vu`h+Ji4@T?u5J)Hz#F*f2R)b-@ZIG$lKFgn*Zaw
zhu1D2-@0Mtik^n*qP#>y0|~jui+3|HFj{)LIEGl9-a6@eQL}*ngJ7P>cc!vC*;Vgl
zwr!mI?SK4~$rhX(!g5BFYlU|UExwpp@3#KMPal4UtvxABOo#udYBnu7H@($wztx=M
zd)C?%@5ry3b8PdMo!g2X?T%lUeOTUpesbbvtp(``BFodCOe}uaoa<R~^=D6K{quQQ
z0U~v(-}24n3ZFD5Jh(M0;iY1GLy3-|>7uUtFBm*Ig<~g2{CL{yGv!W};N0Z=^?m_&
z)+}0-FqbW^OK_IP&QF(ggpR&=UHezL;>x2tkB{0-^4veWqW+-Ww49n5$7~<2KEN*F
zov(G?>(cvzt4jB?4L_xp-&~T=`<45w|IXC@!+(uq%A}KQ)=6ext}(b%nI3=Xw{kZ-
zxBiD)!SjMMcQb#<lwoT*SiWSXxButKO8HU?=P#M!^+l@X^TdfE7ygUiw@OYZO+UgH
Q1&j&?Pgg&ebxsLQ0D=TP?f?J)


From 54620bccafe2018200a1a8da86b9c990e6d89b93 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 14:14:35 -0500
Subject: [PATCH 03/19] fix: tracker margin

---
 src/pages/activity/ActivityItem.module.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/activity/ActivityItem.module.scss b/src/pages/activity/ActivityItem.module.scss
index fc7e57569..5c6446557 100644
--- a/src/pages/activity/ActivityItem.module.scss
+++ b/src/pages/activity/ActivityItem.module.scss
@@ -23,6 +23,7 @@
 .transaction__progress {
   padding-top: 8px;
   position: relative;
+  margin-left: 50px;
 
   .transaction__timer {
     transition: 300ms;

From 184a0f5862461fb22b455137ca83d3a63b2aaf81 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 14:25:27 -0500
Subject: [PATCH 04/19] Update padding in ActivityItem and Asset modules

---
 src/pages/activity/ActivityItem.module.scss | 4 ++--
 src/pages/wallet/Asset.module.scss          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/activity/ActivityItem.module.scss b/src/pages/activity/ActivityItem.module.scss
index fc7e57569..d886fc0d7 100644
--- a/src/pages/activity/ActivityItem.module.scss
+++ b/src/pages/activity/ActivityItem.module.scss
@@ -1,8 +1,7 @@
 @import "mixins";
 
 .activityitems > * {
-  padding: 8px;
-  margin: 10px 0px;
+  padding: 12px;
 }
 
 .activityitem {
@@ -23,6 +22,7 @@
 .transaction__progress {
   padding-top: 8px;
   position: relative;
+  margin-left: 50px;
 
   .transaction__timer {
     transition: 300ms;
diff --git a/src/pages/wallet/Asset.module.scss b/src/pages/wallet/Asset.module.scss
index ed94e3473..dc2cdcd09 100644
--- a/src/pages/wallet/Asset.module.scss
+++ b/src/pages/wallet/Asset.module.scss
@@ -1,7 +1,7 @@
 @import "mixins";
 
 .asset {
-  padding: 10px;
+  padding: 12px;
   border-radius: 10px;
   position: relative; // to loading indicator
   cursor: pointer;

From cf0bfc0a2b348253ec27538cf67d71b34046279d Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 14:28:59 -0500
Subject: [PATCH 05/19] fix: margin

---
 src/txs/swap/Swap.module.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/txs/swap/Swap.module.scss b/src/txs/swap/Swap.module.scss
index a66415f99..46b5b5939 100644
--- a/src/txs/swap/Swap.module.scss
+++ b/src/txs/swap/Swap.module.scss
@@ -6,10 +6,9 @@
   margin: -20px 0px -20px 65%;
 }
 .container {
-  margin: 10px;
   display: flex;
   flex-direction: column;
-  gap: 15px;
+  gap: 16px;
 }
 
 .text {

From 41722381962324f3ef8e11dc4a397ca596d3127e Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 14:38:04 -0500
Subject: [PATCH 06/19] fix: vars style fixes

---
 src/extension/components/ExtensionFooter.tsx | 5 ++---
 src/extension/modules/Welcome.tsx            | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/extension/components/ExtensionFooter.tsx b/src/extension/components/ExtensionFooter.tsx
index 77eb8473f..d7c7eacdd 100644
--- a/src/extension/components/ExtensionFooter.tsx
+++ b/src/extension/components/ExtensionFooter.tsx
@@ -1,16 +1,15 @@
 import { ExternalLink } from "components/general"
 import styles from "./ExtensionFooter.module.scss"
-import { useThemeFavicon } from "data/settings/Theme"
 import browser from "webextension-polyfill"
+import { StationIcon } from "@terra-money/station-ui"
 
 export default function ExtensionFooter() {
-  const icon = useThemeFavicon()
   const version = browser.runtime?.getManifest?.()?.version
 
   return (
     <footer className={styles.footer}>
       <section className={styles.version}>
-        <img src={icon} alt="Station" width={16} />
+        <StationIcon width={16} height={16} />
         <span> Station Wallet</span>
         {version && ` v${version}`}
       </section>
diff --git a/src/extension/modules/Welcome.tsx b/src/extension/modules/Welcome.tsx
index 035655096..93308b33e 100644
--- a/src/extension/modules/Welcome.tsx
+++ b/src/extension/modules/Welcome.tsx
@@ -46,7 +46,6 @@ const Welcome = () => {
             />
           ) : (
             <FlexColumn align={"center"} className={styles.welcome} gap={16}>
-              <StationIcon width={57} height={54} />
               <h1 className={styles.title}>{t("Welcome!")}</h1>
               <p className={styles.content}>
                 {t(

From cb5fdc17005ab78ed15a72ee3d2241398de44081 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 14:58:50 -0500
Subject: [PATCH 07/19] Fix pre-selected asset value in SendPage/Address
 component and update send button onClick handler in WalletActionButtons
 component

---
 src/pages/wallet/SendPage/Address.tsx    | 6 +++---
 src/pages/wallet/WalletActionButtons.tsx | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pages/wallet/SendPage/Address.tsx b/src/pages/wallet/SendPage/Address.tsx
index 14eace944..ed2f9e033 100644
--- a/src/pages/wallet/SendPage/Address.tsx
+++ b/src/pages/wallet/SendPage/Address.tsx
@@ -19,7 +19,7 @@ import { useLocation } from "react-router-dom"
 
 const Address = () => {
   const { form, goToStep, getWalletName, networks } = useSend()
-  const { state } = useLocation()
+  const { state: denom } = useLocation()
   const { recipients } = useRecentRecipients()
   const { register, setValue, formState, watch, trigger } = form
   const { errors } = formState
@@ -27,8 +27,8 @@ const Address = () => {
   const { t } = useTranslation()
 
   useEffect(() => {
-    setValue("asset", state?.denom)
-  }, [state?.denom, setValue])
+    setValue("asset", denom) // pre-selected from asset page
+  }, [denom, setValue])
 
   const [tab, setTab] = useState("wallets")
 
diff --git a/src/pages/wallet/WalletActionButtons.tsx b/src/pages/wallet/WalletActionButtons.tsx
index 86709483b..c76ea4bdd 100644
--- a/src/pages/wallet/WalletActionButtons.tsx
+++ b/src/pages/wallet/WalletActionButtons.tsx
@@ -54,6 +54,7 @@ const WalletActionButtons = ({ denom }: { denom?: Denom }) => {
   )
 
   const sendButtonDisabled = isWalletEmpty && !!availableGasDenoms.length
+  console.log('denom', denom)
 
   const buttons: WalletActionButton[] = [
     {
@@ -64,10 +65,7 @@ const WalletActionButtons = ({ denom }: { denom?: Denom }) => {
       primary: true,
       label: t("Send"),
       onClick: () =>
-        (isLedger ? openURL : navigate)(
-          `/send/1`,
-          denom ? { denom } : undefined
-        ),
+        (isLedger ? openURL : navigate)(`/send/1`, denom ? { state: denom } : undefined),
       disabled: sendButtonDisabled,
     },
     {

From 94d31115106ea2a99be8c657bf668c5ab3337bc0 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 14:59:39 -0500
Subject: [PATCH 08/19] cleanup

---
 src/pages/wallet/WalletActionButtons.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/wallet/WalletActionButtons.tsx b/src/pages/wallet/WalletActionButtons.tsx
index c76ea4bdd..b928de691 100644
--- a/src/pages/wallet/WalletActionButtons.tsx
+++ b/src/pages/wallet/WalletActionButtons.tsx
@@ -54,8 +54,6 @@ const WalletActionButtons = ({ denom }: { denom?: Denom }) => {
   )
 
   const sendButtonDisabled = isWalletEmpty && !!availableGasDenoms.length
-  console.log('denom', denom)
-
   const buttons: WalletActionButton[] = [
     {
       icon: (

From d8efb4fc5e3fbd783d2061232d3f685abd23d8f2 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Thu, 11 Jan 2024 15:26:21 -0500
Subject: [PATCH 09/19] fix: address book memo field and swapped memo tracker

---
 src/pages/wallet/SendPage/Address.tsx         |  3 ++-
 .../SendPage/Components/AddressBookList.tsx   |  4 +--
 .../wallet/SendPage/Components/MyWallets.tsx  |  2 +-
 src/txs/Tx.tsx                                | 26 +++++++++----------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/pages/wallet/SendPage/Address.tsx b/src/pages/wallet/SendPage/Address.tsx
index 14eace944..01d93cc0a 100644
--- a/src/pages/wallet/SendPage/Address.tsx
+++ b/src/pages/wallet/SendPage/Address.tsx
@@ -45,7 +45,8 @@ const Address = () => {
     },
   ]
 
-  const handleKnownWallet = (recipient: AccAddress | WalletName) => {
+  const handleKnownWallet = (recipient: AccAddress | WalletName, _: number, memo?: string) => {
+    setValue("memo", memo)
     if (!AccAddress.validate(recipient ?? "")) {
       setValue("recipient", recipient)
       goToStep(2)
diff --git a/src/pages/wallet/SendPage/Components/AddressBookList.tsx b/src/pages/wallet/SendPage/Components/AddressBookList.tsx
index d2dc9701a..2aa6453c0 100644
--- a/src/pages/wallet/SendPage/Components/AddressBookList.tsx
+++ b/src/pages/wallet/SendPage/Components/AddressBookList.tsx
@@ -13,7 +13,7 @@ export const AddressBookList = ({
   items: AddressBook[]
   title?: string
   icon?: ReactNode
-  onClick?: (address: string, index: number) => void
+  onClick?: (address: string, index: number, memo?: string) => void
 }) => {
   const network = useNetwork()
   const { t } = useTranslation()
@@ -29,7 +29,7 @@ export const AddressBookList = ({
           walletName={i.name}
           walletAddress={truncate(i.recipient, [11, 6])}
           chainIcon={network[getChainIdFromAddress(i.recipient, network)]?.icon}
-          onClick={() => onClick?.(i.recipient, index)}
+          onClick={() => onClick?.(i.recipient, index, i.memo)}
         />
       ))}
     </Grid>
diff --git a/src/pages/wallet/SendPage/Components/MyWallets.tsx b/src/pages/wallet/SendPage/Components/MyWallets.tsx
index eaa8ac273..996cbde9c 100644
--- a/src/pages/wallet/SendPage/Components/MyWallets.tsx
+++ b/src/pages/wallet/SendPage/Components/MyWallets.tsx
@@ -6,7 +6,7 @@ import { useAuth } from "auth"
 import { ReactComponent as ActiveWalletIcon } from "styles/images/icons/ActiveWallet.svg"
 
 interface MyWalletsProps {
-  onClick?: (address: string, index: number) => void
+  onClick?: (address: string, index: number, memo?: string) => void
   tab: string
 }
 
diff --git a/src/txs/Tx.tsx b/src/txs/Tx.tsx
index b1dfe4bc2..5d1d256c6 100644
--- a/src/txs/Tx.tsx
+++ b/src/txs/Tx.tsx
@@ -62,6 +62,7 @@ interface Props<TxValues> {
   coins?: CoinInput[]
   balance?: Amount
   gasAdjustment?: number
+  memo?: string
 
   /* tx simulation */
   estimationTxValues?: TxValues
@@ -99,7 +100,7 @@ interface RenderProps<TxValues> {
 }
 
 function Tx<TxValues>(props: Props<TxValues>) {
-  const { token, decimals, amount, balance, chain, baseDenom, hideLoader } =
+  const { token, decimals, amount, balance, chain, baseDenom, hideLoader, memo } =
     props
   const { estimationTxValues, createTx, gasAdjustment: txGasAdjustment } = props
   const { children, onChangeMax } = props
@@ -293,26 +294,25 @@ function Tx<TxValues>(props: Props<TxValues>) {
       )
         throw new Error("Fee is not estimated")
 
-      const tx = createTx(values)
+        const gasCoins = new Coins([Coin.fromData(gasFee)])
+        const taxCoin =
+          token && taxAmount && has(taxAmount) && new Coin(token, taxAmount)
+        const taxCoins = sanitizeTaxes(taxes) ?? taxCoin
+        const feeCoins = taxCoins ? gasCoins.add(taxCoins) : gasCoins
+        const fee = new Fee(estimatedGas, feeCoins)
 
-      if (!tx) throw new Error("Tx is not defined")
+      const tx = { ...createTx(values), fee, memo } as CreateTxOptions
 
-      const gasCoins = new Coins([Coin.fromData(gasFee)])
-      const taxCoin =
-        token && taxAmount && has(taxAmount) && new Coin(token, taxAmount)
-      const taxCoins = sanitizeTaxes(taxes) ?? taxCoin
-      const feeCoins = taxCoins ? gasCoins.add(taxCoins) : gasCoins
-      const fee = new Fee(estimatedGas, feeCoins)
+      if (!tx) throw new Error("Tx is not defined")
 
       if (isWallet.multisig(wallet)) {
         // TODO: broadcast only to terra if wallet is multisig
-        const unsignedTx = await auth.create({ ...tx, fee })
+        const unsignedTx = await auth.create(tx)
         const { pathname, search } = toPostMultisigTx(unsignedTx)
         openURL([pathname, search].join("?"))
         return
       } else if (wallet) {
-        const result = await auth.post(
-          { ...tx, fee },
+        const result = await auth.post(tx,
           password,
           undefined,
           // use broadcast mode = "block" if we are not showing the broadcast loader
@@ -340,7 +340,7 @@ function Tx<TxValues>(props: Props<TxValues>) {
           isIbc && trackIbcTx({ ...(result as any), chain } as ActivityItem)
           // add the transaction to the activity cache so it shows up immediately on the activity list
           addCachedTx({ ...(result as any), chain } as ActivityItem)
-          // run the onSuccess function if it has ben set
+          // run the onSuccess function if it has been set
           onSuccess?.()
           // navigate to the activity page
           navigate("/#1")

From 1ecb01555cecb5444badc9674bcd0aad8052649d Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Fri, 12 Jan 2024 08:32:47 -0500
Subject: [PATCH 10/19] revert: logo on welcome page

---
 src/extension/modules/Welcome.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/extension/modules/Welcome.tsx b/src/extension/modules/Welcome.tsx
index 93308b33e..035655096 100644
--- a/src/extension/modules/Welcome.tsx
+++ b/src/extension/modules/Welcome.tsx
@@ -46,6 +46,7 @@ const Welcome = () => {
             />
           ) : (
             <FlexColumn align={"center"} className={styles.welcome} gap={16}>
+              <StationIcon width={57} height={54} />
               <h1 className={styles.title}>{t("Welcome!")}</h1>
               <p className={styles.content}>
                 {t(

From 0b8086ddf1ecc8805bb2a249600e9610c6ffd45a Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Fri, 12 Jan 2024 08:43:59 -0500
Subject: [PATCH 11/19] fix: migration page;

---
 src/extension/auth/MigrationWizard.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/extension/auth/MigrationWizard.tsx b/src/extension/auth/MigrationWizard.tsx
index 3aee25441..36e12dd42 100644
--- a/src/extension/auth/MigrationWizard.tsx
+++ b/src/extension/auth/MigrationWizard.tsx
@@ -244,8 +244,7 @@ const MigrationWizard = () => {
 
   return (
     <ExtensionPage
-      img={icon}
-      title={t("Import wallets")}
+      title={t("Migrate wallets")}
       subtitle={t(
         "You will be required to migrate your accounts to Station v3. Please provide your password or recovery phrase for each wallet to proceed."
       )}

From 6cfefd1774d609b000ba1b05a05c63ba5d5ae167 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Fri, 12 Jan 2024 09:43:42 -0500
Subject: [PATCH 12/19] Refactor swap timeline messages and venues

---
 src/data/queries/swap/skip.ts            | 41 ++++++++++++++----------
 src/data/queries/swap/types.ts           |  2 ++
 src/txs/swap/SwapConfirm.tsx             |  1 -
 src/txs/swap/components/SwapTimeline.tsx |  4 +--
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/data/queries/swap/skip.ts b/src/data/queries/swap/skip.ts
index 34f09aa8b..6724b14f1 100644
--- a/src/data/queries/swap/skip.ts
+++ b/src/data/queries/swap/skip.ts
@@ -139,36 +139,43 @@ const getTimelineMessages = (
   swap: SwapState,
   network: IInterchainNetworks
 ) => {
-  let swapOccured = false
+  let swapsOccured = 0
+  const swapsRequired = route.operations.filter(
+    (op: any) => Object.keys(op)[0] === "swap"
+  ).length
+
 
   const timelineMsgs: TimelineMessage[] = route.operations.map(
     // eslint-disable-next-line array-callback-return
     (op: any, i: number) => {
       const type = Object.keys(op)[0] as OperationType
+      const swapIn = route.operations[i + 1]?.swap?.swap_in
+      const swapOut = route.operations[i + 1]?.swap?.swap_out
+      const venue = (swapIn ?? swapOut)?.swap_venue
 
       if (type === "transfer") {
         const fromChainId = op[type].chain_id
-        const toChainId =
-          route.operations[i + 1]?.transfer?.chain_id ??
-          route.operations[i + 1]?.swap.swap_in.swap_venue.chain_id
-        return {
-          type,
-          symbol: swapOccured ? swap.askAsset.symbol : swap.offerAsset.symbol, // TODO: make robust against multiple swaps
-          from: network[fromChainId]?.name ?? "Unknown",
-          to: network[toChainId ?? swap.askAsset.chainId]?.name ?? "Unknown", // get final chainId from askAsset or next one in ops
-        }
+        const toChainId = venue?.chain_id    
+          return {
+            type,
+            symbol: swapsOccured === swapsRequired ? swap.askAsset.symbol : swap.offerAsset.symbol, 
+            from: network[fromChainId]?.name ?? "Unknown",
+            to: network[toChainId ?? swap.askAsset.chainId]?.name ?? "Unknown", // get final chainId from askAsset or next one in ops
+          }
       }
 
       if (type === "swap") {
-        swapOccured = true
-        return {
-          type,
-          venue: op[type].swap_in.swap_venue.name as SwapVenue,
-          askAssetSymbol: swap.askAsset.symbol,
-          offerAssetSymbol: swap.offerAsset.symbol,
+        swapsOccured++
+        if (venue?.name) {
+          return {
+            type,
+            venue: venue.name as SwapVenue,
+            askAssetSymbol: swap.askAsset.symbol,
+            offerAssetSymbol: swap.offerAsset.symbol,
+          }
         }
       }
     }
   )
-  return timelineMsgs
+  return timelineMsgs.filter(Boolean)
 }
diff --git a/src/data/queries/swap/types.ts b/src/data/queries/swap/types.ts
index 835b860a6..903e55482 100644
--- a/src/data/queries/swap/types.ts
+++ b/src/data/queries/swap/types.ts
@@ -54,11 +54,13 @@ export interface SwapAssetExtra extends SwapAssetBase {
 export enum SwapVenue {
   OSMOSIS = "osmosis-poolmanager",
   ASTROPORT = "terra-astroport",
+  NEUTRON = "neutron-astroport",
 }
 
 export const swapVenueToName = {
   "osmosis-poolmanager": "Osmosis",
   "terra-astroport": "Astroport",
+  "neutron-astroport": "Astroport",
 }
 export type SwapOperation = any[]
 
diff --git a/src/txs/swap/SwapConfirm.tsx b/src/txs/swap/SwapConfirm.tsx
index 672a87c0a..be281114f 100644
--- a/src/txs/swap/SwapConfirm.tsx
+++ b/src/txs/swap/SwapConfirm.tsx
@@ -83,7 +83,6 @@ const Confirm = () => {
 
   return (
     <Tx {...tx}>
-      {/* @ts-ignore */}
       {({ fee, submit }) => (
         <Form onSubmit={handleSubmit(submit.fn)}>
           <SwapTimeline {...{ swapMsgs, ...getValues() }} />
diff --git a/src/txs/swap/components/SwapTimeline.tsx b/src/txs/swap/components/SwapTimeline.tsx
index af3fb66a1..5d111f238 100644
--- a/src/txs/swap/components/SwapTimeline.tsx
+++ b/src/txs/swap/components/SwapTimeline.tsx
@@ -52,7 +52,7 @@ const SwapTimeline = ({
         </>
       }
       type={"Execute Contract"}
-      msgCount={route.operations.length}
+      msgCount={route.timelineMsgs.length}
       hasTimeline
     />
   )
@@ -91,7 +91,7 @@ const SwapTimeline = ({
       <SectionHeader title={t("Swap Path")} withLine />
       <Timeline
         startOverride={startOverride}
-        forceShowAll={route.operations.length === 3}
+        forceShowAll={route.timelineMsgs.length === 3}
         middleItems={middleItems.filter((m): m is SwapTimelineElement => !!m)}
       />
     </>

From cb150bee849d300e18e0b44a57b0365d9a440299 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Fri, 12 Jan 2024 10:16:06 -0500
Subject: [PATCH 13/19] Fix swap venue display in SwapTimeline component

---
 src/txs/swap/components/SwapTimeline.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/txs/swap/components/SwapTimeline.tsx b/src/txs/swap/components/SwapTimeline.tsx
index 5d111f238..5d9f8952f 100644
--- a/src/txs/swap/components/SwapTimeline.tsx
+++ b/src/txs/swap/components/SwapTimeline.tsx
@@ -76,7 +76,7 @@ const SwapTimeline = ({
               {capitalize(msg.type)}{" "}
               <span className={style.text}> {msg.offerAssetSymbol}</span> for{" "}
               <span className={style.text}> {msg.askAssetSymbol}</span> on{" "}
-              <span className={style.text}> {swapVenueToName[msg.venue]}</span>
+              <span className={style.text}> {swapVenueToName[msg.venue] ?? t("Unknown Swap Venue")}</span>
             </>
           ),
           variant: "success",

From 18b18b91e057312b5468e6808612ca20d72f8e9f Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Fri, 12 Jan 2024 10:28:54 -0500
Subject: [PATCH 14/19] Update SwapTimeline variant to "default"

---
 src/txs/swap/components/SwapTimeline.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/txs/swap/components/SwapTimeline.tsx b/src/txs/swap/components/SwapTimeline.tsx
index 5d9f8952f..502720dc8 100644
--- a/src/txs/swap/components/SwapTimeline.tsx
+++ b/src/txs/swap/components/SwapTimeline.tsx
@@ -13,7 +13,7 @@ import { ReactNode } from "react"
 
 interface SwapTimelineElement {
   msg: ReactNode
-  variant: "success"
+  variant: "default"
 }
 
 const SwapTimeline = ({
@@ -27,7 +27,6 @@ const SwapTimeline = ({
 
   const startOverride = (
     <ActivityListItem
-      variant={"success"}
       chain={{
         label: offerAsset.chain.name,
         icon: offerAsset.chain.icon,
@@ -67,7 +66,7 @@ const SwapTimeline = ({
               <span>{msg.from}</span> to <span>{msg.to}</span>
             </>
           ),
-          variant: "success",
+          variant: "default",
         }
       if (msg.type === "swap")
         return {
@@ -79,7 +78,7 @@ const SwapTimeline = ({
               <span className={style.text}> {swapVenueToName[msg.venue] ?? t("Unknown Swap Venue")}</span>
             </>
           ),
-          variant: "success",
+          variant: "default",
         }
 
       return null

From d74a5671d147949434d3077baadfc4d1ede75e91 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:44:43 +0100
Subject: [PATCH 15/19] Fix passwordChallenge not being stored during migration

---
 src/auth/scripts/keystore.ts        | 41 ++++++++++++++++++-----------
 src/extension/auth/PasswordForm.tsx |  4 +++
 src/extension/modules/Login.tsx     | 17 +++++++++---
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/auth/scripts/keystore.ts b/src/auth/scripts/keystore.ts
index 8e55ba499..229201cf0 100644
--- a/src/auth/scripts/keystore.ts
+++ b/src/auth/scripts/keystore.ts
@@ -104,7 +104,7 @@ export const isLoginNeeded = async () => {
   if (!wallets) return false
 
   if (shouldStorePassword()) {
-    return !(await getStoredPassword())
+    return !(await isLoggedIn()) && !(await getStoredPassword())
   } else {
     return !(await isLoggedIn())
   }
@@ -118,26 +118,34 @@ export const passwordExists = () => {
   return !!passwordChallenge
 }
 
-// unlocks the wallet when the user inset the password on the login screen
-export const unlockWallets = (password: string) => {
-  const passwordChallenge = localStorage.getItem(
-    LocalStorage.PASSWORD_CHALLENGE
-  )
-  if (!passwordChallenge) return
-  if (decrypt(passwordChallenge, password) !== CHALLENGE_TEXT)
-    throw new Error("Incorrect password")
-
-  setLogin(true)
-}
-
 // checks if the given password is valid
 export const isPasswordValid = (password: string) => {
   const passwordChallenge = localStorage.getItem(
     LocalStorage.PASSWORD_CHALLENGE
   )
 
-  // if user has not set a password yet, it's valid
-  if (!passwordChallenge) return true
+  // [RECOVERY]: if password challenge has not been set
+  if (!passwordChallenge) {
+    const walletChallenge = getStoredWallets()
+      .map((w) => {
+        if ("encryptedSeed" in w) {
+          return w.encryptedSeed
+        } else if ("encrypted" in w) {
+          return w.encrypted[330]
+        }
+      })
+      .filter((w): w is string => !!w)
+
+    if (!walletChallenge.length) return false
+
+    try {
+      const isValid = !!decrypt(walletChallenge[0], password)
+      if (isValid) storePasswordChallenge(password)
+      return isValid
+    } catch {
+      return false
+    }
+  }
 
   try {
     return decrypt(passwordChallenge, password) === CHALLENGE_TEXT
@@ -290,7 +298,8 @@ type AddWalletParams =
   | MultisigWallet
 
 export const addWallet = (params: AddWalletParams, password: string) => {
-  if (!isPasswordValid(password)) throw new Error("Invalid password")
+  if (passwordExists() && !isPasswordValid(password))
+    throw new Error("Invalid password")
   const wallets = getStoredWallets()
 
   if (wallets.find((wallet) => wallet.name === params.name))
diff --git a/src/extension/auth/PasswordForm.tsx b/src/extension/auth/PasswordForm.tsx
index 31376145c..b8645b253 100644
--- a/src/extension/auth/PasswordForm.tsx
+++ b/src/extension/auth/PasswordForm.tsx
@@ -1,4 +1,5 @@
 import {
+  createNewPassword,
   getStoredPassword,
   isPasswordValid,
   passwordExists,
@@ -82,7 +83,10 @@ const PasswordForm = ({ onComplete, onCompleteLedger }: Props) => {
         { shouldFocus: true }
       )
       return
+    } else if (!passwordExists()) {
+      createNewPassword(password)
     }
+
     if (rememberPassword) {
       setShouldStorePassword(true)
       storePassword(password)
diff --git a/src/extension/modules/Login.tsx b/src/extension/modules/Login.tsx
index e4472d52f..078221dd7 100644
--- a/src/extension/modules/Login.tsx
+++ b/src/extension/modules/Login.tsx
@@ -1,10 +1,11 @@
 import {
   isLoginNeeded,
+  isPasswordValid,
   lockWallet,
+  setLogin,
   setShouldStorePassword,
   shouldStorePassword,
   storePassword,
-  unlockWallets,
 } from "auth/scripts/keystore"
 import {
   Checkbox,
@@ -50,12 +51,16 @@ export const useLogin = () => {
   return {
     isLoggedIn: loginState.isLoggedIn,
     isLoading: loginState.isLoading,
-    login: (password: string) => {
-      unlockWallets(password)
+    login: (password: string): boolean => {
+      if (!isPasswordValid(password)) {
+        return false
+      }
+      setLogin(true)
       setLoginState({
         isLoading: false,
         isLoggedIn: true,
       })
+      return true
     },
     logout: () => {
       lockWallet()
@@ -109,7 +114,11 @@ const Login = () => {
   const submit = async () => {
     try {
       if (!password.current?.value) return setError("Password is required")
-      login(password.current?.value)
+      if (!login(password.current?.value)) {
+        setError("Invalid password")
+        setIsValid(false)
+        return
+      }
 
       if (rememberPassword) {
         setShouldStorePassword(true)

From 59027a5063a8c5e0aa6a23d0d162f2b53b65832a Mon Sep 17 00:00:00 2001
From: Terence Lim <terencelimz@gmail.com>
Date: Fri, 12 Jan 2024 23:58:23 +0800
Subject: [PATCH 16/19] updated copy for swap settings

---
 src/txs/swap/SwapTx.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/txs/swap/SwapTx.tsx b/src/txs/swap/SwapTx.tsx
index afd7969a8..1fdaf54a2 100644
--- a/src/txs/swap/SwapTx.tsx
+++ b/src/txs/swap/SwapTx.tsx
@@ -13,7 +13,11 @@ const SwapTx = () => {
   const routes = [
     { path: "/", element: <Setup />, title: "Swap" },
     { path: "/confirm", element: <Confirm />, title: "Confirm Swap" },
-    { path: "/slippage", element: <SwapSettings />, title: "Swap Settings" },
+    {
+      path: "/slippage",
+      element: <SwapSettings />,
+      title: "Slippage Settings",
+    },
   ]
 
   return (

From 5897cd39229b5804a2a4097e7e7fb13f882ba5a2 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Fri, 12 Jan 2024 11:29:53 -0500
Subject: [PATCH 17/19] fix: pre-selected token issues

---
 src/pages/wallet/AssetPage.tsx           |  6 ++++--
 src/pages/wallet/SendPage/Address.tsx    |  2 +-
 src/pages/wallet/WalletActionButtons.tsx | 10 ++++------
 src/txs/swap/SwapSetup.tsx               |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/wallet/AssetPage.tsx b/src/pages/wallet/AssetPage.tsx
index f2663d559..d605cb050 100644
--- a/src/pages/wallet/AssetPage.tsx
+++ b/src/pages/wallet/AssetPage.tsx
@@ -25,7 +25,9 @@ const AssetPage = () => {
   const [chain, denom] = routeDenom.includes("*")
     ? routeDenom.split("*")
     : [params.chain, routeDenom]
-  const { token, symbol, decimals, icon } = readNativeDenom(denom, chain)
+
+  const tokenInfo = readNativeDenom(denom, chain)
+  const { token, symbol, decimals, icon } = tokenInfo
   const unknownIBCDenoms = useUnknownIBCDenoms()
   const navigate = useNavigate()
 
@@ -127,7 +129,7 @@ const AssetPage = () => {
             )}
           </h1>
         </div>
-        <WalletActionButtons denom={token} />
+        <WalletActionButtons token={tokenInfo} />
       </section>
     )
   }
diff --git a/src/pages/wallet/SendPage/Address.tsx b/src/pages/wallet/SendPage/Address.tsx
index ed2f9e033..e03da4439 100644
--- a/src/pages/wallet/SendPage/Address.tsx
+++ b/src/pages/wallet/SendPage/Address.tsx
@@ -25,7 +25,7 @@ const Address = () => {
   const { errors } = formState
   const { recipient } = watch()
   const { t } = useTranslation()
-
+  
   useEffect(() => {
     setValue("asset", denom) // pre-selected from asset page
   }, [denom, setValue])
diff --git a/src/pages/wallet/WalletActionButtons.tsx b/src/pages/wallet/WalletActionButtons.tsx
index b928de691..331f54c9a 100644
--- a/src/pages/wallet/WalletActionButtons.tsx
+++ b/src/pages/wallet/WalletActionButtons.tsx
@@ -29,7 +29,7 @@ interface WalletActionButton {
   hide?: boolean
 }
 
-const WalletActionButtons = ({ denom }: { denom?: Denom }) => {
+const WalletActionButtons = ({ token }: { token: TokenItem }) => {
   const { t } = useTranslation()
   const isWalletEmpty = useIsWalletEmpty()
   const networks = useNetwork()
@@ -38,14 +38,12 @@ const WalletActionButtons = ({ denom }: { denom?: Denom }) => {
   const navigate = useNavigate()
   const networkName = useNetworkName()
   const { pathname } = useLocation()
-  const readNativeDenom = useNativeDenoms()
-  const token = readNativeDenom(denom ?? "")
   const addresses = useInterchainAddresses()
   const isLedger = useIsLedger()
 
   const address = useMemo(() => {
     if (!addresses) return ""
-    return addresses[token.chainID]
+    return addresses[token?.chainID]
   }, [addresses, token])
 
   const availableGasDenoms = useMemo(
@@ -63,7 +61,7 @@ const WalletActionButtons = ({ denom }: { denom?: Denom }) => {
       primary: true,
       label: t("Send"),
       onClick: () =>
-        (isLedger ? openURL : navigate)(`/send/1`, denom ? { state: denom } : undefined),
+        (isLedger ? openURL : navigate)(`/send/1`,{ state: token?.symbol }),
       disabled: sendButtonDisabled,
     },
     {
@@ -77,7 +75,7 @@ const WalletActionButtons = ({ denom }: { denom?: Denom }) => {
       size: "default",
       label: t("Swap"),
       onClick: () =>
-        (isLedger ? openURL : navigate)(`/swap`, denom ? { denom } : undefined),
+        (isLedger ? openURL : navigate)(`/swap`, { state: token?.token }),
       hide: networkName !== "mainnet",
     },
     {
diff --git a/src/txs/swap/SwapSetup.tsx b/src/txs/swap/SwapSetup.tsx
index 580ff2bf2..96c6546e2 100644
--- a/src/txs/swap/SwapSetup.tsx
+++ b/src/txs/swap/SwapSetup.tsx
@@ -36,7 +36,7 @@ const SwapForm = () => {
     useSwap()
   const { t } = useTranslation()
   const navigate = useNavigate()
-  const { state } = useLocation()
+  const { state: denom } = useLocation()
   const currency = useCurrency()
   // State
   const { watch, getValues, setValue, register } = form
@@ -63,9 +63,9 @@ const SwapForm = () => {
 
   // Lifecycle
   useEffect(() => {
-    if (!state?.denom) return
+    if (!denom) return
     const token = tokens
-      .filter((t) => t.originDenom === state.denom && has(t.balance))
+      .filter((t) => t.originDenom === denom && has(t.balance))
       .sort((a, b) => Number(b.balance) - Number(a.balance))[0]
     if (!token) return
     setValue("offerAsset", token)

From 02a0c106cea75ee5b35382a6a8cb9d70a9442719 Mon Sep 17 00:00:00 2001
From: plubber <er.h.gorski@gmail.com>
Date: Fri, 12 Jan 2024 11:33:29 -0500
Subject: [PATCH 18/19] fix: bugs

---
 src/pages/wallet/WalletActionButtons.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/wallet/WalletActionButtons.tsx b/src/pages/wallet/WalletActionButtons.tsx
index d98245e06..b755c7593 100644
--- a/src/pages/wallet/WalletActionButtons.tsx
+++ b/src/pages/wallet/WalletActionButtons.tsx
@@ -14,7 +14,6 @@ import { useNetworkName, useNetwork, useChainID } from "data/wallet"
 import { useIsWalletEmpty } from "data/queries/bank"
 import { useKado } from "pages/wallet/Buy"
 import { useInterchainAddresses } from "auth/hooks/useAddress"
-import { useNativeDenoms } from "data/token"
 import { openURL } from "extension/storage"
 import { useIsLedger } from "utils/ledger"
 import styles from "./NetWorth.module.scss"
@@ -29,7 +28,7 @@ interface WalletActionButton {
   hide?: boolean
 }
 
-const WalletActionButtons = ({ token }: { token: TokenItem }) => {
+const WalletActionButtons = ({ token }: { token?: TokenItem }) => {
   const { t } = useTranslation()
   const isWalletEmpty = useIsWalletEmpty()
   const networks = useNetwork()
@@ -38,8 +37,6 @@ const WalletActionButtons = ({ token }: { token: TokenItem }) => {
   const navigate = useNavigate()
   const networkName = useNetworkName()
   const { pathname } = useLocation()
-  const readNativeDenom = useNativeDenoms()
-  const token = readNativeDenom(denom ?? "", pathname.split("/")[2])
   const addresses = useInterchainAddresses()
   const isLedger = useIsLedger()
 
@@ -60,7 +57,7 @@ const WalletActionButtons = ({ token }: { token: TokenItem }) => {
       primary: true,
       label: t("Send"),
       onClick: () =>
-        (isLedger ? openURL : navigate)(`/send/1`,{ state: token?.symbol }),
+        (isLedger ? openURL : navigate)(`/send/1`, token ? { state: token?.symbol } : undefined),
       disabled: sendButtonDisabled,
     },
     {
@@ -74,7 +71,7 @@ const WalletActionButtons = ({ token }: { token: TokenItem }) => {
       size: "default",
       label: t("Swap"),
       onClick: () =>
-        (isLedger ? openURL : navigate)(`/swap`, { state: token?.token }),
+        (isLedger ? openURL : navigate)(`/swap`, token ? { state: token?.token } : undefined),
       hide: networkName !== "mainnet",
     },
     {

From 222ca2518444f226708a34a33c30a5412272d7a9 Mon Sep 17 00:00:00 2001
From: Michael Merz <mwmerz@protonmail.com>
Date: Fri, 12 Jan 2024 12:18:12 -0500
Subject: [PATCH 19/19] chore: update manifest

---
 public/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/manifest.json b/public/manifest.json
index 097dfbf3d..c6b32cabb 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,8 +1,8 @@
 {
   "manifest_version": 3,
   "name": "Station Wallet",
-  "version": "8.0.4",
-  "version_name": "8.0.4",
+  "version": "8.0.5",
+  "version_name": "8.0.5",
   "background": {
     "service_worker": "background.js"
   },