From 1e3576739f95ba7603d2e128fad27786e945bc6e Mon Sep 17 00:00:00 2001
From: Dimitrije Dragasevic <dimitrije.dragasevic@gmail.com>
Date: Wed, 17 Jan 2024 18:09:10 +0100
Subject: [PATCH 01/21] Added testid for setup in Automation framework

---
 src/app/components/HeaderIconButton.tsx      |  8 +++++++-
 src/app/sections/settings/SettingsButton.tsx |  1 +
 src/auth/modules/create/CreatedWallet.tsx    |  5 +++--
 src/auth/modules/create/SelectAddress.tsx    | 14 ++++++++++----
 src/pages/wallet/AssetList.tsx               |  3 +++
 src/pages/wallet/WalletActionButtons.tsx     | 13 ++++++++++---
 6 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/app/components/HeaderIconButton.tsx b/src/app/components/HeaderIconButton.tsx
index 8f8f7e8b8..814593078 100644
--- a/src/app/components/HeaderIconButton.tsx
+++ b/src/app/components/HeaderIconButton.tsx
@@ -9,7 +9,13 @@ const HeaderIconButton = forwardRef(
     return (
       // wrap for tooltip
       <span className={styles.wrapper}>
-        <button type="button" {...attrs} className={styles.button} ref={ref} />
+        <button
+          type="button"
+          {...attrs}
+          className={styles.button}
+          ref={ref}
+          data-testid="dashboard-button"
+        />
       </span>
     )
   }
diff --git a/src/app/sections/settings/SettingsButton.tsx b/src/app/sections/settings/SettingsButton.tsx
index 30b72e02b..b7f2e74c1 100644
--- a/src/app/sections/settings/SettingsButton.tsx
+++ b/src/app/sections/settings/SettingsButton.tsx
@@ -14,6 +14,7 @@ const SettingsButton = () => {
         //marginTop: "24px",
         //marginBottom: "16px",
       }}
+      data-testid="settings-button"
       fill={"var(--token-dark-900)"}
     />
   )
diff --git a/src/auth/modules/create/CreatedWallet.tsx b/src/auth/modules/create/CreatedWallet.tsx
index 00b87b628..d7591494a 100644
--- a/src/auth/modules/create/CreatedWallet.tsx
+++ b/src/auth/modules/create/CreatedWallet.tsx
@@ -22,15 +22,16 @@ const CreatedWallet = ({ name, words, onConfirm }: Props) => {
   }
 
   return (
-    <Grid gap={40}>
+    <Grid gap={40} data-testid="grid-container">
       <SummaryHeader
         statusLabel={t("Success!")}
         statusMessage={t("The wallet was created")}
         status={"success"}
         summaryTitle={name}
         summaryValue={address}
+        data-testid="summary-header"
       />
-      <Button variant="primary" onClick={submit}>
+      <Button variant="primary" onClick={submit} data-testid="submit-button">
         {t("Done")}
       </Button>
     </Grid>
diff --git a/src/auth/modules/create/SelectAddress.tsx b/src/auth/modules/create/SelectAddress.tsx
index c9a942642..a0e2ac483 100644
--- a/src/auth/modules/create/SelectAddress.tsx
+++ b/src/auth/modules/create/SelectAddress.tsx
@@ -98,10 +98,16 @@ const SelectAddress = () => {
     const length = coins.length
 
     return (
-      <section className={styles.selector__container}>
-        <div className={styles.selector__title}>
-          <h1>m/44'/{bip}'</h1>
-          <h4>{truncate(address)}</h4>
+      <section
+        className={styles.selector__container}
+        data-testid={`details-section-${bip}`}
+      >
+        <div
+          className={styles.selector__title}
+          data-testid={`title-div-${bip}`}
+        >
+          <h1 data-testid={`bip-title-${bip}`}>m/44'/{bip}'</h1>
+          <h4 data-testid={`address-title-${bip}`}>{truncate(address)}</h4>
         </div>
 
         <div className={styles.selector__details}>
diff --git a/src/pages/wallet/AssetList.tsx b/src/pages/wallet/AssetList.tsx
index 6b1ee8eac..12d33332e 100644
--- a/src/pages/wallet/AssetList.tsx
+++ b/src/pages/wallet/AssetList.tsx
@@ -122,6 +122,7 @@ const AssetList = () => {
               value={search}
               placeholder={t("Filter by tokens, chains, etc.")}
               onChange={(e) => setSearch(e.target.value)}
+              data-testid="assetlist-filter-input"
             />
           </div>
         )}
@@ -153,6 +154,7 @@ const AssetList = () => {
           width={16}
           height={16}
           onClick={toggleFilter}
+          data-testid="assetlist-filter-icon"
         />
       </div>
       <div className={styles.assetlist__list}>{render()}</div>
@@ -162,6 +164,7 @@ const AssetList = () => {
           onClick={toggleFilter}
           label={t("Clear Filter")}
           variant="secondary"
+          data-testid="assetlist-clear-filter-button"
         />
       )}
     </article>
diff --git a/src/pages/wallet/WalletActionButtons.tsx b/src/pages/wallet/WalletActionButtons.tsx
index b755c7593..846f90d9c 100644
--- a/src/pages/wallet/WalletActionButtons.tsx
+++ b/src/pages/wallet/WalletActionButtons.tsx
@@ -57,7 +57,10 @@ const WalletActionButtons = ({ token }: { token?: TokenItem }) => {
       primary: true,
       label: t("Send"),
       onClick: () =>
-        (isLedger ? openURL : navigate)(`/send/1`, token ? { state: token?.symbol } : undefined),
+        (isLedger ? openURL : navigate)(
+          `/send/1`,
+          token ? { state: token?.symbol } : undefined
+        ),
       disabled: sendButtonDisabled,
     },
     {
@@ -71,7 +74,10 @@ const WalletActionButtons = ({ token }: { token?: TokenItem }) => {
       size: "default",
       label: t("Swap"),
       onClick: () =>
-        (isLedger ? openURL : navigate)(`/swap`, token ? { state: token?.token } : undefined),
+        (isLedger ? openURL : navigate)(
+          `/swap`,
+          token ? { state: token?.token } : undefined
+        ),
       hide: networkName !== "mainnet",
     },
     {
@@ -95,7 +101,7 @@ const WalletActionButtons = ({ token }: { token?: TokenItem }) => {
   return (
     <div className={styles.networth__buttons}>
       {buttons.map(
-        ({ size, icon, label, onClick, disabled, primary, hide }) =>
+        ({ size, icon, label, onClick, disabled, primary, hide }, index) =>
           !hide && (
             <FlexColumn key={label} gap={8}>
               <RoundedButton
@@ -104,6 +110,7 @@ const WalletActionButtons = ({ token }: { token?: TokenItem }) => {
                 onClick={onClick}
                 icon={icon}
                 disabled={disabled}
+                data-testid={`wallet-action-button-${index}`} // Add the data-testid attribute here
               />
               <span className={styles.networth__buttons__labels}>
                 {capitalize(label)}

From c2b3a8382acb29c5d42de064c5691660c67805f6 Mon Sep 17 00:00:00 2001
From: Dimitrije Dragasevic <dimitrije.dragasevic@gmail.com>
Date: Wed, 17 Jan 2024 18:10:46 +0100
Subject: [PATCH 02/21] removed comment

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

diff --git a/src/pages/wallet/WalletActionButtons.tsx b/src/pages/wallet/WalletActionButtons.tsx
index 846f90d9c..9b4e6efde 100644
--- a/src/pages/wallet/WalletActionButtons.tsx
+++ b/src/pages/wallet/WalletActionButtons.tsx
@@ -110,7 +110,7 @@ const WalletActionButtons = ({ token }: { token?: TokenItem }) => {
                 onClick={onClick}
                 icon={icon}
                 disabled={disabled}
-                data-testid={`wallet-action-button-${index}`} // Add the data-testid attribute here
+                data-testid={`wallet-action-button-${index}`}
               />
               <span className={styles.networth__buttons__labels}>
                 {capitalize(label)}

From ae289c5eb6834c1c041fafc3d67e56d52ae33faa Mon Sep 17 00:00:00 2001
From: Dimitrije Dragasevic <dimitrije.dragasevic@gmail.com>
Date: Mon, 29 Jan 2024 16:55:25 +0100
Subject: [PATCH 03/21] Add more testids

---
 src/app/sections/settings/NetworkSetting.tsx  | 15 +++++--
 .../create/CreateMultisigWalletForm.tsx       | 41 +++++++++++--------
 src/auth/modules/create/CreateWalletForm.tsx  |  5 ++-
 src/components/layout/SettingsSelector.tsx    |  4 +-
 src/extension/auth/SelectWalletsPage.tsx      |  2 +
 src/extension/components/ExtensionList.tsx    | 15 +++++--
 src/extension/components/ExtensionPage.tsx    |  1 +
 src/pages/wallet/WalletMain.tsx               | 32 +++++++++++----
 src/txs/AddressBook/AddressWalletList.tsx     | 13 ++++--
 9 files changed, 93 insertions(+), 35 deletions(-)

diff --git a/src/app/sections/settings/NetworkSetting.tsx b/src/app/sections/settings/NetworkSetting.tsx
index 382f6ef5a..ea1e4353e 100644
--- a/src/app/sections/settings/NetworkSetting.tsx
+++ b/src/app/sections/settings/NetworkSetting.tsx
@@ -28,23 +28,30 @@ const NetworkSetting = () => {
   if (!networkOptions) return null
 
   return (
-    <FlexColumn gap={30}>
+    <FlexColumn gap={30} data-testid="network-settings">
       <SettingsSelector
         accordion
         options={networkOptions}
         value={network}
         onChange={setNetwork}
+        data-testid="network-options-selector"
       />
       <NavButton
         icon={<AddIcon />}
         label="Add Custom LCD Endpoint"
         onClick={() => navigate("/preferences/network/lcd")}
+        data-testid="add-custom-lcd-button"
       />
       {!!list.length && (
         <>
-          <SectionHeader title="Custom LCD Endpoints" withLine />
-          {list.map((i) => (
+          <SectionHeader
+            title="Custom LCD Endpoints"
+            withLine
+            data-testid="custom-lcd-section-header"
+          />
+          {list.map((i, index) => (
             <AddressSelectableListItem
+              key={index}
               active
               subLabel={i.lcd ?? ""}
               chain={i.chain}
@@ -54,6 +61,8 @@ const NetworkSetting = () => {
                   state: { chainID: i.chainID },
                 })
               }
+              data-testid={`address-selectable-list-item-${index}`}
+              data-debug="true"
             />
           ))}
         </>
diff --git a/src/auth/modules/create/CreateMultisigWalletForm.tsx b/src/auth/modules/create/CreateMultisigWalletForm.tsx
index d583959cb..dab2e640b 100644
--- a/src/auth/modules/create/CreateMultisigWalletForm.tsx
+++ b/src/auth/modules/create/CreateMultisigWalletForm.tsx
@@ -145,24 +145,33 @@ const CreateMultisigWalletForm = ({ onCreated, onPubkey, onBack }: Props) => {
 
       <MultiInputWrapper label={t("Wallets")} layout="vertical">
         {fields.map(({ id }, index) => (
-          <Input
-            {...register(`addresses.${index}.value`, {
-              validate: validate.address,
-            })}
-            placeholder={truncate(SAMPLE_ADDRESS, [14, 5])}
-            key={id}
-            actionIcon={
-              fields.length > 2
-                ? {
-                    icon: <DeleteOutlineIcon />,
-                    onClick: () => remove(index),
-                  }
-                : undefined
-            }
-          />
+          <div data-testid={`wallet-input-container-${index}`}>
+            {" "}
+            {/* Wrapper with data-testid */}
+            <Input
+              {...register(`addresses.${index}.value`, {
+                validate: validate.address,
+              })}
+              placeholder={truncate(SAMPLE_ADDRESS, [14, 5])}
+              key={id}
+              data-testid={`wallet-input-${index}`} // data-testid for the Input
+              actionIcon={
+                fields.length > 2
+                  ? {
+                      icon: <DeleteOutlineIcon />,
+                      onClick: () => remove(index),
+                    }
+                  : undefined
+              }
+            />
+          </div>
         ))}
 
-        <Button variant="dashed" onClick={() => append({ value: "" })}>
+        <Button
+          variant="dashed"
+          onClick={() => append({ value: "" })}
+          data-testid="add-wallet-button"
+        >
           {t("Add Wallet Address")}
         </Button>
       </MultiInputWrapper>
diff --git a/src/auth/modules/create/CreateWalletForm.tsx b/src/auth/modules/create/CreateWalletForm.tsx
index 48874108f..86866117e 100644
--- a/src/auth/modules/create/CreateWalletForm.tsx
+++ b/src/auth/modules/create/CreateWalletForm.tsx
@@ -238,6 +238,7 @@ const CreateWalletForm = () => {
             {...register("name", { validate: validate.name })}
             autoFocus
             placeholder="e.g. 'my-wallet'"
+            data-testid="wallet-name-input"
           />
         </InputWrapper>
 
@@ -251,7 +252,7 @@ const CreateWalletForm = () => {
               <Value>{mnemonic}</Value>
             </InputWrapper>
 
-            <Grid gap={4}>
+            <Grid gap={4} data-testid="recovery-phrase-grid">
               <Banner
                 variant="warning"
                 title={t(
@@ -264,6 +265,7 @@ const CreateWalletForm = () => {
               {...register("checked", { required: true })}
               checked={!!checked}
               label={t("I have written down the recovery phrase")}
+              data-testid="recovery-phrase-checkbox"
             />
           </>
         ) : (
@@ -304,6 +306,7 @@ const CreateWalletForm = () => {
           disabled={!isValid}
           variant={"primary"}
           className={styles.submit__button}
+          data-testid="submit-button"
         >
           {generated ? t("Create Wallet") : t("Import")}
         </SubmitButton>
diff --git a/src/components/layout/SettingsSelector.tsx b/src/components/layout/SettingsSelector.tsx
index d11591c95..634ce2a5e 100644
--- a/src/components/layout/SettingsSelector.tsx
+++ b/src/components/layout/SettingsSelector.tsx
@@ -19,13 +19,15 @@ const SettingsSelector = ({
   const { networks } = useNetworks()
 
   return (
-    <RadioList>
+    <RadioList data-testid="radio-list">
       {options.map(({ value, label }, index) => (
         <RadioListItem
           key={value}
           label={label}
           checked={value === selectedOption}
           onClick={() => onChange(value)}
+          data-testid={`radio-list-item-${index}`}
+          data-debug="true"
           {...(accordion && {
             isOpen: openAcc === index,
             setOpenAcc: () => setOpenAcc(openAcc === index ? undefined : index),
diff --git a/src/extension/auth/SelectWalletsPage.tsx b/src/extension/auth/SelectWalletsPage.tsx
index 641c72fdd..864975e41 100644
--- a/src/extension/auth/SelectWalletsPage.tsx
+++ b/src/extension/auth/SelectWalletsPage.tsx
@@ -25,8 +25,10 @@ export default function SelectWalletsPage() {
         <NavButton
           label={t("Add Wallet")}
           onClick={() => navigate("/manage-wallet/add")}
+          data-testid="add-wallet-button"
         />
         <WalletList
+          data-testid="wallet-list"
           activeWallet={{
             name: activeWallet?.name ?? "",
             address: activeWalletAddress,
diff --git a/src/extension/components/ExtensionList.tsx b/src/extension/components/ExtensionList.tsx
index ac2a0ca81..275eb5903 100644
--- a/src/extension/components/ExtensionList.tsx
+++ b/src/extension/components/ExtensionList.tsx
@@ -67,16 +67,25 @@ const ExtensionList = ({ list }: { list: Item[] }) => {
         </>
       ),
       key: index,
+      "data-testid": `list-item-${index}`,
     }
 
     return "to" in item ? (
-      <Link {...props} to={item.to} />
+      <Link {...props} to={item.to} data-testid={`link-item-${index}`} />
     ) : (
-      <button {...props} onClick={manage ? manage : item.onClick} />
+      <button
+        {...props}
+        onClick={manage ? manage : item.onClick}
+        data-testid={`button-item-${index}`}
+      />
     )
   }
 
-  return <div className={styles.list}>{list.map(renderItem)}</div>
+  return (
+    <div className={styles.list} data-testid="extension-list">
+      {list.map(renderItem)}
+    </div>
+  )
 }
 
 export default ExtensionList
diff --git a/src/extension/components/ExtensionPage.tsx b/src/extension/components/ExtensionPage.tsx
index fa304bdbc..0d96448a8 100644
--- a/src/extension/components/ExtensionPage.tsx
+++ b/src/extension/components/ExtensionPage.tsx
@@ -135,6 +135,7 @@ const ExtensionPage = (props: PropsWithChildren<Props>) => {
                         className={styles.modal__close__icon}
                         onClick={() => navigate("/")}
                         fill="currentColor"
+                        data-testid="close-button"
                       />
                     )}
                   </div>
diff --git a/src/pages/wallet/WalletMain.tsx b/src/pages/wallet/WalletMain.tsx
index 95dc82e8d..92aeb6518 100644
--- a/src/pages/wallet/WalletMain.tsx
+++ b/src/pages/wallet/WalletMain.tsx
@@ -21,11 +21,11 @@ const WalletMain = () => {
   return (
     <>
       <section className={styles.wallet__page}>
-        <div className={styles.main__container}>
+        <div className={styles.main__container} data-testid="main-container">
           <UpdateNotification />
           <NetWorth />
         </div>
-        <div className={styles.tabs__container}>
+        <div className={styles.tabs__container} data-testid="tabs-container">
           <PageTabs
             activeTab={tab}
             onClick={(i) => {
@@ -37,23 +37,39 @@ const WalletMain = () => {
             }}
             tabs={[
               t("Assets"),
-              <Flex gap={6}>
+              <Flex gap={6} data-testid="activity-tab">
                 {t("Activity")}
                 {!!totalSuccess && (
-                  <Pill variant="success" text={`${totalSuccess}`} />
+                  <Pill
+                    variant="success"
+                    text={`${totalSuccess}`}
+                    data-testid="success-pill"
+                  />
                 )}
                 {!!totalPending && (
-                  <Pill variant="warning" text={`${totalPending}`} />
+                  <Pill
+                    variant="warning"
+                    text={`${totalPending}`}
+                    data-testid="pending-pill"
+                  />
                 )}
                 {!!totalFailed && (
-                  <Pill variant="danger" text={`${totalFailed}`} />
+                  <Pill
+                    variant="danger"
+                    text={`${totalFailed}`}
+                    data-testid="failed-pill"
+                  />
                 )}
               </Flex>,
             ]}
           />
         </div>
-        <div className={styles.list__container}>
-          {tab === 0 ? <AssetList /> : <ActivityList />}
+        <div className={styles.list__container} data-testid="list-container">
+          {tab === 0 ? (
+            <AssetList data-testid="asset-list" />
+          ) : (
+            <ActivityList data-testid="activity-list" />
+          )}
         </div>
       </section>
       <ExtensionFooter />
diff --git a/src/txs/AddressBook/AddressWalletList.tsx b/src/txs/AddressBook/AddressWalletList.tsx
index d013f387f..13c36fed4 100644
--- a/src/txs/AddressBook/AddressWalletList.tsx
+++ b/src/txs/AddressBook/AddressWalletList.tsx
@@ -16,10 +16,16 @@ const AddressWalletList = ({
 }) => {
   if (!items.length) return null
   return (
-    <Grid gap={16}>
-      {title && <SectionHeader withLine title={title} />}
+    <Grid gap={16} data-testid="address-wallet-list">
+      {title && (
+        <SectionHeader
+          withLine
+          title={title}
+          data-testid="address-wallet-header"
+        />
+      )}
       <Grid gap={8}>
-        {items.map((item) => (
+        {items.map((item, index) => (
           <WalletSelectableListItem
             copyValue={item.recipient}
             walletName={item.name}
@@ -29,6 +35,7 @@ const AddressWalletList = ({
             settingsOnClick={onClick ? () => onClick?.(item) : undefined}
             label={item.name}
             subLabel={truncate(item.recipient, [11, 6])}
+            data-testid={`wallet-item-${index}`}
           />
         ))}
       </Grid>

From 901d4221bb691174896e70ef9ffd85fd97276b73 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:07:40 +0100
Subject: [PATCH 04/21] Select gas denom in ConfirmTx page

---
 package-lock.json                   | 11 +++++-----
 package.json                        |  2 +-
 src/extension/modules/ConfirmTx.tsx | 31 ++++++++++++++++-------------
 src/extension/modules/TxDetails.tsx |  8 ++++++--
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 32e890d28..68327d639 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@terra-money/log-finder-ruleset": "^3.0.3",
         "@terra-money/msg-reader": "^3.0.1",
         "@terra-money/station-connector": "^1.0.12",
-        "@terra-money/station-ui": "^1.0.4",
+        "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
         "@terra-money/terra-utils": "^1.2.0-beta.7",
         "@terra-money/terra.js": "^3.1.9",
         "@terra-money/terra.proto": "^2.0.0",
@@ -7731,8 +7731,8 @@
     },
     "node_modules/@terra-money/station-ui": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@terra-money/station-ui/-/station-ui-1.0.4.tgz",
-      "integrity": "sha512-ULh/k/2V5+jGodUj5FgeQ0qNw3xrLtwqjn/Y07QRuzgwixSqiMQf3hwFSP43VBQ9Yko8upB+dDCbKe/VK3fIww==",
+      "resolved": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
+      "integrity": "sha512-kbTh4uy5n4jew/RDfKOUotgFgTUS3N751RzWu2LpsIfNpLzK/GThAKFvyqlQ4cndTKWXkVFyhl0vtEMHOcGEVw==",
       "dependencies": {
         "@emotion/styled": "^11.11.0",
         "@mui/icons-material": "^5.14.1",
@@ -39978,9 +39978,8 @@
       }
     },
     "@terra-money/station-ui": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@terra-money/station-ui/-/station-ui-1.0.4.tgz",
-      "integrity": "sha512-ULh/k/2V5+jGodUj5FgeQ0qNw3xrLtwqjn/Y07QRuzgwixSqiMQf3hwFSP43VBQ9Yko8upB+dDCbKe/VK3fIww==",
+      "version": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
+      "integrity": "sha512-kbTh4uy5n4jew/RDfKOUotgFgTUS3N751RzWu2LpsIfNpLzK/GThAKFvyqlQ4cndTKWXkVFyhl0vtEMHOcGEVw==",
       "requires": {
         "@emotion/styled": "^11.11.0",
         "@mui/icons-material": "^5.14.1",
diff --git a/package.json b/package.json
index 8d642d647..d6559e620 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@terra-money/log-finder-ruleset": "^3.0.3",
     "@terra-money/msg-reader": "^3.0.1",
     "@terra-money/station-connector": "^1.0.12",
-    "@terra-money/station-ui": "^1.0.4",
+    "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
     "@terra-money/terra-utils": "^1.2.0-beta.7",
     "@terra-money/terra.js": "^3.1.9",
     "@terra-money/terra.proto": "^2.0.0",
diff --git a/src/extension/modules/ConfirmTx.tsx b/src/extension/modules/ConfirmTx.tsx
index 9b509aa73..b08762760 100644
--- a/src/extension/modules/ConfirmTx.tsx
+++ b/src/extension/modules/ConfirmTx.tsx
@@ -73,6 +73,15 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
   const [rememberPassword, setStorePassword] = useState(shouldStorePassword())
   const [areFeesReady, setFeesReady] = useState(!("tx" in props))
   const [showPasswordInput, setShowPasswordInput] = useState(false)
+  const { baseAsset, gasPrices } =
+    "tx" in props ? network[props.tx?.chainID] : ({} as any)
+  const [feeDenom, setFeeDenom] = useState<string | undefined>(
+    "tx" in props
+      ? props.tx.fee?.amount?.toAmino()?.[0]?.denom ?? baseAsset in gasPrices
+        ? baseAsset
+        : Object.keys(gasPrices ?? {})[0]
+      : undefined
+  )
 
   useEffect(() => {
     getStoredPassword().then((password) => {
@@ -100,16 +109,12 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
       try {
         if (!addresses || !addresses[tx?.chainID] || !network[tx?.chainID])
           return 0
-        const { baseAsset, gasPrices } = network[tx?.chainID]
-
-        const feeDenom =
-          baseAsset in gasPrices ? baseAsset : Object.keys(gasPrices ?? {})[0]
 
         const unsignedTx = await lcd.tx.create(
           [{ address: addresses[tx?.chainID] }],
           {
             ...tx,
-            feeDenoms: [feeDenom],
+            feeDenoms: [feeDenom as string],
           }
         )
 
@@ -131,19 +136,16 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
   )
 
   let fee: Fee | undefined
+  let gas = 0
 
   if ("tx" in props && network[props.tx?.chainID]) {
     const { tx } = props
-    fee = tx.fee
-    if (!tx.fee?.gas_limit) {
-      const { baseAsset, gasPrices, gasAdjustment } = network[tx?.chainID]
-      const gas = Math.ceil((estimatedGas ?? 0) * gasAdjustment)
-
-      const feeDenom =
-        baseAsset in gasPrices ? baseAsset : Object.keys(gasPrices ?? {})[0]
+    const { gasPrices, gasAdjustment } = network[tx?.chainID]
+    gas = tx.fee?.gas_limit || Math.ceil((estimatedGas ?? 0) * gasAdjustment)
 
-      fee = new Fee(gas, { [feeDenom]: Math.ceil(gasPrices[feeDenom] * gas) })
-    }
+    fee = new Fee(gas, {
+      [feeDenom as string]: Math.ceil(gasPrices[feeDenom as string] * gas),
+    })
   }
 
   const disabled =
@@ -317,6 +319,7 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
               {...props}
               tx={{ ...props.tx, fee }}
               onFeesReady={(state) => setFeesReady(state)}
+              setFeeDenom={(denom) => setFeeDenom(denom)}
             />
           )}
           {"bytes" in props && <SignBytesDetails {...props} />}
diff --git a/src/extension/modules/TxDetails.tsx b/src/extension/modules/TxDetails.tsx
index a2bae5184..b47d32a56 100644
--- a/src/extension/modules/TxDetails.tsx
+++ b/src/extension/modules/TxDetails.tsx
@@ -11,7 +11,11 @@ const TxDetails = ({
   timestamp,
   tx,
   onFeesReady,
-}: TxRequest & { onFeesReady: (state: boolean) => void }) => {
+  setFeeDenom,
+}: TxRequest & {
+  onFeesReady: (state: boolean) => void
+  setFeeDenom: (denom: string) => void
+}) => {
   const { msgs, memo, fee, chainID } = tx
 
   const { t } = useTranslation()
@@ -37,7 +41,7 @@ const TxDetails = ({
         gas={fee?.gas_limit}
         gasDenom={fee?.amount.denoms()[0]}
         descriptions={contents.filter(({ value }) => !!value)}
-        setGasDenom={() => {}}
+        setGasDenom={setFeeDenom}
         onReady={(state) => onFeesReady(state)}
       />
     </Grid>

From 22953e1489305d40ace7ce6690eccbcd8a5cdfc1 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:40:54 +0100
Subject: [PATCH 05/21] fix fee default selection

---
 src/extension/modules/ConfirmTx.tsx    | 21 +++++++++++++--------
 src/extension/modules/TxDetails.tsx    |  2 +-
 src/txs/feeAbstraction/DisplayFees.tsx |  6 +++---
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/extension/modules/ConfirmTx.tsx b/src/extension/modules/ConfirmTx.tsx
index b08762760..833ff4cee 100644
--- a/src/extension/modules/ConfirmTx.tsx
+++ b/src/extension/modules/ConfirmTx.tsx
@@ -73,15 +73,16 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
   const [rememberPassword, setStorePassword] = useState(shouldStorePassword())
   const [areFeesReady, setFeesReady] = useState(!("tx" in props))
   const [showPasswordInput, setShowPasswordInput] = useState(false)
-  const { baseAsset, gasPrices } =
+  const { baseAsset, gasPrices, isClassic } =
     "tx" in props ? network[props.tx?.chainID] : ({} as any)
+  console.log("tx" in props && props.tx.fee?.amount?.toData()?.[0]?.denom)
   const [feeDenom, setFeeDenom] = useState<string | undefined>(
     "tx" in props
-      ? props.tx.fee?.amount?.toAmino()?.[0]?.denom ?? baseAsset in gasPrices
-        ? baseAsset
-        : Object.keys(gasPrices ?? {})[0]
+      ? props.tx.fee?.amount?.toData()?.[0]?.denom ??
+          (baseAsset in gasPrices ? baseAsset : Object.keys(gasPrices ?? {})[0])
       : undefined
   )
+  console.log(feeDenom)
 
   useEffect(() => {
     getStoredPassword().then((password) => {
@@ -143,9 +144,11 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
     const { gasPrices, gasAdjustment } = network[tx?.chainID]
     gas = tx.fee?.gas_limit || Math.ceil((estimatedGas ?? 0) * gasAdjustment)
 
-    fee = new Fee(gas, {
-      [feeDenom as string]: Math.ceil(gasPrices[feeDenom as string] * gas),
-    })
+    fee = isClassic
+      ? tx.fee
+      : new Fee(gas, {
+          [feeDenom as string]: Math.ceil(gasPrices[feeDenom as string] * gas),
+        })
   }
 
   const disabled =
@@ -319,7 +322,9 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
               {...props}
               tx={{ ...props.tx, fee }}
               onFeesReady={(state) => setFeesReady(state)}
-              setFeeDenom={(denom) => setFeeDenom(denom)}
+              setFeeDenom={
+                isClassic ? undefined : (denom) => setFeeDenom(denom)
+              }
             />
           )}
           {"bytes" in props && <SignBytesDetails {...props} />}
diff --git a/src/extension/modules/TxDetails.tsx b/src/extension/modules/TxDetails.tsx
index b47d32a56..e789219e4 100644
--- a/src/extension/modules/TxDetails.tsx
+++ b/src/extension/modules/TxDetails.tsx
@@ -14,7 +14,7 @@ const TxDetails = ({
   setFeeDenom,
 }: TxRequest & {
   onFeesReady: (state: boolean) => void
-  setFeeDenom: (denom: string) => void
+  setFeeDenom?: (denom: string) => void
 }) => {
   const { msgs, memo, fee, chainID } = tx
 
diff --git a/src/txs/feeAbstraction/DisplayFees.tsx b/src/txs/feeAbstraction/DisplayFees.tsx
index 8efd74086..dc620b670 100644
--- a/src/txs/feeAbstraction/DisplayFees.tsx
+++ b/src/txs/feeAbstraction/DisplayFees.tsx
@@ -29,7 +29,7 @@ export default function DisplayFees({
   chainID: string
   gas: number | undefined
   gasDenom: string | undefined
-  setGasDenom: (gasDenom: string) => void
+  setGasDenom?: (gasDenom: string) => void
   descriptions?: { label: ReactNode; value: ReactNode }[]
   onReady: (state: boolean) => void
 }) {
@@ -58,7 +58,7 @@ export default function DisplayFees({
       availableGasDenoms.length &&
       !availableGasDenoms.includes(gasDenom ?? "")
     ) {
-      setGasDenom(availableGasDenoms[0])
+      setGasDenom && setGasDenom(availableGasDenoms[0])
     }
   }, [availableGasDenoms]) // eslint-disable-line
 
@@ -126,7 +126,7 @@ export default function DisplayFees({
           label: (
             <div className={styles.gas}>
               {t("Fee")}{" "}
-              {availableGasDenoms.length > 1 && (
+              {availableGasDenoms.length > 1 && setGasDenom && (
                 <Select
                   value={gasDenom}
                   onChange={(e) => setGasDenom(e.target.value)}

From e4a55f39e60fe91d76b8ced672dd82fda4b859ec Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:41:19 +0100
Subject: [PATCH 06/21] remove console.log

---
 src/extension/modules/ConfirmTx.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/extension/modules/ConfirmTx.tsx b/src/extension/modules/ConfirmTx.tsx
index 833ff4cee..8c7ee5e15 100644
--- a/src/extension/modules/ConfirmTx.tsx
+++ b/src/extension/modules/ConfirmTx.tsx
@@ -75,14 +75,12 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
   const [showPasswordInput, setShowPasswordInput] = useState(false)
   const { baseAsset, gasPrices, isClassic } =
     "tx" in props ? network[props.tx?.chainID] : ({} as any)
-  console.log("tx" in props && props.tx.fee?.amount?.toData()?.[0]?.denom)
   const [feeDenom, setFeeDenom] = useState<string | undefined>(
     "tx" in props
       ? props.tx.fee?.amount?.toData()?.[0]?.denom ??
           (baseAsset in gasPrices ? baseAsset : Object.keys(gasPrices ?? {})[0])
       : undefined
   )
-  console.log(feeDenom)
 
   useEffect(() => {
     getStoredPassword().then((password) => {

From c21970b1aa014f4dc083612c935982b819fac0fd Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:45:45 +0100
Subject: [PATCH 07/21] Fix gas helper when user doesn't have coins on any
 chain

---
 src/txs/feeAbstraction/GasHelper.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/txs/feeAbstraction/GasHelper.tsx b/src/txs/feeAbstraction/GasHelper.tsx
index 228fb5208..d8611f1ca 100644
--- a/src/txs/feeAbstraction/GasHelper.tsx
+++ b/src/txs/feeAbstraction/GasHelper.tsx
@@ -162,7 +162,7 @@ export default function GasHelper({
     )
 
   // gas helper not supported for multisig wallets
-  if (isWallet.multisig(wallet)) {
+  if (isWallet.multisig(wallet) || !swappableDenoms.length) {
     return (
       <GasHelperCard className={styles.card} progressColor="gray">
         <h3 className={styles.title}>
@@ -171,7 +171,7 @@ export default function GasHelper({
         </h3>
         <p className={styles.description}>
           {t(
-            "You don't have enough {{token}} to complete all the steps in this transaction, but we can fix that for you! Please select an available token below to convert for gas fees.",
+            "You don't have enough {{token}} to complete all the steps in this transaction.",
             { token: readNativeDenom(gasDenom, chainID).symbol }
           )}
         </p>

From e171c9f6790baf0174ce57fe67f1e932d23c6970 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:58:39 +0100
Subject: [PATCH 08/21] Paginate bank balances query

---
 src/data/queries/bank.ts | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/data/queries/bank.ts b/src/data/queries/bank.ts
index 23fdc84d3..e5894f921 100644
--- a/src/data/queries/bank.ts
+++ b/src/data/queries/bank.ts
@@ -6,6 +6,8 @@ import { useInterchainAddresses } from "auth/hooks/useAddress"
 import { useCustomTokensCW20 } from "data/settings/CustomTokens"
 import { useNetwork } from "data/wallet"
 import { getChainIDFromAddress } from "utils/bech32"
+import { Coin, Coins } from "@terra-money/feather.js"
+import { Pagination } from "@terra-money/feather.js/dist/client/lcd/APIRequester"
 
 export const useInitialTokenBalance = () => {
   const addresses = useInterchainAddresses()
@@ -58,11 +60,27 @@ export const useInitialBankBalance = () => {
       return {
         queryKey: [queryKey.bank.balances, address, chainID],
         queryFn: async () => {
-          const bal = ["phoenix-1", "pisco-1"].includes(chainID)
-            ? await lcd.bank.spendableBalances(address)
-            : await lcd.bank.balance(address)
+          const rawBalances: Coin[] = []
+          let next_key: string | null = null
 
-          return bal[0].toArray().map(({ denom, amount }) => ({
+          do {
+            const data: [Coins, Pagination] = ["phoenix-1", "pisco-1"].includes(
+              chainID
+            )
+              ? await lcd.bank.spendableBalances(
+                  address,
+                  next_key ? { "pagination.key": next_key } : undefined
+                )
+              : await lcd.bank.balance(
+                  address,
+                  next_key ? { "pagination.key": next_key } : undefined
+                )
+
+            rawBalances.push(...data[0].toArray())
+            next_key = data[1].next_key
+          } while (next_key)
+
+          return rawBalances.map(({ denom, amount }) => ({
             denom,
             amount: amount.toString(),
             chain: chainID,

From 21488756e8ceca8d83e5c44e8d03ed20525cb6f0 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Fri, 2 Feb 2024 09:56:07 +0100
Subject: [PATCH 09/21] Fix mardown parser

---
 src/utils/markdown.module.scss | 17 +++++++++++++++++
 src/utils/markdown.tsx         | 22 ++++++++++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 src/utils/markdown.module.scss

diff --git a/src/utils/markdown.module.scss b/src/utils/markdown.module.scss
new file mode 100644
index 000000000..8b87bfec2
--- /dev/null
+++ b/src/utils/markdown.module.scss
@@ -0,0 +1,17 @@
+.title1 {
+  font-size: 14pt;
+  font-weight: 600;
+  margin: 0.4rem 0;
+}
+
+.title2 {
+  font-size: 12pt;
+  font-weight: 600;
+  margin: 0.4rem 0;
+}
+
+.title3 {
+  font-size: 10pt;
+  font-weight: 600;
+  margin: 0.4rem 0;
+}
diff --git a/src/utils/markdown.tsx b/src/utils/markdown.tsx
index 4c4c1b8e3..48206b698 100644
--- a/src/utils/markdown.tsx
+++ b/src/utils/markdown.tsx
@@ -1,5 +1,6 @@
 import { TooltipIcon } from "components/display"
 import { ExternalLink } from "components/general"
+import styles from "./markdown.module.scss"
 
 export const markdownTextParser = (text: string, showLinks?: boolean) => {
   if (!text) return null
@@ -11,11 +12,23 @@ export const markdownTextParser = (text: string, showLinks?: boolean) => {
     //if (!line) return
 
     if (line.startsWith("# ")) {
-      result.push(<h1 key={i}>{line.replace("# ", "")}</h1>)
+      result.push(
+        <h1 key={i} className={styles.title1}>
+          {line.replace("# ", "")}
+        </h1>
+      )
     } else if (line.startsWith("## ")) {
-      result.push(<h2 key={i}>{line.replace("## ", "")}</h2>)
+      result.push(
+        <h2 key={i} className={styles.title2}>
+          {line.replace("## ", "")}
+        </h2>
+      )
     } else if (line.startsWith("### ")) {
-      result.push(<h3 key={i}>{line.replace("### ", "")}</h3>)
+      result.push(
+        <h3 key={i} className={styles.title3}>
+          {line.replace("### ", "")}
+        </h3>
+      )
     } else {
       const lineResult: (React.ReactNode | string)[] = []
       const pattern =
@@ -80,8 +93,9 @@ export const markdownTextParser = (text: string, showLinks?: boolean) => {
       if (line.startsWith("- ")) {
         result.push(<li key={i}>{lineResult}</li>)
       } else {
+        console.log(line, lineResult)
         result.push(
-          lineResult.length > 1 && lineResult[0] !== "\r" ? (
+          lineResult.length >= 1 && lineResult[0] !== "\r" ? (
             <p key={i}>{lineResult}</p>
           ) : (
             <br />

From 598849556b8b9d21221793ebddc4507dbfd3b0c8 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Fri, 2 Feb 2024 09:57:28 +0100
Subject: [PATCH 10/21] remove console.log

---
 src/utils/markdown.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/markdown.tsx b/src/utils/markdown.tsx
index 48206b698..074fda769 100644
--- a/src/utils/markdown.tsx
+++ b/src/utils/markdown.tsx
@@ -93,7 +93,6 @@ export const markdownTextParser = (text: string, showLinks?: boolean) => {
       if (line.startsWith("- ")) {
         result.push(<li key={i}>{lineResult}</li>)
       } else {
-        console.log(line, lineResult)
         result.push(
           lineResult.length >= 1 && lineResult[0] !== "\r" ? (
             <p key={i}>{lineResult}</p>

From 309ee8a4c40cf2d89cf4806647027818165b9051 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:09:31 +0100
Subject: [PATCH 11/21] Fix cannot read property "baseAsset" of undefined

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

diff --git a/src/extension/modules/ConfirmTx.tsx b/src/extension/modules/ConfirmTx.tsx
index 8c7ee5e15..de0dc4a8e 100644
--- a/src/extension/modules/ConfirmTx.tsx
+++ b/src/extension/modules/ConfirmTx.tsx
@@ -74,7 +74,7 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
   const [areFeesReady, setFeesReady] = useState(!("tx" in props))
   const [showPasswordInput, setShowPasswordInput] = useState(false)
   const { baseAsset, gasPrices, isClassic } =
-    "tx" in props ? network[props.tx?.chainID] : ({} as any)
+    ("tx" in props && network[props.tx?.chainID]) || ({} as any)
   const [feeDenom, setFeeDenom] = useState<string | undefined>(
     "tx" in props
       ? props.tx.fee?.amount?.toData()?.[0]?.denom ??

From bf033220e88024c785f90f42e5ed7896b78eafc8 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Mon, 5 Feb 2024 16:01:06 +0100
Subject: [PATCH 12/21] Track ibc timeouts and parse unreadable messages

---
 package-lock.json                          | 25 ++++++-------
 package.json                               |  4 +-
 src/data/queries/activity.ts               |  8 +++-
 src/data/query.ts                          |  1 +
 src/pages/activity/ActivityDetailsPage.tsx | 22 +++++------
 src/txs/useIbcTxs.ts                       | 43 ++++++++++++++++++++++
 6 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 32e890d28..bfb67ccdc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,8 +18,8 @@
         "@terra-money/log-finder-ruleset": "^3.0.3",
         "@terra-money/msg-reader": "^3.0.1",
         "@terra-money/station-connector": "^1.0.12",
-        "@terra-money/station-ui": "^1.0.4",
-        "@terra-money/terra-utils": "^1.2.0-beta.7",
+        "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
+        "@terra-money/terra-utils": "^1.2.0-beta.8",
         "@terra-money/terra.js": "^3.1.9",
         "@terra-money/terra.proto": "^2.0.0",
         "@terra-money/wallet-kit": "^1.0.15",
@@ -7731,8 +7731,8 @@
     },
     "node_modules/@terra-money/station-ui": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@terra-money/station-ui/-/station-ui-1.0.4.tgz",
-      "integrity": "sha512-ULh/k/2V5+jGodUj5FgeQ0qNw3xrLtwqjn/Y07QRuzgwixSqiMQf3hwFSP43VBQ9Yko8upB+dDCbKe/VK3fIww==",
+      "resolved": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
+      "integrity": "sha512-kbTh4uy5n4jew/RDfKOUotgFgTUS3N751RzWu2LpsIfNpLzK/GThAKFvyqlQ4cndTKWXkVFyhl0vtEMHOcGEVw==",
       "dependencies": {
         "@emotion/styled": "^11.11.0",
         "@mui/icons-material": "^5.14.1",
@@ -8221,9 +8221,9 @@
       }
     },
     "node_modules/@terra-money/terra-utils": {
-      "version": "1.2.0-beta.7",
-      "resolved": "https://registry.npmjs.org/@terra-money/terra-utils/-/terra-utils-1.2.0-beta.7.tgz",
-      "integrity": "sha512-r42ywIed+mcPZUndvZgBFyO/HFf7pmzze/zUMCzg7MZwOaKcwFJKisqzNAfhtYVVwWA+02DZLNMmShNfCUtIzw==",
+      "version": "1.2.0-beta.8",
+      "resolved": "https://registry.npmjs.org/@terra-money/terra-utils/-/terra-utils-1.2.0-beta.8.tgz",
+      "integrity": "sha512-AB9Y5xYiDEzW5dtg2K8mOSBlDmSIS3LWYS37Oxqu4sP4mCi9UnftPAIEjU3wp3cNFYKcaWexQuA5YzSRud4OBw==",
       "dependencies": {
         "@terra-money/feather.js": "^2.0.0-beta.7",
         "@types/numeral": "^2.0.2",
@@ -39978,9 +39978,8 @@
       }
     },
     "@terra-money/station-ui": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@terra-money/station-ui/-/station-ui-1.0.4.tgz",
-      "integrity": "sha512-ULh/k/2V5+jGodUj5FgeQ0qNw3xrLtwqjn/Y07QRuzgwixSqiMQf3hwFSP43VBQ9Yko8upB+dDCbKe/VK3fIww==",
+      "version": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
+      "integrity": "sha512-kbTh4uy5n4jew/RDfKOUotgFgTUS3N751RzWu2LpsIfNpLzK/GThAKFvyqlQ4cndTKWXkVFyhl0vtEMHOcGEVw==",
       "requires": {
         "@emotion/styled": "^11.11.0",
         "@mui/icons-material": "^5.14.1",
@@ -40230,9 +40229,9 @@
       }
     },
     "@terra-money/terra-utils": {
-      "version": "1.2.0-beta.7",
-      "resolved": "https://registry.npmjs.org/@terra-money/terra-utils/-/terra-utils-1.2.0-beta.7.tgz",
-      "integrity": "sha512-r42ywIed+mcPZUndvZgBFyO/HFf7pmzze/zUMCzg7MZwOaKcwFJKisqzNAfhtYVVwWA+02DZLNMmShNfCUtIzw==",
+      "version": "1.2.0-beta.8",
+      "resolved": "https://registry.npmjs.org/@terra-money/terra-utils/-/terra-utils-1.2.0-beta.8.tgz",
+      "integrity": "sha512-AB9Y5xYiDEzW5dtg2K8mOSBlDmSIS3LWYS37Oxqu4sP4mCi9UnftPAIEjU3wp3cNFYKcaWexQuA5YzSRud4OBw==",
       "requires": {
         "@terra-money/feather.js": "^2.0.0-beta.7",
         "@types/numeral": "^2.0.2",
diff --git a/package.json b/package.json
index 8d642d647..69f34c268 100644
--- a/package.json
+++ b/package.json
@@ -27,8 +27,8 @@
     "@terra-money/log-finder-ruleset": "^3.0.3",
     "@terra-money/msg-reader": "^3.0.1",
     "@terra-money/station-connector": "^1.0.12",
-    "@terra-money/station-ui": "^1.0.4",
-    "@terra-money/terra-utils": "^1.2.0-beta.7",
+    "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
+    "@terra-money/terra-utils": "^1.2.0-beta.8",
     "@terra-money/terra.js": "^3.1.9",
     "@terra-money/terra.proto": "^2.0.0",
     "@terra-money/wallet-kit": "^1.0.15",
diff --git a/src/data/queries/activity.ts b/src/data/queries/activity.ts
index 72a301be4..a89fc3ff6 100644
--- a/src/data/queries/activity.ts
+++ b/src/data/queries/activity.ts
@@ -154,7 +154,13 @@ export const useTxActivity = () => {
   )
 
   result.forEach((tx, i) => {
-    if (discarededTxsHashes.includes(tx.txhash)) return
+    if (
+      discarededTxsHashes.includes(tx.txhash) ||
+      !!tx.logs.find((log) =>
+        log.events.find((e) => e.type === "timeout_packet")
+      )
+    )
+      return
 
     const senderDetails = getIbcTxDetails(tx)
 
diff --git a/src/data/query.ts b/src/data/query.ts
index 2a4a5ef8e..5f4577d7d 100644
--- a/src/data/query.ts
+++ b/src/data/query.ts
@@ -63,6 +63,7 @@ export const queryKey = mirror({
     channelInfo: "",
     packetStatus: "",
     receivePacket: "",
+    timeoutPacket: "",
     sendPacket: "",
   },
   market: { params: "" },
diff --git a/src/pages/activity/ActivityDetailsPage.tsx b/src/pages/activity/ActivityDetailsPage.tsx
index db5dd0a6a..ee83baf8d 100644
--- a/src/pages/activity/ActivityDetailsPage.tsx
+++ b/src/pages/activity/ActivityDetailsPage.tsx
@@ -24,6 +24,7 @@ import {
   getRecvIbcTxDetails,
   useIbcNextHop,
   useIbcPrevHop,
+  useIbcTimeout,
 } from "txs/useIbcTxs"
 
 interface Props {
@@ -131,7 +132,9 @@ const PrevHopActivity = (ibcDetails: IbcTxDetails) => {
 }
 
 const NextHopActivity = (ibcDetails: IbcTxDetails) => {
-  const { data: tx } = useIbcNextHop(ibcDetails)
+  const { data: nextTx } = useIbcNextHop(ibcDetails)
+  const { data: timeoutTx } = useIbcTimeout(ibcDetails, !!nextTx)
+  const tx = nextTx ?? timeoutTx
   const network = useNetwork()
   const { t } = useTranslation()
   const parseMsgs = useParseMessages()
@@ -155,12 +158,12 @@ const NextHopActivity = (ibcDetails: IbcTxDetails) => {
 
   const { activityMessages, activityType } = parseMsgs(tx)
 
-  const nextIbcDetails = getIbcTxDetails(tx)
+  const nextIbcDetails = nextTx && getIbcTxDetails(nextTx)
 
   const timelineDisplayMessages = activityMessages.map(
     (message: ReactElement) => {
       return {
-        variant: (tx.code === 0 ? "success" : "warning") as
+        variant: (tx.code !== 0 || !!timeoutTx ? "warning" : "success") as
           | "success"
           | "warning",
         msg: message,
@@ -173,7 +176,7 @@ const NextHopActivity = (ibcDetails: IbcTxDetails) => {
       <Timeline
         startOverride={
           <ActivityListItem
-            variant={tx.code === 0 ? "success" : "failed"}
+            variant={tx.code !== 0 || !!timeoutTx ? "failed" : "success"}
             chain={{
               icon: network[tx.chain].icon,
               label: network[tx.chain].name,
@@ -256,10 +259,7 @@ const ActivityDetailsPage = ({
               type={type}
               time={toNow(new Date(time))}
               msgCount={timelineDisplayMessages.length}
-              hasTimeline={
-                !!timelineDisplayMessages.length ||
-                (!!ibcDetails && variant !== "failed")
-              }
+              hasTimeline={!!timelineDisplayMessages.length || !!ibcDetails}
               extra={
                 <ExternalLink
                   href={externalLink}
@@ -271,11 +271,9 @@ const ActivityDetailsPage = ({
             />
           }
           middleItems={timelineDisplayMessages}
-          hasNextElement={!!ibcDetails && variant !== "failed"}
+          hasNextElement={!!ibcDetails}
         />
-        {!!ibcDetails && variant !== "failed" && (
-          <NextHopActivity {...ibcDetails} />
-        )}
+        {!!ibcDetails && <NextHopActivity {...ibcDetails} />}
       </div>
 
       <SectionHeader title={t("Details")} withLine />
diff --git a/src/txs/useIbcTxs.ts b/src/txs/useIbcTxs.ts
index fe40c3fa5..208a1541c 100644
--- a/src/txs/useIbcTxs.ts
+++ b/src/txs/useIbcTxs.ts
@@ -312,6 +312,49 @@ export const useIbcPrevHop = (details?: IbcTxDetails) => {
   )
 }
 
+export const useIbcTimeout = (details: IbcTxDetails, disabled?: boolean) => {
+  const networks = useNetwork()
+  const lcd = networks[details?.src_chain_id ?? ""]?.lcd
+
+  return useQuery(
+    [
+      queryKey.ibc.receivePacket,
+      details.sequence,
+      details.dst_channel,
+      details.src_channel,
+      lcd,
+    ],
+    async () => {
+      const { data } = await axios.get(
+        `/cosmos/tx/v1beta1/txs?events=timeout_packet.packet_sequence%3D${details.sequence}&events=timeout_packet.packet_src_channel%3D%27${details.src_channel}%27&events=timeout_packet.packet_dst_channel%3D%27${details.dst_channel}%27`,
+        { baseURL: lcd }
+      )
+
+      if (!data.tx_responses.length) return undefined
+
+      const result = {
+        ...(data.tx_responses as ActivityItem[])[0],
+        chain: details.src_chain_id,
+      } as ActivityItem
+
+      return result
+    },
+    {
+      staleTime: Infinity,
+      enabled: !disabled,
+      refetchInterval: (data?: ActivityItem) => {
+        if (data) {
+          return false
+        }
+
+        return (details.timeout_timestamp ?? 0) > new Date().getTime()
+          ? 30_000
+          : (details.timeout_timestamp ?? 0) - new Date().getTime() + 15_000
+      },
+    }
+  )
+}
+
 export const useIbcNextHop = (details?: IbcTxDetails) => {
   const result = useIbcNextHops(details ? [details] : [])[0]
 

From 8d61f580f1b621b24a8499dd6b50c053de3abd8b Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Wed, 7 Feb 2024 14:37:54 +0100
Subject: [PATCH 13/21] Use allow_multi_tx=false on the skip api

---
 src/data/queries/swap/skip.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/data/queries/swap/skip.ts b/src/data/queries/swap/skip.ts
index c04add838..ca73cf45d 100644
--- a/src/data/queries/swap/skip.ts
+++ b/src/data/queries/swap/skip.ts
@@ -13,7 +13,7 @@ import {
 } from "./types"
 import { InterchainAddresses } from "types/network"
 import { IInterchainNetworks } from "data/wallet"
-import { isTerraChain } from "utils/chain"
+//import { isTerraChain } from "utils/chain"
 
 export const skipApi = {
   queryTokens: async () => {
@@ -89,17 +89,18 @@ export const skipApi = {
         dest_asset_denom: askAsset.denom,
         dest_asset_chain_id: askAsset.chainId,
         cumulative_affiliate_fee_bps: "0",
+        allow_multi_tx: false,
       }
-      const swapOnTerra = [offerAsset.chainId, askAsset.chainId].every(
+      /*const swapOnTerra = [offerAsset.chainId, askAsset.chainId].every(
         isTerraChain
       )
 
-      if (swapOnTerra) {
+      /*if (swapOnTerra) {
         payload.swap_venue = {
           name: SwapVenue.ASTROPORT,
           chain_id: offerAsset.chainId,
         }
-      }
+      }*/
 
       const res = await axios.post(SKIP_SWAP_API.routes.route, payload, {
         baseURL: SKIP_SWAP_API.baseUrl,

From d55b889b9fbf441878e070ebf15f1ae12d709e42 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:04:52 +0100
Subject: [PATCH 14/21] Support signBytes with multiple cointypes

---
 package-lock.json                   | 37 +++++++++++++++++++++++++----
 package.json                        |  2 +-
 src/auth/hooks/useAuth.ts           | 19 +++++++++++----
 src/extension/modules/ConfirmTx.tsx |  4 ++--
 src/extension/utils.ts              |  1 +
 5 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bfb67ccdc..848c6800e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@terra-money/ledger-station-js": "^1.3.7",
         "@terra-money/log-finder-ruleset": "^3.0.3",
         "@terra-money/msg-reader": "^3.0.1",
-        "@terra-money/station-connector": "^1.0.12",
+        "@terra-money/station-connector": "^1.0.17-beta.1",
         "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
         "@terra-money/terra-utils": "^1.2.0-beta.8",
         "@terra-money/terra.js": "^3.1.9",
@@ -7715,8 +7715,9 @@
       }
     },
     "node_modules/@terra-money/station-connector": {
-      "version": "1.0.16",
-      "license": "Apache-2.0",
+      "version": "1.0.17-beta.1",
+      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.1.tgz",
+      "integrity": "sha512-JPSBHZ8lJyrAO/tw120yhbypWgq92mtO+3appKsSeXhH8D1j1EPHcy8mplbnDW1B0SMfuSG/exjOiec8Wi5Tkg==",
       "dependencies": {
         "bech32": "^2.0.0"
       },
@@ -8220,6 +8221,22 @@
         "@terra-money/feather.js": "^1.0.8"
       }
     },
+    "node_modules/@terra-money/station-wallet/node_modules/@terra-money/station-connector": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.16.tgz",
+      "integrity": "sha512-m16a4KkUWF+Mhmf4LiBO1TvCdIabJFudbCC+Cr2JwknZnPQ2SmMHSfyBhS5SaJGWIhmHd4yZalRdNBr+QUc6hA==",
+      "dependencies": {
+        "bech32": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "@cosmjs/amino": "^0.31.0",
+        "@terra-money/feather.js": "^1.0.8",
+        "axios": "^0.27.2"
+      }
+    },
     "node_modules/@terra-money/terra-utils": {
       "version": "1.2.0-beta.8",
       "resolved": "https://registry.npmjs.org/@terra-money/terra-utils/-/terra-utils-1.2.0-beta.8.tgz",
@@ -39972,7 +39989,9 @@
       }
     },
     "@terra-money/station-connector": {
-      "version": "1.0.16",
+      "version": "1.0.17-beta.1",
+      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.1.tgz",
+      "integrity": "sha512-JPSBHZ8lJyrAO/tw120yhbypWgq92mtO+3appKsSeXhH8D1j1EPHcy8mplbnDW1B0SMfuSG/exjOiec8Wi5Tkg==",
       "requires": {
         "bech32": "^2.0.0"
       }
@@ -40226,6 +40245,16 @@
       "requires": {
         "@terra-money/station-connector": "^1.0.16",
         "@terra-money/wallet-interface": "^1.0.16"
+      },
+      "dependencies": {
+        "@terra-money/station-connector": {
+          "version": "1.0.16",
+          "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.16.tgz",
+          "integrity": "sha512-m16a4KkUWF+Mhmf4LiBO1TvCdIabJFudbCC+Cr2JwknZnPQ2SmMHSfyBhS5SaJGWIhmHd4yZalRdNBr+QUc6hA==",
+          "requires": {
+            "bech32": "^2.0.0"
+          }
+        }
       }
     },
     "@terra-money/terra-utils": {
diff --git a/package.json b/package.json
index 69f34c268..5aa8c664d 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@terra-money/ledger-station-js": "^1.3.7",
     "@terra-money/log-finder-ruleset": "^3.0.3",
     "@terra-money/msg-reader": "^3.0.1",
-    "@terra-money/station-connector": "^1.0.12",
+    "@terra-money/station-connector": "^1.0.17-beta.1",
     "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
     "@terra-money/terra-utils": "^1.2.0-beta.8",
     "@terra-money/terra.js": "^3.1.9",
diff --git a/src/auth/hooks/useAuth.ts b/src/auth/hooks/useAuth.ts
index a8b6c23a0..73c2c6df0 100644
--- a/src/auth/hooks/useAuth.ts
+++ b/src/auth/hooks/useAuth.ts
@@ -24,7 +24,7 @@ import legacyEncrypt from "../scripts/encrypt"
 import { encrypt } from "../scripts/aes"
 import useAvailable from "./useAvailable"
 import { addressFromWords } from "utils/bech32"
-import { useNetwork } from "./useNetwork"
+import { IInterchainNetworks, useAllNetworks, useNetwork } from "./useNetwork"
 import { useLedgerKey } from "utils/ledger"
 import { useLogin } from "extension/modules/Login"
 
@@ -36,6 +36,7 @@ export const walletState = atom({
 const useAuth = () => {
   const lcd = useInterchainLCDClient()
   const networks = useNetwork()
+  const allNetworks = useAllNetworks()
   const available = useAvailable()
   const { isLoggedIn } = useLogin()
 
@@ -297,8 +298,13 @@ const useAuth = () => {
     }
   }
 
-  const signBytes = (bytes: Buffer, password = "") => {
+  const signBytes = (
+    bytes: Buffer,
+    chainID: string | undefined,
+    password = ""
+  ) => {
     if (!wallet) throw new Error("Wallet is not defined")
+    const requestedCointype = allNetworks[chainID ?? ""]?.coinType
 
     if (is.ledger(wallet)) {
       throw new Error("Ledger can not sign arbitrary data")
@@ -309,7 +315,7 @@ const useAuth = () => {
       if ("seed" in pk) {
         const key = new SeedKey({
           seed: Buffer.from(pk.seed, "hex"),
-          coinType: pk.legacy ? 118 : 330,
+          coinType: Number(requestedCointype) || (pk.legacy ? 118 : 330),
           index: pk.index || 0,
         })
         const { signature, recid } = key.ecdsaSign(bytes)
@@ -320,7 +326,12 @@ const useAuth = () => {
           public_key: key.publicKey?.toAmino().value as string,
         }
       } else {
-        const key = new RawKey(Buffer.from(pk["330"], "hex"))
+        const rawkey = pk[requestedCointype ?? "330"]
+        if (!rawkey)
+          throw new Error(
+            "The requested cointype is not available for the current wallet."
+          )
+        const key = new RawKey(Buffer.from(rawkey, "hex"))
         const { signature, recid } = key.ecdsaSign(bytes)
         if (!signature) throw new Error("Signature is undefined")
         return {
diff --git a/src/extension/modules/ConfirmTx.tsx b/src/extension/modules/ConfirmTx.tsx
index 9b509aa73..7bbae380d 100644
--- a/src/extension/modules/ConfirmTx.tsx
+++ b/src/extension/modules/ConfirmTx.tsx
@@ -194,11 +194,11 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
       }
     } else {
       // arbitrary data
-      const { requestType, bytes } = props
+      const { requestType, bytes, chainID } = props
 
       try {
         if (disabled) throw new Error(disabled)
-        const result = await auth.signBytes(bytes, password)
+        const result = await auth.signBytes(bytes, chainID, password)
         const response = { result, success: true }
         actions.tx(requestType, props, response)
       } catch (error) {
diff --git a/src/extension/utils.ts b/src/extension/utils.ts
index 90c7b18c0..0f9218abf 100644
--- a/src/extension/utils.ts
+++ b/src/extension/utils.ts
@@ -97,6 +97,7 @@ export interface TxRequest extends DefaultRequest {
 
 export interface SignBytesRequest extends DefaultRequest {
   bytes: Buffer
+  chainID?: string
   requestType: "signBytes"
 }
 

From 874ec59886b7616eb615da734d00ad3c4f224cbe Mon Sep 17 00:00:00 2001
From: Manuel Alessandro Collazo <collazo.manuel6@gmail.com>
Date: Thu, 8 Feb 2024 16:30:20 -0300
Subject: [PATCH 15/21] fix: lunc asset page

---
 src/data/token.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/token.tsx b/src/data/token.tsx
index 554cc2138..4d1eec076 100644
--- a/src/data/token.tsx
+++ b/src/data/token.tsx
@@ -205,7 +205,7 @@ export const useNativeDenoms = () => {
           icon: "https://assets.terra.dev/icon/svg/LUNC.svg",
           decimals: 6,
           isNonWhitelisted: false,
-          chainID: "colombus-5",
+          chainID: "columbus-5",
         }
       } else if (chainID === "phoenix-1" || chainID === "pisco-1") {
         return {

From 9f4f91d8e506e1736c59bb64a577eef416519ed2 Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Mon, 12 Feb 2024 13:57:06 +0100
Subject: [PATCH 16/21] Implement sign arbitrary

---
 package-lock.json                   | 14 +++---
 package.json                        |  2 +-
 src/auth/hooks/useAuth.ts           | 69 +++++++++++++++++++++++++++++
 src/extension/modules/ConfirmTx.tsx |  6 ++-
 src/extension/utils.ts              |  1 +
 5 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 848c6800e..7692b83d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@terra-money/ledger-station-js": "^1.3.7",
         "@terra-money/log-finder-ruleset": "^3.0.3",
         "@terra-money/msg-reader": "^3.0.1",
-        "@terra-money/station-connector": "^1.0.17-beta.1",
+        "@terra-money/station-connector": "^1.0.17-beta.4",
         "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
         "@terra-money/terra-utils": "^1.2.0-beta.8",
         "@terra-money/terra.js": "^3.1.9",
@@ -7715,9 +7715,9 @@
       }
     },
     "node_modules/@terra-money/station-connector": {
-      "version": "1.0.17-beta.1",
-      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.1.tgz",
-      "integrity": "sha512-JPSBHZ8lJyrAO/tw120yhbypWgq92mtO+3appKsSeXhH8D1j1EPHcy8mplbnDW1B0SMfuSG/exjOiec8Wi5Tkg==",
+      "version": "1.0.17-beta.4",
+      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.4.tgz",
+      "integrity": "sha512-+81OtMHqs2Kn+6Zw6Q3SVDkgh6w9huNwxmmXq/fzvdNzUjLF3ZbBIKRolY9MLcJzQ1UyzdvdIwjMOiFgkruH3A==",
       "dependencies": {
         "bech32": "^2.0.0"
       },
@@ -39989,9 +39989,9 @@
       }
     },
     "@terra-money/station-connector": {
-      "version": "1.0.17-beta.1",
-      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.1.tgz",
-      "integrity": "sha512-JPSBHZ8lJyrAO/tw120yhbypWgq92mtO+3appKsSeXhH8D1j1EPHcy8mplbnDW1B0SMfuSG/exjOiec8Wi5Tkg==",
+      "version": "1.0.17-beta.4",
+      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.4.tgz",
+      "integrity": "sha512-+81OtMHqs2Kn+6Zw6Q3SVDkgh6w9huNwxmmXq/fzvdNzUjLF3ZbBIKRolY9MLcJzQ1UyzdvdIwjMOiFgkruH3A==",
       "requires": {
         "bech32": "^2.0.0"
       }
diff --git a/package.json b/package.json
index 5aa8c664d..bf6586a07 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@terra-money/ledger-station-js": "^1.3.7",
     "@terra-money/log-finder-ruleset": "^3.0.3",
     "@terra-money/msg-reader": "^3.0.1",
-    "@terra-money/station-connector": "^1.0.17-beta.1",
+    "@terra-money/station-connector": "^1.0.17-beta.4",
     "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
     "@terra-money/terra-utils": "^1.2.0-beta.8",
     "@terra-money/terra.js": "^3.1.9",
diff --git a/src/auth/hooks/useAuth.ts b/src/auth/hooks/useAuth.ts
index 73c2c6df0..4e1f738db 100644
--- a/src/auth/hooks/useAuth.ts
+++ b/src/auth/hooks/useAuth.ts
@@ -6,6 +6,7 @@ import {
   Tx,
   isTxError,
   SeedKey,
+  Key,
 } from "@terra-money/feather.js"
 import { AccAddress, SignDoc } from "@terra-money/feather.js"
 import { RawKey, SignatureV2 } from "@terra-money/feather.js"
@@ -343,6 +344,73 @@ const useAuth = () => {
     }
   }
 
+  const signArbitrary = async (
+    bytes: Buffer,
+    chainID: string | undefined,
+    password = ""
+  ) => {
+    if (!wallet) throw new Error("Wallet is not defined")
+    if (!chainID)
+      throw new Error("A chainID must be specified for ADR-036 signatures.")
+
+    const requestedCointype = allNetworks[chainID]?.coinType ?? 330
+    const requestedPrefix = allNetworks[chainID]?.prefix ?? "terra"
+
+    let key: Key
+
+    if (is.ledger(wallet)) {
+      key = await getLedgerKey(requestedCointype)
+    } else {
+      const pk = getKey(password)
+      if (!pk) throw new Error("Incorrect password")
+
+      if ("seed" in pk) {
+        key = new SeedKey({
+          seed: Buffer.from(pk.seed, "hex"),
+          coinType:
+            pk.legacy && parseInt(requestedCointype) === 330
+              ? 118
+              : parseInt(requestedCointype),
+          index: pk.index || 0,
+        })
+      } else {
+        if (!pk[requestedCointype]) throw new Error("Incorrect password")
+
+        key = new RawKey(Buffer.from(pk[requestedCointype] ?? "", "hex"))
+      }
+    }
+
+    return await key.signTx(
+      Tx.fromAmino({
+        type: "cosmos-sdk/StdTx",
+        value: {
+          msg: [
+            {
+              type: "sign/MsgSignData",
+              value: {
+                signer: key.accAddress(requestedPrefix),
+                data: bytes.toString("base64"),
+              },
+            },
+          ],
+          fee: {
+            amount: [],
+            gas: "0",
+          },
+          memo: "",
+          signatures: [],
+          timeout_height: "",
+        },
+      }),
+      {
+        accountNumber: 0,
+        sequence: 0,
+        chainID: "",
+        signMode: SignatureV2.SignMode.SIGN_MODE_LEGACY_AMINO_JSON,
+      }
+    )
+  }
+
   const post = async (
     txOptions: CreateTxOptions,
     password = "",
@@ -385,6 +453,7 @@ const useAuth = () => {
     createSignature,
     create,
     signBytes,
+    signArbitrary,
     sign,
     post,
     getPubkey,
diff --git a/src/extension/modules/ConfirmTx.tsx b/src/extension/modules/ConfirmTx.tsx
index 7bbae380d..0d180056d 100644
--- a/src/extension/modules/ConfirmTx.tsx
+++ b/src/extension/modules/ConfirmTx.tsx
@@ -194,11 +194,13 @@ const ConfirmTx = (props: TxRequest | SignBytesRequest) => {
       }
     } else {
       // arbitrary data
-      const { requestType, bytes, chainID } = props
+      const { requestType, bytes, chainID, adr036 } = props
 
       try {
         if (disabled) throw new Error(disabled)
-        const result = await auth.signBytes(bytes, chainID, password)
+        const result = adr036
+          ? await auth.signArbitrary(bytes, chainID, password)
+          : await auth.signBytes(bytes, chainID, password)
         const response = { result, success: true }
         actions.tx(requestType, props, response)
       } catch (error) {
diff --git a/src/extension/utils.ts b/src/extension/utils.ts
index 0f9218abf..1c4cc8b7d 100644
--- a/src/extension/utils.ts
+++ b/src/extension/utils.ts
@@ -98,6 +98,7 @@ export interface TxRequest extends DefaultRequest {
 export interface SignBytesRequest extends DefaultRequest {
   bytes: Buffer
   chainID?: string
+  adr036?: boolean
   requestType: "signBytes"
 }
 

From 24109924b8a9f293041661a2a3b81c97f973817e Mon Sep 17 00:00:00 2001
From: Alessandro Candeago <54709706+alecande11@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:54:01 +0100
Subject: [PATCH 17/21] update connector version

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7692b83d3..035eba614 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@terra-money/ledger-station-js": "^1.3.7",
         "@terra-money/log-finder-ruleset": "^3.0.3",
         "@terra-money/msg-reader": "^3.0.1",
-        "@terra-money/station-connector": "^1.0.17-beta.4",
+        "@terra-money/station-connector": "^1.0.17-beta.6",
         "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
         "@terra-money/terra-utils": "^1.2.0-beta.8",
         "@terra-money/terra.js": "^3.1.9",
@@ -7715,9 +7715,9 @@
       }
     },
     "node_modules/@terra-money/station-connector": {
-      "version": "1.0.17-beta.4",
-      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.4.tgz",
-      "integrity": "sha512-+81OtMHqs2Kn+6Zw6Q3SVDkgh6w9huNwxmmXq/fzvdNzUjLF3ZbBIKRolY9MLcJzQ1UyzdvdIwjMOiFgkruH3A==",
+      "version": "1.0.17-beta.6",
+      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.6.tgz",
+      "integrity": "sha512-EcfYjQBbdzr2C0zRVwRD80FcmuUgeeNQSqJntvG3qhvWbJrigXjrY/mo3NxAG3FoH/EO8kjeszYgWEY9ft8tOw==",
       "dependencies": {
         "bech32": "^2.0.0"
       },
@@ -39989,9 +39989,9 @@
       }
     },
     "@terra-money/station-connector": {
-      "version": "1.0.17-beta.4",
-      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.4.tgz",
-      "integrity": "sha512-+81OtMHqs2Kn+6Zw6Q3SVDkgh6w9huNwxmmXq/fzvdNzUjLF3ZbBIKRolY9MLcJzQ1UyzdvdIwjMOiFgkruH3A==",
+      "version": "1.0.17-beta.6",
+      "resolved": "https://registry.npmjs.org/@terra-money/station-connector/-/station-connector-1.0.17-beta.6.tgz",
+      "integrity": "sha512-EcfYjQBbdzr2C0zRVwRD80FcmuUgeeNQSqJntvG3qhvWbJrigXjrY/mo3NxAG3FoH/EO8kjeszYgWEY9ft8tOw==",
       "requires": {
         "bech32": "^2.0.0"
       }
diff --git a/package.json b/package.json
index bf6586a07..1d002b4fd 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@terra-money/ledger-station-js": "^1.3.7",
     "@terra-money/log-finder-ruleset": "^3.0.3",
     "@terra-money/msg-reader": "^3.0.1",
-    "@terra-money/station-connector": "^1.0.17-beta.4",
+    "@terra-money/station-connector": "^1.0.17-beta.6",
     "@terra-money/station-ui": "file:../station-ui/terra-money-station-ui-1.0.4.tgz",
     "@terra-money/terra-utils": "^1.2.0-beta.8",
     "@terra-money/terra.js": "^3.1.9",

From 3c9b50403d2f0ef83cc338daf413c076095b2bcb Mon Sep 17 00:00:00 2001
From: Manuel Alessandro Collazo <collazo.manuel6@gmail.com>
Date: Tue, 13 Feb 2024 13:13:54 -0300
Subject: [PATCH 18/21] feat: new activity query (#405)

* feat: new activity query

* style: loader design
---
 src/auth/hooks/useAuth.ts                   |  2 +-
 src/data/queries/activity.ts                | 20 ++---
 src/data/queries/activityAPI.ts             | 42 +++++++++
 src/pages/activity/ActivityDetailsPage.tsx  | 60 ++++++-------
 src/pages/activity/ActivityItem.tsx         | 26 +++---
 src/pages/activity/ActivityList.module.scss | 16 ++--
 src/pages/activity/ActivityList.tsx         | 94 ++++++++++++++-------
 src/txs/feeAbstraction/GasHelperStatus.tsx  |  2 +-
 src/txs/useIbcTxs.ts                        | 21 +++--
 src/types/history.d.ts                      | 24 +++---
 10 files changed, 194 insertions(+), 113 deletions(-)
 create mode 100644 src/data/queries/activityAPI.ts

diff --git a/src/auth/hooks/useAuth.ts b/src/auth/hooks/useAuth.ts
index 4e1f738db..c2d359551 100644
--- a/src/auth/hooks/useAuth.ts
+++ b/src/auth/hooks/useAuth.ts
@@ -25,7 +25,7 @@ import legacyEncrypt from "../scripts/encrypt"
 import { encrypt } from "../scripts/aes"
 import useAvailable from "./useAvailable"
 import { addressFromWords } from "utils/bech32"
-import { IInterchainNetworks, useAllNetworks, useNetwork } from "./useNetwork"
+import { useAllNetworks, useNetwork } from "./useNetwork"
 import { useLedgerKey } from "utils/ledger"
 import { useLogin } from "extension/modules/Login"
 
diff --git a/src/data/queries/activity.ts b/src/data/queries/activity.ts
index a89fc3ff6..dd0c510d5 100644
--- a/src/data/queries/activity.ts
+++ b/src/data/queries/activity.ts
@@ -29,8 +29,8 @@ export function useCachedTx() {
   const cache = useRecoilValue(cachedTxHistoryState)
 
   return cache.filter(
-    ({ walletName, chain }) =>
-      name === walletName && Object.keys(networks).includes(chain)
+    ({ walletName, chain_id }) =>
+      name === walletName && Object.keys(networks).includes(chain_id)
   )
 }
 
@@ -86,7 +86,7 @@ export const useTxActivity = () => {
       return {
         queryKey: [queryKey.History, networks?.[chainID]?.lcd, address],
         queryFn: async (): Promise<ActivityItem[]> => {
-          const result: AccountHistoryItem[] = []
+          const result: ActivityItem[] = []
           const hashArray: string[] = []
 
           if (!networks?.[chainID]?.lcd) {
@@ -116,16 +116,15 @@ export const useTxActivity = () => {
 
           for (const { data } of requests) {
             data.tx_responses.forEach((tx) => {
-              if (!hashArray.includes(tx.txhash)) {
+              if (!hashArray.includes(tx.tx_hash)) {
                 result.push(tx)
-                hashArray.push(tx.txhash)
+                hashArray.push(tx.tx_hash)
               }
             })
           }
 
           return (
             result
-              .sort((a, b) => Number(b.height) - Number(a.height))
               // .slice(0, LIMIT)
               .map((tx) => ({ ...tx, chain: chainID }))
           )
@@ -146,7 +145,7 @@ export const useTxActivity = () => {
   )
 
   const fixedHistoryCache = cachedTxs.filter(
-    ({ txhash }) => !fetchedHistory.find((tx) => tx.txhash === txhash)
+    ({ tx_hash }) => !fetchedHistory.find((tx) => tx.tx_hash === tx_hash)
   )
 
   const result = [...fetchedHistory, ...fixedHistoryCache].sort(
@@ -155,7 +154,7 @@ export const useTxActivity = () => {
 
   result.forEach((tx, i) => {
     if (
-      discarededTxsHashes.includes(tx.txhash) ||
+      discarededTxsHashes.includes(tx.tx_hash) ||
       !!tx.logs.find((log) =>
         log.events.find((e) => e.type === "timeout_packet")
       )
@@ -182,10 +181,11 @@ export const useTxActivity = () => {
                 senderDetails.next_hop_memo.src_channel &&
               Math.round(receiverDetails.timeout_timestamp) ===
                 Math.round(senderDetails.next_hop_memo.timeout_timestamp) &&
-              senderDetails.next_hop_memo.receiver === addresses?.[tx2.chain])
+              senderDetails.next_hop_memo.receiver ===
+                addresses?.[tx2.chain_id])
           )
         })
-        .forEach((tx) => discarededTxsHashes.push(tx.txhash))
+        .forEach((tx) => discarededTxsHashes.push(tx.tx_hash))
 
     activitySorted.push(tx)
   })
diff --git a/src/data/queries/activityAPI.ts b/src/data/queries/activityAPI.ts
new file mode 100644
index 000000000..c3e0f7590
--- /dev/null
+++ b/src/data/queries/activityAPI.ts
@@ -0,0 +1,42 @@
+import { useQuery } from "react-query"
+
+const url =
+  "https://te82h0srb4.execute-api.us-east-1.amazonaws.com/v1/txs/transactions"
+
+export interface PaginationItem {
+  words_address: string
+  current_offset: number
+  total_documents: number
+}
+
+interface ResponseData {
+  response: ActivityItem[]
+  pagination: PaginationItem[]
+}
+
+interface RequestBody {
+  addresses: string[]
+  pagination?: PaginationItem[]
+}
+
+const fetchData = async (requestBody: RequestBody) => {
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      accept: "application/json",
+    },
+    body: JSON.stringify(requestBody),
+  })
+
+  if (!response.ok) {
+    throw new Error("Failed to fetch data")
+  }
+
+  return response.json()
+}
+
+export const useTxActivity = (requestBody: RequestBody) => {
+  const queryKey = ["txActivity", JSON.stringify(requestBody)]
+  return useQuery<ResponseData>(queryKey, () => fetchData(requestBody))
+}
diff --git a/src/pages/activity/ActivityDetailsPage.tsx b/src/pages/activity/ActivityDetailsPage.tsx
index ee83baf8d..cc3fdc259 100644
--- a/src/pages/activity/ActivityDetailsPage.tsx
+++ b/src/pages/activity/ActivityDetailsPage.tsx
@@ -6,18 +6,6 @@ import {
   Timeline,
   ExternalLinkIcon,
 } from "@terra-money/station-ui"
-import styles from "./ActivityDetailsPage.module.scss"
-import { ExternalLink } from "components/general"
-import { ReadMultiple } from "components/token"
-import { useTranslation } from "react-i18next"
-import { useNetwork } from "data/wallet"
-import { toNow } from "utils/date"
-import moment from "moment"
-import { ReactElement } from "react"
-import { useAllInterchainAddresses } from "auth/hooks/useAddress"
-import { getCanonicalMsg } from "@terra-money/terra-utils"
-import { last } from "ramda"
-import ActivityMessage from "./ActivityMessage"
 import {
   IbcTxDetails,
   getIbcTxDetails,
@@ -26,10 +14,22 @@ import {
   useIbcPrevHop,
   useIbcTimeout,
 } from "txs/useIbcTxs"
+import { useAllInterchainAddresses } from "auth/hooks/useAddress"
+import { getCanonicalMsg } from "@terra-money/terra-utils"
+import styles from "./ActivityDetailsPage.module.scss"
+import { ExternalLink } from "components/general"
+import { ReadMultiple } from "components/token"
+import ActivityMessage from "./ActivityMessage"
+import { useTranslation } from "react-i18next"
+import { useNetwork } from "data/wallet"
+import { ReactElement } from "react"
+import { toNow } from "utils/date"
+import { last } from "ramda"
+import moment from "moment"
 
 interface Props {
   variant: "success" | "failed" | "loading"
-  chain: string
+  chain_id: string
   msg: ReactElement
   type: string
   time: any
@@ -51,7 +51,9 @@ export const useParseMessages = () => {
       if (index === 0 && msg?.msgType) {
         msgType = last(msg?.msgType.split("/")) ?? ""
       }
-      return msg && <ActivityMessage chainID={tx.chain} msg={msg} key={index} />
+      return (
+        msg && <ActivityMessage chainID={tx.chain_id} msg={msg} key={index} />
+      )
     })
 
     const activityType = msgType.charAt(0).toUpperCase() + msgType.substring(1)
@@ -80,8 +82,8 @@ const PrevHopActivity = (ibcDetails: IbcTxDetails) => {
       />
     )
 
-  const explorer = network[tx.chain]?.explorer
-  const externalLink = explorer?.tx?.replace("{}", tx.txhash)
+  const explorer = network[tx.chain_id]?.explorer
+  const externalLink = explorer?.tx?.replace("{}", tx.tx_hash)
 
   const { activityMessages, activityType } = parseMsgs(tx)
 
@@ -107,8 +109,8 @@ const PrevHopActivity = (ibcDetails: IbcTxDetails) => {
           <ActivityListItem
             variant={tx.code === 0 ? "success" : "failed"}
             chain={{
-              icon: network[tx.chain].icon,
-              label: network[tx.chain].name,
+              icon: network[tx.chain_id]?.icon,
+              label: network[tx.chain_id]?.name,
             }}
             msg={activityMessages[0]}
             type={t(activityType)}
@@ -153,8 +155,8 @@ const NextHopActivity = (ibcDetails: IbcTxDetails) => {
       />
     )
 
-  const explorer = network[tx.chain]?.explorer
-  const externalLink = explorer?.tx?.replace("{}", tx.txhash)
+  const explorer = network[tx.chain_id]?.explorer
+  const externalLink = explorer?.tx?.replace("{}", tx.tx_hash)
 
   const { activityMessages, activityType } = parseMsgs(tx)
 
@@ -178,8 +180,8 @@ const NextHopActivity = (ibcDetails: IbcTxDetails) => {
           <ActivityListItem
             variant={tx.code !== 0 || !!timeoutTx ? "failed" : "success"}
             chain={{
-              icon: network[tx.chain].icon,
-              label: network[tx.chain].name,
+              icon: network[tx.chain_id]?.icon,
+              label: network[tx.chain_id]?.name,
             }}
             msg={activityMessages[0]}
             type={t(activityType)}
@@ -206,7 +208,7 @@ const NextHopActivity = (ibcDetails: IbcTxDetails) => {
 
 const ActivityDetailsPage = ({
   variant,
-  chain,
+  chain_id,
   msg,
   type,
   time,
@@ -218,10 +220,10 @@ const ActivityDetailsPage = ({
   const { t } = useTranslation()
 
   const networks = useNetwork()
-  const explorer = networks[chain ?? ""]?.explorer
+  const explorer = networks[chain_id ?? ""]?.explorer
   const externalLink = explorer?.tx?.replace("{}", txHash)
-  const ibcDetails = getIbcTxDetails({ logs, chain })
-  const prevIbcDetails = getRecvIbcTxDetails({ logs, chain })
+  const ibcDetails = getIbcTxDetails({ logs, chain_id })
+  const prevIbcDetails = getRecvIbcTxDetails({ logs, chain_id })
 
   const timelineDisplayMessages = timelineMessages.map(
     (message: ReactElement) => {
@@ -239,7 +241,7 @@ const ActivityDetailsPage = ({
       label: "Timestamp (UTC)",
       value: moment(time).utc().format("DD/MM/YY, H:mm:ss"),
     },
-    { label: "Chain", value: `${networks[chain]?.name} (${chain})` },
+    { label: "Chain", value: `${networks[chain_id]?.name} (${chain_id})` },
     { label: "Fee", value: <ReadMultiple list={fee} /> },
   ]
 
@@ -252,8 +254,8 @@ const ActivityDetailsPage = ({
             <ActivityListItem
               variant={variant}
               chain={{
-                icon: networks[chain]?.icon,
-                label: networks[chain]?.name,
+                icon: networks[chain_id]?.icon,
+                label: networks[chain_id]?.name,
               }}
               msg={msg}
               type={type}
diff --git a/src/pages/activity/ActivityItem.tsx b/src/pages/activity/ActivityItem.tsx
index fc838118f..8ea30194f 100644
--- a/src/pages/activity/ActivityItem.tsx
+++ b/src/pages/activity/ActivityItem.tsx
@@ -4,20 +4,20 @@ import {
   StepStatus,
   TransactionTracker,
 } from "@terra-money/station-ui"
+import { getIbcTxDetails, useIbcTxStatus, usePendingIbcTx } from "txs/useIbcTxs"
 import ActivityDetailsPage, { useParseMessages } from "./ActivityDetailsPage"
+import useInterval from "utils/hooks/useInterval"
 import styles from "./ActivityItem.module.scss"
 import { useTranslation } from "react-i18next"
+import { intervalToDuration } from "date-fns"
 import { useNetwork } from "data/wallet"
 import { toNow } from "utils/date"
 import { useState } from "react"
-import useInterval from "utils/hooks/useInterval"
-import { intervalToDuration } from "date-fns"
-import { getIbcTxDetails, useIbcTxStatus, usePendingIbcTx } from "txs/useIbcTxs"
 
 const ActivityItem = ({
-  txhash,
+  tx_hash,
   timestamp,
-  chain,
+  chain_id,
   dateHeader,
   ...props
 }: ActivityItem & {
@@ -26,13 +26,13 @@ const ActivityItem = ({
   const { code, tx } = props
   const success = code === 0
   const ibcDetails = getIbcTxDetails({
-    chain,
+    chain_id,
     ...props,
   })
 
   const { showStatusTxHashes } = usePendingIbcTx()
   const isIbc = !!ibcDetails
-  const showStatusBar = isIbc && showStatusTxHashes.includes(txhash)
+  const showStatusBar = isIbc && showStatusTxHashes.includes(tx_hash)
   const ibcStatus = useIbcTxStatus(ibcDetails ? [ibcDetails] : [])[0]?.data
 
   const activityVariant = isIbc
@@ -49,9 +49,9 @@ const ActivityItem = ({
   const parseMsgs = useParseMessages()
 
   const { activityMessages, activityType } = parseMsgs({
-    txhash,
+    tx_hash,
     timestamp,
-    chain,
+    chain_id,
     ...props,
   })
 
@@ -96,8 +96,8 @@ const ActivityItem = ({
               onClick={open}
               variant={activityVariant}
               chain={{
-                icon: network[chain].icon,
-                label: network[chain].name,
+                icon: network[chain_id]?.icon,
+                label: network[chain_id]?.name,
               }}
               msg={activityMessages[0]}
               type={t(activityType)}
@@ -120,12 +120,12 @@ const ActivityItem = ({
       >
         <ActivityDetailsPage
           variant={activityVariant}
-          chain={chain}
+          chain_id={chain_id}
           msg={activityMessages[0]}
           type={activityType}
           time={timestamp}
           timelineMessages={activityMessages.slice(1)}
-          txHash={txhash}
+          txHash={tx_hash}
           fee={tx?.auth_info?.fee?.amount ?? []}
           logs={props.logs}
         />
diff --git a/src/pages/activity/ActivityList.module.scss b/src/pages/activity/ActivityList.module.scss
index a5fb22b39..d9c3a915b 100644
--- a/src/pages/activity/ActivityList.module.scss
+++ b/src/pages/activity/ActivityList.module.scss
@@ -1,3 +1,4 @@
+@import "font_mixins";
 @import "mixins";
 
 .activitylist {
@@ -7,15 +8,20 @@
 }
 
 .loader {
-  color: #065bed;
+  color: var(--token-dark-900);
+  padding-top: 40px;
   display: flex;
   justify-content: center;
-  padding-top: 100px;
 }
 
-.loadingtext {
-  color: white;
-  padding-top: 8px;
+.empty {
+  @include X-Small;
+  color: var(--token-dark-900);
+  padding-top: 40px;
   display: flex;
   justify-content: center;
 }
+
+.footer > * {
+  margin-top: 16px;
+}
diff --git a/src/pages/activity/ActivityList.tsx b/src/pages/activity/ActivityList.tsx
index 5301f6a5a..31c0f8fbd 100644
--- a/src/pages/activity/ActivityList.tsx
+++ b/src/pages/activity/ActivityList.tsx
@@ -1,14 +1,17 @@
-import { useState } from "react"
 import {
+  Banner,
   LoadingCircular,
   SectionHeader,
   SubmitButton,
 } from "@terra-money/station-ui"
-import { useTxActivity } from "data/queries/activity"
+import { PaginationItem, useTxActivity } from "data/queries/activityAPI"
+import { getWallet } from "auth/scripts/keystore"
 import styles from "./ActivityList.module.scss"
+import { useEffect, useState } from "react"
 import ActivityItem from "./ActivityItem"
 import { Page } from "components/layout"
 import moment from "moment"
+
 //import useIbcTxs, { IbcTxState } from "txs/useIbcTxs"
 //import { useTranslation } from "react-i18next"
 /*
@@ -45,24 +48,41 @@ const IbcActivityItem = ({
 */
 const ActivityList = () => {
   //const { ibcTxs } = useIbcTxs()
-  const { activitySorted: activity, state } = useTxActivity()
 
-  const activityItemsPerPage = 20
-  const [visibleActivity, setVisibleActivity] = useState(activityItemsPerPage)
+  const wallet = getWallet()
+  const addresses: string[] = Object.values(wallet.words)
+
+  const [pagination, setPagination] = useState<PaginationItem[] | undefined>(
+    undefined
+  )
+  const { data, isLoading, isError } = useTxActivity({
+    addresses: addresses,
+    pagination: pagination,
+  })
+
+  const [visibleActivity, setVisibleActivity] = useState(data?.response)
 
-  const handleClick = async () => {
-    await setVisibleActivity((prevVisibleActivity) => prevVisibleActivity + 20)
+  useEffect(() => {
+    setVisibleActivity((prevVisibleActivity) => [
+      ...(prevVisibleActivity || []),
+      ...(data?.response || []),
+    ])
+  }, [data])
+
+  const handleLoadMore = () => {
+    if (data?.pagination) {
+      setPagination(data.pagination)
+    }
   }
 
   let priorDisplayDate = ""
-  const visibleActivityItems = activity
+  const visibleActivityItems =
     // do not show pending txs in the main activity page
     /*.filter(
       ({ txhash }) =>
         !ibcTxs.find(({ txhash: ibcTxhash }) => ibcTxhash === txhash)
     )*/
-    .slice(0, visibleActivity)
-    .map((activityItem: AccountHistoryItem & { chain: string }) => {
+    visibleActivity?.map((activityItem: ActivityItem) => {
       const activityItemDate = new Date(activityItem.timestamp)
       const displayDate = getDisplayDate(activityItemDate)
       let header = null
@@ -72,57 +92,69 @@ const ActivityList = () => {
       }
       return (
         <ActivityItem
-          key={activityItem.txhash}
+          key={`${activityItem.tx_hash}-${activityItem.code}`}
           {...activityItem}
           dateHeader={header}
         />
       )
     })
 
-  const allActivityDisplayed = visibleActivityItems.length === activity.length
-  const loadMoreButton = !allActivityDisplayed ? (
-    <SubmitButton
-      onClick={handleClick}
-      variant={"secondary"}
-      label={"Load More"}
-    />
-  ) : null
-
   let loader: JSX.Element | null
-  if (!activity?.length && state.isLoading) {
+  if (!visibleActivity?.length && isLoading) {
     loader = (
       <div className={styles.loader}>
         <LoadingCircular size={40} />
       </div>
     )
-  } else if (activity?.length && state.isLoading) {
+  } else if (!visibleActivity?.length && !isLoading && !isError) {
     loader = (
-      <span className={styles.loadingtext}>
-        Gathering activity across all chains...
+      <span className={styles.empty}>
+        This wallet has no activity to display
       </span>
     )
-  } else if (!activity?.length && !state.isLoading) {
-    loader = (
-      <span className={styles.loadingtext}>This wallet has no activity</span>
-    )
   } else {
     loader = null
   }
 
+  const loadMoreButton = visibleActivity?.length ? (
+    <SubmitButton
+      onClick={handleLoadMore}
+      variant={"secondary"}
+      loading={isLoading}
+      label={"Load More"}
+    />
+  ) : null
+
+  const errorBanner = isError ? (
+    <Banner
+      variant="warning"
+      title={
+        "There seems to be a problem with our servers. Please try again later."
+      }
+    />
+  ) : null
+
+  const footer = (
+    <div className={styles.footer}>
+      {errorBanner}
+      {loadMoreButton}
+    </div>
+  )
+
   const render = () => {
-    if (!activity) return null
+    if (!visibleActivity) return null
 
     return (
       <div className={styles.activitylist}>
         {loader}
         {visibleActivityItems}
-        {loadMoreButton}
+        {footer}
       </div>
     )
   }
 
   return (
-    <Page {...state} invisible>
+    <Page {...[isLoading, isError]} invisible>
       {render()}
     </Page>
   )
diff --git a/src/txs/feeAbstraction/GasHelperStatus.tsx b/src/txs/feeAbstraction/GasHelperStatus.tsx
index 60f256c6c..a33b828f9 100644
--- a/src/txs/feeAbstraction/GasHelperStatus.tsx
+++ b/src/txs/feeAbstraction/GasHelperStatus.tsx
@@ -35,7 +35,7 @@ const GasHelperStatus = ({
   const ibcDetails =
     tx?.logs &&
     getIbcTxDetails({
-      chain: chainID,
+      chain_id: chainID,
       logs: tx.logs,
     })
 
diff --git a/src/txs/useIbcTxs.ts b/src/txs/useIbcTxs.ts
index 208a1541c..c8c18bdf2 100644
--- a/src/txs/useIbcTxs.ts
+++ b/src/txs/useIbcTxs.ts
@@ -1,10 +1,9 @@
-import { useAuth } from "auth"
-import axios from "axios"
-import { RefetchOptions, queryKey } from "data/query"
-import { useNetwork } from "data/wallet"
 import { useQueries, useQuery, useQueryClient } from "react-query"
+import { RefetchOptions, queryKey } from "data/query"
 import { atom, useRecoilState } from "recoil"
-
+import { useNetwork } from "data/wallet"
+import { useAuth } from "auth"
+import axios from "axios"
 const LOCALSTORAGE_IBC_TXS_KEY = "pendingIbcTxs"
 
 type WalletName = string
@@ -83,7 +82,7 @@ export const usePendingIbcTx = () => {
       if (ibcDetails) {
         setIbcTxs((txs) => [
           ...txs,
-          { ...ibcDetails, txhash: tx.txhash, state: IbcTxStatus.LOADING },
+          { ...ibcDetails, txhash: tx.tx_hash, state: IbcTxStatus.LOADING },
         ])
       }
     },
@@ -445,7 +444,7 @@ function parsePacketData(pktData: string): NextHopMemo | undefined {
 
 export const getIbcTxDetails = (tx: {
   logs: ActivityItem["logs"]
-  chain: string
+  chain_id: string
 }): IbcTxDetails | undefined => {
   for (const log of tx.logs) {
     const ibcEvent = log.events.find((e) => e.type === "send_packet")
@@ -453,7 +452,7 @@ export const getIbcTxDetails = (tx: {
     if (ibcEvent) {
       try {
         return {
-          src_chain_id: tx.chain,
+          src_chain_id: tx.chain_id,
           sequence: ibcEvent.attributes.find(
             ({ key }) => key === "packet_sequence"
           )!.value,
@@ -489,7 +488,7 @@ export const getIbcTxDetails = (tx: {
 
 export const getRecvIbcTxDetails = (tx: {
   logs: ActivityItem["logs"]
-  chain: string
+  chain_id: string
 }): (IbcTxDetails & { next_hop?: IbcTxDetails }) | undefined => {
   for (const log of tx.logs) {
     const ibcEvent = log.events.find((e) => e.type === "recv_packet")
@@ -497,7 +496,7 @@ export const getRecvIbcTxDetails = (tx: {
     if (ibcEvent) {
       try {
         return {
-          src_chain_id: tx.chain,
+          src_chain_id: tx.chain_id,
           sequence: ibcEvent.attributes.find(
             ({ key }) => key === "packet_sequence"
           )!.value,
@@ -519,7 +518,7 @@ export const getRecvIbcTxDetails = (tx: {
                 ({ key }) => key === "packet_timeout_timestamp"
               )!.value
             ) / 1_000_000,
-          next_hop: getIbcTxDetails({ logs: [log], chain: tx.chain }),
+          next_hop: getIbcTxDetails({ logs: [log], chain_id: tx.chain_id }),
         }
       } catch (e) {}
     }
diff --git a/src/types/history.d.ts b/src/types/history.d.ts
index 074478ea2..a3f4c8f53 100644
--- a/src/types/history.d.ts
+++ b/src/types/history.d.ts
@@ -3,7 +3,7 @@ interface AccountHistory {
     total: string
     next_key: string | null
   }
-  tx_responses: AccountHistoryItem[]
+  tx_responses: ActivityItem[]
 }
 
 interface PubKey {
@@ -46,12 +46,16 @@ interface MultiSignerInfo {
   sequence: string
 }
 
-interface AccountHistoryItem {
-  txhash: string
-  timestamp: any
+interface ActivityItem {
+  addresses: string[]
+  chain_id: string
+  children: ActivityItem[]
   code: number
-  height: string
-  // collapsed?: number // WHAT IS THIS?
+  coinType: 60 | 118 | 330
+  events: any[]
+  logs: TxLog[]
+  raw_log: string
+  timestamp: any
   tx: {
     body: {
       messages: any[]
@@ -64,8 +68,8 @@ interface AccountHistoryItem {
       signer_infos: SignerInfo[] | MultiSignerInfo[]
     }
   }
-  raw_log?: string
-  logs: TxLog[]
+  tx_hash: string
+  words_from_key: string
 }
 
 interface TxLog {
@@ -82,10 +86,6 @@ interface TxLogEvent {
   }[]
 }
 
-type ActivityItem = AccountHistoryItem & {
-  chain: string
-}
-
 interface TxMessage {
   msgType: string
   canonicalMsg: string[]

From aa1803c8156bc464bda1646ef2781f6ef4f636d5 Mon Sep 17 00:00:00 2001
From: Manuel Alessandro Collazo <collazo.manuel6@gmail.com>
Date: Wed, 14 Feb 2024 12:19:13 -0300
Subject: [PATCH 19/21] Revert "feat: new activity query (#405)"

This reverts commit c65cde03b36edf56830a4f59331ce9b757c278f4.
---
 src/auth/hooks/useAuth.ts                   |  2 +-
 src/data/queries/activity.ts                | 20 ++---
 src/data/queries/activityAPI.ts             | 42 ---------
 src/pages/activity/ActivityDetailsPage.tsx  | 60 +++++++------
 src/pages/activity/ActivityItem.tsx         | 26 +++---
 src/pages/activity/ActivityList.module.scss | 16 ++--
 src/pages/activity/ActivityList.tsx         | 94 +++++++--------------
 src/txs/feeAbstraction/GasHelperStatus.tsx  |  2 +-
 src/txs/useIbcTxs.ts                        | 21 ++---
 src/types/history.d.ts                      | 24 +++---
 10 files changed, 113 insertions(+), 194 deletions(-)
 delete mode 100644 src/data/queries/activityAPI.ts

diff --git a/src/auth/hooks/useAuth.ts b/src/auth/hooks/useAuth.ts
index c2d359551..4e1f738db 100644
--- a/src/auth/hooks/useAuth.ts
+++ b/src/auth/hooks/useAuth.ts
@@ -25,7 +25,7 @@ import legacyEncrypt from "../scripts/encrypt"
 import { encrypt } from "../scripts/aes"
 import useAvailable from "./useAvailable"
 import { addressFromWords } from "utils/bech32"
-import { useAllNetworks, useNetwork } from "./useNetwork"
+import { IInterchainNetworks, useAllNetworks, useNetwork } from "./useNetwork"
 import { useLedgerKey } from "utils/ledger"
 import { useLogin } from "extension/modules/Login"
 
diff --git a/src/data/queries/activity.ts b/src/data/queries/activity.ts
index dd0c510d5..a89fc3ff6 100644
--- a/src/data/queries/activity.ts
+++ b/src/data/queries/activity.ts
@@ -29,8 +29,8 @@ export function useCachedTx() {
   const cache = useRecoilValue(cachedTxHistoryState)
 
   return cache.filter(
-    ({ walletName, chain_id }) =>
-      name === walletName && Object.keys(networks).includes(chain_id)
+    ({ walletName, chain }) =>
+      name === walletName && Object.keys(networks).includes(chain)
   )
 }
 
@@ -86,7 +86,7 @@ export const useTxActivity = () => {
       return {
         queryKey: [queryKey.History, networks?.[chainID]?.lcd, address],
         queryFn: async (): Promise<ActivityItem[]> => {
-          const result: ActivityItem[] = []
+          const result: AccountHistoryItem[] = []
           const hashArray: string[] = []
 
           if (!networks?.[chainID]?.lcd) {
@@ -116,15 +116,16 @@ export const useTxActivity = () => {
 
           for (const { data } of requests) {
             data.tx_responses.forEach((tx) => {
-              if (!hashArray.includes(tx.tx_hash)) {
+              if (!hashArray.includes(tx.txhash)) {
                 result.push(tx)
-                hashArray.push(tx.tx_hash)
+                hashArray.push(tx.txhash)
               }
             })
           }
 
           return (
             result
+              .sort((a, b) => Number(b.height) - Number(a.height))
               // .slice(0, LIMIT)
               .map((tx) => ({ ...tx, chain: chainID }))
           )
@@ -145,7 +146,7 @@ export const useTxActivity = () => {
   )
 
   const fixedHistoryCache = cachedTxs.filter(
-    ({ tx_hash }) => !fetchedHistory.find((tx) => tx.tx_hash === tx_hash)
+    ({ txhash }) => !fetchedHistory.find((tx) => tx.txhash === txhash)
   )
 
   const result = [...fetchedHistory, ...fixedHistoryCache].sort(
@@ -154,7 +155,7 @@ export const useTxActivity = () => {
 
   result.forEach((tx, i) => {
     if (
-      discarededTxsHashes.includes(tx.tx_hash) ||
+      discarededTxsHashes.includes(tx.txhash) ||
       !!tx.logs.find((log) =>
         log.events.find((e) => e.type === "timeout_packet")
       )
@@ -181,11 +182,10 @@ export const useTxActivity = () => {
                 senderDetails.next_hop_memo.src_channel &&
               Math.round(receiverDetails.timeout_timestamp) ===
                 Math.round(senderDetails.next_hop_memo.timeout_timestamp) &&
-              senderDetails.next_hop_memo.receiver ===
-                addresses?.[tx2.chain_id])
+              senderDetails.next_hop_memo.receiver === addresses?.[tx2.chain])
           )
         })
-        .forEach((tx) => discarededTxsHashes.push(tx.tx_hash))
+        .forEach((tx) => discarededTxsHashes.push(tx.txhash))
 
     activitySorted.push(tx)
   })
diff --git a/src/data/queries/activityAPI.ts b/src/data/queries/activityAPI.ts
deleted file mode 100644
index c3e0f7590..000000000
--- a/src/data/queries/activityAPI.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useQuery } from "react-query"
-
-const url =
-  "https://te82h0srb4.execute-api.us-east-1.amazonaws.com/v1/txs/transactions"
-
-export interface PaginationItem {
-  words_address: string
-  current_offset: number
-  total_documents: number
-}
-
-interface ResponseData {
-  response: ActivityItem[]
-  pagination: PaginationItem[]
-}
-
-interface RequestBody {
-  addresses: string[]
-  pagination?: PaginationItem[]
-}
-
-const fetchData = async (requestBody: RequestBody) => {
-  const response = await fetch(url, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      accept: "application/json",
-    },
-    body: JSON.stringify(requestBody),
-  })
-
-  if (!response.ok) {
-    throw new Error("Failed to fetch data")
-  }
-
-  return response.json()
-}
-
-export const useTxActivity = (requestBody: RequestBody) => {
-  const queryKey = ["txActivity", JSON.stringify(requestBody)]
-  return useQuery<ResponseData>(queryKey, () => fetchData(requestBody))
-}
diff --git a/src/pages/activity/ActivityDetailsPage.tsx b/src/pages/activity/ActivityDetailsPage.tsx
index cc3fdc259..ee83baf8d 100644
--- a/src/pages/activity/ActivityDetailsPage.tsx
+++ b/src/pages/activity/ActivityDetailsPage.tsx
@@ -6,6 +6,18 @@ import {
   Timeline,
   ExternalLinkIcon,
 } from "@terra-money/station-ui"
+import styles from "./ActivityDetailsPage.module.scss"
+import { ExternalLink } from "components/general"
+import { ReadMultiple } from "components/token"
+import { useTranslation } from "react-i18next"
+import { useNetwork } from "data/wallet"
+import { toNow } from "utils/date"
+import moment from "moment"
+import { ReactElement } from "react"
+import { useAllInterchainAddresses } from "auth/hooks/useAddress"
+import { getCanonicalMsg } from "@terra-money/terra-utils"
+import { last } from "ramda"
+import ActivityMessage from "./ActivityMessage"
 import {
   IbcTxDetails,
   getIbcTxDetails,
@@ -14,22 +26,10 @@ import {
   useIbcPrevHop,
   useIbcTimeout,
 } from "txs/useIbcTxs"
-import { useAllInterchainAddresses } from "auth/hooks/useAddress"
-import { getCanonicalMsg } from "@terra-money/terra-utils"
-import styles from "./ActivityDetailsPage.module.scss"
-import { ExternalLink } from "components/general"
-import { ReadMultiple } from "components/token"
-import ActivityMessage from "./ActivityMessage"
-import { useTranslation } from "react-i18next"
-import { useNetwork } from "data/wallet"
-import { ReactElement } from "react"
-import { toNow } from "utils/date"
-import { last } from "ramda"
-import moment from "moment"
 
 interface Props {
   variant: "success" | "failed" | "loading"
-  chain_id: string
+  chain: string
   msg: ReactElement
   type: string
   time: any
@@ -51,9 +51,7 @@ export const useParseMessages = () => {
       if (index === 0 && msg?.msgType) {
         msgType = last(msg?.msgType.split("/")) ?? ""
       }
-      return (
-        msg && <ActivityMessage chainID={tx.chain_id} msg={msg} key={index} />
-      )
+      return msg && <ActivityMessage chainID={tx.chain} msg={msg} key={index} />
     })
 
     const activityType = msgType.charAt(0).toUpperCase() + msgType.substring(1)
@@ -82,8 +80,8 @@ const PrevHopActivity = (ibcDetails: IbcTxDetails) => {
       />
     )
 
-  const explorer = network[tx.chain_id]?.explorer
-  const externalLink = explorer?.tx?.replace("{}", tx.tx_hash)
+  const explorer = network[tx.chain]?.explorer
+  const externalLink = explorer?.tx?.replace("{}", tx.txhash)
 
   const { activityMessages, activityType } = parseMsgs(tx)
 
@@ -109,8 +107,8 @@ const PrevHopActivity = (ibcDetails: IbcTxDetails) => {
           <ActivityListItem
             variant={tx.code === 0 ? "success" : "failed"}
             chain={{
-              icon: network[tx.chain_id]?.icon,
-              label: network[tx.chain_id]?.name,
+              icon: network[tx.chain].icon,
+              label: network[tx.chain].name,
             }}
             msg={activityMessages[0]}
             type={t(activityType)}
@@ -155,8 +153,8 @@ const NextHopActivity = (ibcDetails: IbcTxDetails) => {
       />
     )
 
-  const explorer = network[tx.chain_id]?.explorer
-  const externalLink = explorer?.tx?.replace("{}", tx.tx_hash)
+  const explorer = network[tx.chain]?.explorer
+  const externalLink = explorer?.tx?.replace("{}", tx.txhash)
 
   const { activityMessages, activityType } = parseMsgs(tx)
 
@@ -180,8 +178,8 @@ const NextHopActivity = (ibcDetails: IbcTxDetails) => {
           <ActivityListItem
             variant={tx.code !== 0 || !!timeoutTx ? "failed" : "success"}
             chain={{
-              icon: network[tx.chain_id]?.icon,
-              label: network[tx.chain_id]?.name,
+              icon: network[tx.chain].icon,
+              label: network[tx.chain].name,
             }}
             msg={activityMessages[0]}
             type={t(activityType)}
@@ -208,7 +206,7 @@ const NextHopActivity = (ibcDetails: IbcTxDetails) => {
 
 const ActivityDetailsPage = ({
   variant,
-  chain_id,
+  chain,
   msg,
   type,
   time,
@@ -220,10 +218,10 @@ const ActivityDetailsPage = ({
   const { t } = useTranslation()
 
   const networks = useNetwork()
-  const explorer = networks[chain_id ?? ""]?.explorer
+  const explorer = networks[chain ?? ""]?.explorer
   const externalLink = explorer?.tx?.replace("{}", txHash)
-  const ibcDetails = getIbcTxDetails({ logs, chain_id })
-  const prevIbcDetails = getRecvIbcTxDetails({ logs, chain_id })
+  const ibcDetails = getIbcTxDetails({ logs, chain })
+  const prevIbcDetails = getRecvIbcTxDetails({ logs, chain })
 
   const timelineDisplayMessages = timelineMessages.map(
     (message: ReactElement) => {
@@ -241,7 +239,7 @@ const ActivityDetailsPage = ({
       label: "Timestamp (UTC)",
       value: moment(time).utc().format("DD/MM/YY, H:mm:ss"),
     },
-    { label: "Chain", value: `${networks[chain_id]?.name} (${chain_id})` },
+    { label: "Chain", value: `${networks[chain]?.name} (${chain})` },
     { label: "Fee", value: <ReadMultiple list={fee} /> },
   ]
 
@@ -254,8 +252,8 @@ const ActivityDetailsPage = ({
             <ActivityListItem
               variant={variant}
               chain={{
-                icon: networks[chain_id]?.icon,
-                label: networks[chain_id]?.name,
+                icon: networks[chain]?.icon,
+                label: networks[chain]?.name,
               }}
               msg={msg}
               type={type}
diff --git a/src/pages/activity/ActivityItem.tsx b/src/pages/activity/ActivityItem.tsx
index 8ea30194f..fc838118f 100644
--- a/src/pages/activity/ActivityItem.tsx
+++ b/src/pages/activity/ActivityItem.tsx
@@ -4,20 +4,20 @@ import {
   StepStatus,
   TransactionTracker,
 } from "@terra-money/station-ui"
-import { getIbcTxDetails, useIbcTxStatus, usePendingIbcTx } from "txs/useIbcTxs"
 import ActivityDetailsPage, { useParseMessages } from "./ActivityDetailsPage"
-import useInterval from "utils/hooks/useInterval"
 import styles from "./ActivityItem.module.scss"
 import { useTranslation } from "react-i18next"
-import { intervalToDuration } from "date-fns"
 import { useNetwork } from "data/wallet"
 import { toNow } from "utils/date"
 import { useState } from "react"
+import useInterval from "utils/hooks/useInterval"
+import { intervalToDuration } from "date-fns"
+import { getIbcTxDetails, useIbcTxStatus, usePendingIbcTx } from "txs/useIbcTxs"
 
 const ActivityItem = ({
-  tx_hash,
+  txhash,
   timestamp,
-  chain_id,
+  chain,
   dateHeader,
   ...props
 }: ActivityItem & {
@@ -26,13 +26,13 @@ const ActivityItem = ({
   const { code, tx } = props
   const success = code === 0
   const ibcDetails = getIbcTxDetails({
-    chain_id,
+    chain,
     ...props,
   })
 
   const { showStatusTxHashes } = usePendingIbcTx()
   const isIbc = !!ibcDetails
-  const showStatusBar = isIbc && showStatusTxHashes.includes(tx_hash)
+  const showStatusBar = isIbc && showStatusTxHashes.includes(txhash)
   const ibcStatus = useIbcTxStatus(ibcDetails ? [ibcDetails] : [])[0]?.data
 
   const activityVariant = isIbc
@@ -49,9 +49,9 @@ const ActivityItem = ({
   const parseMsgs = useParseMessages()
 
   const { activityMessages, activityType } = parseMsgs({
-    tx_hash,
+    txhash,
     timestamp,
-    chain_id,
+    chain,
     ...props,
   })
 
@@ -96,8 +96,8 @@ const ActivityItem = ({
               onClick={open}
               variant={activityVariant}
               chain={{
-                icon: network[chain_id]?.icon,
-                label: network[chain_id]?.name,
+                icon: network[chain].icon,
+                label: network[chain].name,
               }}
               msg={activityMessages[0]}
               type={t(activityType)}
@@ -120,12 +120,12 @@ const ActivityItem = ({
       >
         <ActivityDetailsPage
           variant={activityVariant}
-          chain_id={chain_id}
+          chain={chain}
           msg={activityMessages[0]}
           type={activityType}
           time={timestamp}
           timelineMessages={activityMessages.slice(1)}
-          txHash={tx_hash}
+          txHash={txhash}
           fee={tx?.auth_info?.fee?.amount ?? []}
           logs={props.logs}
         />
diff --git a/src/pages/activity/ActivityList.module.scss b/src/pages/activity/ActivityList.module.scss
index d9c3a915b..a5fb22b39 100644
--- a/src/pages/activity/ActivityList.module.scss
+++ b/src/pages/activity/ActivityList.module.scss
@@ -1,4 +1,3 @@
-@import "font_mixins";
 @import "mixins";
 
 .activitylist {
@@ -8,20 +7,15 @@
 }
 
 .loader {
-  color: var(--token-dark-900);
-  padding-top: 40px;
+  color: #065bed;
   display: flex;
   justify-content: center;
+  padding-top: 100px;
 }
 
-.empty {
-  @include X-Small;
-  color: var(--token-dark-900);
-  padding-top: 40px;
+.loadingtext {
+  color: white;
+  padding-top: 8px;
   display: flex;
   justify-content: center;
 }
-
-.footer > * {
-  margin-top: 16px;
-}
diff --git a/src/pages/activity/ActivityList.tsx b/src/pages/activity/ActivityList.tsx
index 31c0f8fbd..5301f6a5a 100644
--- a/src/pages/activity/ActivityList.tsx
+++ b/src/pages/activity/ActivityList.tsx
@@ -1,17 +1,14 @@
+import { useState } from "react"
 import {
-  Banner,
   LoadingCircular,
   SectionHeader,
   SubmitButton,
 } from "@terra-money/station-ui"
-import { PaginationItem, useTxActivity } from "data/queries/activityAPI"
-import { getWallet } from "auth/scripts/keystore"
+import { useTxActivity } from "data/queries/activity"
 import styles from "./ActivityList.module.scss"
-import { useEffect, useState } from "react"
 import ActivityItem from "./ActivityItem"
 import { Page } from "components/layout"
 import moment from "moment"
-
 //import useIbcTxs, { IbcTxState } from "txs/useIbcTxs"
 //import { useTranslation } from "react-i18next"
 /*
@@ -48,41 +45,24 @@ const IbcActivityItem = ({
 */
 const ActivityList = () => {
   //const { ibcTxs } = useIbcTxs()
+  const { activitySorted: activity, state } = useTxActivity()
 
-  const wallet = getWallet()
-  const addresses: string[] = Object.values(wallet.words)
-
-  const [pagination, setPagination] = useState<PaginationItem[] | undefined>(
-    undefined
-  )
-  const { data, isLoading, isError } = useTxActivity({
-    addresses: addresses,
-    pagination: pagination,
-  })
-
-  const [visibleActivity, setVisibleActivity] = useState(data?.response)
+  const activityItemsPerPage = 20
+  const [visibleActivity, setVisibleActivity] = useState(activityItemsPerPage)
 
-  useEffect(() => {
-    setVisibleActivity((prevVisibleActivity) => [
-      ...(prevVisibleActivity || []),
-      ...(data?.response || []),
-    ])
-  }, [data])
-
-  const handleLoadMore = () => {
-    if (data?.pagination) {
-      setPagination(data.pagination)
-    }
+  const handleClick = async () => {
+    await setVisibleActivity((prevVisibleActivity) => prevVisibleActivity + 20)
   }
 
   let priorDisplayDate = ""
-  const visibleActivityItems =
+  const visibleActivityItems = activity
     // do not show pending txs in the main activity page
     /*.filter(
       ({ txhash }) =>
         !ibcTxs.find(({ txhash: ibcTxhash }) => ibcTxhash === txhash)
     )*/
-    visibleActivity?.map((activityItem: ActivityItem) => {
+    .slice(0, visibleActivity)
+    .map((activityItem: AccountHistoryItem & { chain: string }) => {
       const activityItemDate = new Date(activityItem.timestamp)
       const displayDate = getDisplayDate(activityItemDate)
       let header = null
@@ -92,69 +72,57 @@ const ActivityList = () => {
       }
       return (
         <ActivityItem
-          key={`${activityItem.tx_hash}-${activityItem.code}`}
+          key={activityItem.txhash}
           {...activityItem}
           dateHeader={header}
         />
       )
     })
 
+  const allActivityDisplayed = visibleActivityItems.length === activity.length
+  const loadMoreButton = !allActivityDisplayed ? (
+    <SubmitButton
+      onClick={handleClick}
+      variant={"secondary"}
+      label={"Load More"}
+    />
+  ) : null
+
   let loader: JSX.Element | null
-  if (!visibleActivity?.length && isLoading) {
+  if (!activity?.length && state.isLoading) {
     loader = (
       <div className={styles.loader}>
         <LoadingCircular size={40} />
       </div>
     )
-  } else if (!visibleActivity?.length && !isLoading && !isError) {
+  } else if (activity?.length && state.isLoading) {
     loader = (
-      <span className={styles.empty}>
-        This wallet has no activity to display
+      <span className={styles.loadingtext}>
+        Gathering activity across all chains...
       </span>
     )
+  } else if (!activity?.length && !state.isLoading) {
+    loader = (
+      <span className={styles.loadingtext}>This wallet has no activity</span>
+    )
   } else {
     loader = null
   }
 
-  const loadMoreButton = visibleActivity?.length ? (
-    <SubmitButton
-      onClick={handleLoadMore}
-      variant={"secondary"}
-      loading={isLoading}
-      label={"Load More"}
-    />
-  ) : null
-
-  const errorBanner = isError ? (
-    <Banner
-      variant="warning"
-      title={
-        "There seems to be a problem with our servers. Please try again later."
-      }
-    />
-  ) : null
-
-  const footer = (
-    <div className={styles.footer}>
-      {errorBanner}
-      {loadMoreButton}
-    </div>
-  )
-
   const render = () => {
-    if (!visibleActivity) return null
+    if (!activity) return null
 
     return (
       <div className={styles.activitylist}>
         {loader}
         {visibleActivityItems}
-        {footer}
+        {loadMoreButton}
       </div>
     )
   }
 
   return (
-    <Page {...[isLoading, isError]} invisible>
+    <Page {...state} invisible>
       {render()}
     </Page>
   )
diff --git a/src/txs/feeAbstraction/GasHelperStatus.tsx b/src/txs/feeAbstraction/GasHelperStatus.tsx
index a33b828f9..60f256c6c 100644
--- a/src/txs/feeAbstraction/GasHelperStatus.tsx
+++ b/src/txs/feeAbstraction/GasHelperStatus.tsx
@@ -35,7 +35,7 @@ const GasHelperStatus = ({
   const ibcDetails =
     tx?.logs &&
     getIbcTxDetails({
-      chain_id: chainID,
+      chain: chainID,
       logs: tx.logs,
     })
 
diff --git a/src/txs/useIbcTxs.ts b/src/txs/useIbcTxs.ts
index c8c18bdf2..208a1541c 100644
--- a/src/txs/useIbcTxs.ts
+++ b/src/txs/useIbcTxs.ts
@@ -1,9 +1,10 @@
-import { useQueries, useQuery, useQueryClient } from "react-query"
-import { RefetchOptions, queryKey } from "data/query"
-import { atom, useRecoilState } from "recoil"
-import { useNetwork } from "data/wallet"
 import { useAuth } from "auth"
 import axios from "axios"
+import { RefetchOptions, queryKey } from "data/query"
+import { useNetwork } from "data/wallet"
+import { useQueries, useQuery, useQueryClient } from "react-query"
+import { atom, useRecoilState } from "recoil"
+
 const LOCALSTORAGE_IBC_TXS_KEY = "pendingIbcTxs"
 
 type WalletName = string
@@ -82,7 +83,7 @@ export const usePendingIbcTx = () => {
       if (ibcDetails) {
         setIbcTxs((txs) => [
           ...txs,
-          { ...ibcDetails, txhash: tx.tx_hash, state: IbcTxStatus.LOADING },
+          { ...ibcDetails, txhash: tx.txhash, state: IbcTxStatus.LOADING },
         ])
       }
     },
@@ -444,7 +445,7 @@ function parsePacketData(pktData: string): NextHopMemo | undefined {
 
 export const getIbcTxDetails = (tx: {
   logs: ActivityItem["logs"]
-  chain_id: string
+  chain: string
 }): IbcTxDetails | undefined => {
   for (const log of tx.logs) {
     const ibcEvent = log.events.find((e) => e.type === "send_packet")
@@ -452,7 +453,7 @@ export const getIbcTxDetails = (tx: {
     if (ibcEvent) {
       try {
         return {
-          src_chain_id: tx.chain_id,
+          src_chain_id: tx.chain,
           sequence: ibcEvent.attributes.find(
             ({ key }) => key === "packet_sequence"
           )!.value,
@@ -488,7 +489,7 @@ export const getIbcTxDetails = (tx: {
 
 export const getRecvIbcTxDetails = (tx: {
   logs: ActivityItem["logs"]
-  chain_id: string
+  chain: string
 }): (IbcTxDetails & { next_hop?: IbcTxDetails }) | undefined => {
   for (const log of tx.logs) {
     const ibcEvent = log.events.find((e) => e.type === "recv_packet")
@@ -496,7 +497,7 @@ export const getRecvIbcTxDetails = (tx: {
     if (ibcEvent) {
       try {
         return {
-          src_chain_id: tx.chain_id,
+          src_chain_id: tx.chain,
           sequence: ibcEvent.attributes.find(
             ({ key }) => key === "packet_sequence"
           )!.value,
@@ -518,7 +519,7 @@ export const getRecvIbcTxDetails = (tx: {
                 ({ key }) => key === "packet_timeout_timestamp"
               )!.value
             ) / 1_000_000,
-          next_hop: getIbcTxDetails({ logs: [log], chain_id: tx.chain_id }),
+          next_hop: getIbcTxDetails({ logs: [log], chain: tx.chain }),
         }
       } catch (e) {}
     }
diff --git a/src/types/history.d.ts b/src/types/history.d.ts
index a3f4c8f53..074478ea2 100644
--- a/src/types/history.d.ts
+++ b/src/types/history.d.ts
@@ -3,7 +3,7 @@ interface AccountHistory {
     total: string
     next_key: string | null
   }
-  tx_responses: ActivityItem[]
+  tx_responses: AccountHistoryItem[]
 }
 
 interface PubKey {
@@ -46,16 +46,12 @@ interface MultiSignerInfo {
   sequence: string
 }
 
-interface ActivityItem {
-  addresses: string[]
-  chain_id: string
-  children: ActivityItem[]
-  code: number
-  coinType: 60 | 118 | 330
-  events: any[]
-  logs: TxLog[]
-  raw_log: string
+interface AccountHistoryItem {
+  txhash: string
   timestamp: any
+  code: number
+  height: string
+  // collapsed?: number // WHAT IS THIS?
   tx: {
     body: {
       messages: any[]
@@ -68,8 +64,8 @@ interface ActivityItem {
       signer_infos: SignerInfo[] | MultiSignerInfo[]
     }
   }
-  tx_hash: string
-  words_from_key: string
+  raw_log?: string
+  logs: TxLog[]
 }
 
 interface TxLog {
@@ -86,6 +82,10 @@ interface TxLogEvent {
   }[]
 }
 
+type ActivityItem = AccountHistoryItem & {
+  chain: string
+}
+
 interface TxMessage {
   msgType: string
   canonicalMsg: string[]

From 90d3646721a0a608d41eefba88fdbcaab70c0bb7 Mon Sep 17 00:00:00 2001
From: Manuel Alessandro Collazo <collazo.manuel6@gmail.com>
Date: Wed, 14 Feb 2024 12:21:05 -0300
Subject: [PATCH 20/21] fix: remove warning

---
 src/auth/hooks/useAuth.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/auth/hooks/useAuth.ts b/src/auth/hooks/useAuth.ts
index 4e1f738db..c2d359551 100644
--- a/src/auth/hooks/useAuth.ts
+++ b/src/auth/hooks/useAuth.ts
@@ -25,7 +25,7 @@ import legacyEncrypt from "../scripts/encrypt"
 import { encrypt } from "../scripts/aes"
 import useAvailable from "./useAvailable"
 import { addressFromWords } from "utils/bech32"
-import { IInterchainNetworks, useAllNetworks, useNetwork } from "./useNetwork"
+import { useAllNetworks, useNetwork } from "./useNetwork"
 import { useLedgerKey } from "utils/ledger"
 import { useLogin } from "extension/modules/Login"
 

From aa749b24c7f347a57ae4262c52babbc67629b7a1 Mon Sep 17 00:00:00 2001
From: Michael Merz <mwmerz@protonmail.com>
Date: Fri, 16 Feb 2024 12:50:30 -0500
Subject: [PATCH 21/21] feat: bump version

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

diff --git a/public/manifest.json b/public/manifest.json
index 0195c4384..aa511775f 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,8 +1,8 @@
 {
   "manifest_version": 3,
   "name": "Station Wallet",
-  "version": "8.0.5.3",
-  "version_name": "8.0.5.3",
+  "version": "8.0.6",
+  "version_name": "8.0.6",
   "background": {
     "service_worker": "background.js"
   },