Merge branch 'main' into hotfix/replace-domains-7.4.2-base

stationmoney · Aug 21, 2023 · 343b647 · 343b647
2 parents bd6ab78 + d9dc20b
commit 343b647
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 22,506 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,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.5",
+    "@terra-money/station-connector": "^1.0.8",
     "@terra-money/terra-utils": "^1.0.9",
     "@terra-money/terra.js": "^3.1.9",
     "@terra-money/terra.proto": "^2.0.0",

diff --git a/public/firefox.manifest.json b/public/firefox.manifest.json
@@ -1,8 +1,8 @@
 {
   "manifest_version": 2,
   "name": "Station Wallet",
-  "version": "7.4.2",
-  "version_name": "7.4.2-rc.2",
+  "version": "7.4.3",
+  "version_name": "7.4.3-rc-1",
   "background": {
     "scripts": ["background.js"],
     "persistent": true

diff --git a/src/components/feedback/Modal.module.scss b/src/components/feedback/Modal.module.scss
@@ -38,6 +38,9 @@
     width: fit-content !important;
     padding: 0 !important;
   }
+  &.scrollable {
+    overflow-y: scroll !important;
+  }
 }
 
 .close {

diff --git a/src/components/feedback/Modal.tsx b/src/components/feedback/Modal.tsx
@@ -23,18 +23,20 @@ interface ModalProps {
   /* style */
   confirm?: boolean
   maxHeight?: boolean | number
+  scrollable?: boolean
 }
 
 export interface Props extends ModalProps, ReactModal.Props {}
 
 const Modal = (props: PropsWithChildren<Props>) => {
   const { title, children, footer } = props
-  const { icon, closeIcon, onRequestClose, confirm, maxHeight } = props
+  const { icon, closeIcon, onRequestClose, confirm, maxHeight, scrollable } =
+    props
 
   return (
     <ReactModal
       {...props}
-      className={styles.modal}
+      className={cx(styles.modal, { scrollable })}
       overlayClassName={styles.overlay}
     >
       {onRequestClose && (
@@ -74,6 +76,7 @@ export const [useModal, ModalProvider] = createContext<() => void>("useModal")
 interface ModalButtonProps extends ModalProps {
   renderButton: RenderButton
   modalKey?: string
+  scrollable?: boolean
 }
 
 export const ModalButton = (props: PropsWithChildren<ModalButtonProps>) => {

diff --git a/src/extension/auth/SelectWallets.tsx b/src/extension/auth/SelectWallets.tsx
@@ -55,6 +55,7 @@ export default function ManageWallets() {
             setPath(Path.select)
           }}
           className={styles.manage__wallets}
+          data-testid="manage-wallets-button"
         >
           {isLedger ? (
             wallet.bluetooth ? (

diff --git a/src/pages/wallet/IbcSendBack.tsx b/src/pages/wallet/IbcSendBack.tsx
@@ -16,7 +16,7 @@ const IbcSendBack = ({
   chainID,
 }: Props) => {
   return (
-    <ModalButton title={title} renderButton={renderButton}>
+    <ModalButton title={title} scrollable renderButton={renderButton}>
       <IbcSendBackTx token={token} chainID={chainID} />
     </ModalButton>
   )

diff --git a/src/pages/wallet/SendPage.tsx b/src/pages/wallet/SendPage.tsx
@@ -100,7 +100,13 @@ const SendPage = () => {
       ),
     [balances, readNativeDenom, networkName, prices]
   )
-  const defaultAsset = route?.denom || availableAssets[0].denom
+
+  const filteredAssets = useMemo(
+    () => availableAssets.filter(({ symbol }) => !symbol.endsWith("...")),
+    [availableAssets]
+  )
+
+  const defaultAsset = route?.denom || filteredAssets[0].denom
 
   /* form */
   const form = useForm<TxValues>({ mode: "onChange" })
@@ -341,11 +347,6 @@ const SendPage = () => {
     }
   }, [chain, trigger, recipient])
 
-  const filteredAssets = useMemo(
-    () => availableAssets.filter(({ symbol }) => !symbol.endsWith("...")),
-    [availableAssets]
-  )
-
   const assetsByDenom = filteredAssets.reduce(
     (acc: Record<string, AssetType>, item: AssetType) => {
       acc[item.denom] = item
@@ -369,7 +370,7 @@ const SendPage = () => {
                 error={errors.asset?.message ?? errors.address?.message}
               >
                 <AssetSelector
-                  value={asset ?? ""}
+                  value={asset ?? defaultAsset}
                   onChange={(asset) => setValue("asset", asset)}
                   assetList={filteredAssets}
                   assetsByDenom={assetsByDenom}

diff --git a/src/pages/wallet/Wallet.tsx b/src/pages/wallet/Wallet.tsx
@@ -45,7 +45,7 @@ const Wallet = () => {
         className={styles.back}
         onClick={() => setRoute(route.previousPage)}
       >
-        <BackIcon width={18} height={18} />
+        <BackIcon width={18} height={18} data-testid="BackIcon" />
       </button>
     )
   }