Merge pull request #1442 from mars-protocol/develop

v2.9.2

Author: linkielink

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mars-v2-frontend",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "homepage": "./",
   "private": false,
   "license": "SEE LICENSE IN LICENSE FILE",
@@ -32,7 +32,7 @@
     "@web3modal/wagmi": "^5.1.11",
     "@vercel/analytics": "^1.5.0",
     "axios": "^1.8.4",
-    "bignumber.js": "^9.1.2",
+    "bignumber.js": "^9.2.1",
     "classnames": "^2.5.1",
     "debounce-promise": "^3.1.2",
     "ibc-domains-sdk": "^1.1.0",
@@ -47,11 +47,11 @@
     "react-draggable": "^4.4.6",
     "react-helmet-async": "^2.0.5",
     "react-qr-code": "^2.0.15",
-    "react-router-dom": "^7.4.1",
+    "react-router-dom": "^7.5.0",
     "react-spring": "^9.7.5",
     "react-toastify": "^11.0.5",
     "react-use-clipboard": "^1.0.9",
-    "recharts": "^2.15.1",
+    "recharts": "^2.15.2",
     "sharp": "^0.33.5",
     "starknet": "^6.24.1",
     "swr": "^2.3.3",
@@ -64,7 +64,7 @@
     "@eslint/compat": "^1.2.7",
     "@svgr/webpack": "^8.1.0",
     "@tailwindcss/container-queries": "^0.1.1",
-    "@tailwindcss/postcss": "^4.0.17",
+    "@tailwindcss/postcss": "^4.1.3",
     "@types/debounce-promise": "^3.1.9",
     "@types/lodash.debounce": "^4.0.9",
     "@types/lodash.throttle": "^4.1.9",

src/chains/neutron/neutron-1.ts

@@ -23,6 +23,13 @@ const Neutron1: ChainConfig = {
       collateralMultiplier: 5,
       campaignDenom: 'dTIA',
     },
+    {
+      denom: 'factory/neutron1frc0p5czd9uaaymdkug2njz7dc7j65jxukp9apmt9260a8egujkspms2t2/udntrn',
+      campaignIds: ['drop_apy', 'drop'],
+      baseMultiplier: 1,
+      collateralMultiplier: 5,
+      campaignDenom: 'dNTRN',
+    },
     //dATOM-NTRN
     {
       denom:
@@ -72,6 +79,20 @@ const Neutron1: ChainConfig = {
       campaignIds: ['drop'],
       baseMultiplier: 20,
     },
+    //dNTRN-NTRN
+    {
+      denom:
+        'factory/neutron1pd9u7h4vf36vtj5lqlcp4376xf4wktdnhmzqtn8958wyh0nzwsmsavc2dz/astroport/share',
+      campaignIds: ['drop'],
+      baseMultiplier: 10,
+    },
+    //dNTRN-USDC
+    {
+      denom:
+        'factory/neutron1hme8vcsky2xeq4qc4wg3uy9gc47xzga6uqk8plaps8tvutjshuwqajnze6/astroport/share',
+      campaignIds: ['drop'],
+      baseMultiplier: 50,
+    },
     {
       denom: 'ibc/B7864B03E1B9FD4F049243E92ABD691586F682137037A9F3FCA5222815620B3C',
       campaignIds: ['stride'],

src/components/Modals/AlertDialog/index.tsx

@@ -2,6 +2,7 @@ import classNames from 'classnames'
 
 import Button from 'components/common/Button'
 import Checkbox from 'components/common/Checkbox'
+import EscButton from 'components/common/Button/EscButton'
 import Text from 'components/common/Text'
 import { NoIcon, YesIcon } from 'components/Modals/AlertDialog/ButtonIcons'
 import Modal from 'components/Modals/Modal'
@@ -22,7 +23,17 @@ interface Props {
 }
 
 function AlertDialog(props: Props) {
-  const { title, icon, content, negativeButton, positiveButton, checkbox, header } = props.config
+  const {
+    title,
+    icon,
+    content,
+    negativeButton,
+    positiveButton,
+    checkbox,
+    header,
+    isSingleButtonLayout,
+    showCloseButton,
+  } = props.config
 
   const [toggle, handleToggle] = useToggle()
 
@@ -42,7 +53,10 @@ function AlertDialog(props: Props) {
       hideTxLoader
       header={
         header ? (
-          header
+          <div className='flex items-center justify-between w-full'>
+            {header}
+            {showCloseButton && <EscButton onClick={props.close} />}
+          </div>
         ) : (
           <div className='flex flex-col'>
             {icon && (
@@ -65,42 +79,67 @@ function AlertDialog(props: Props) {
       ) : (
         content
       )}
-      <div
-        className={classNames(
-          'mt-10 flex justify-between gap-4 md:flex-nowrap flex-wrap',
-          positiveButton && 'flex-row-reverse',
-        )}
-      >
-        <div className='flex flex-row-reverse gap-4'>
+      {isSingleButtonLayout ? (
+        <div className='mt-10 flex flex-col gap-4'>
+          {checkbox && (
+            <div className='flex justify-center'>
+              <Checkbox
+                name='hls-info-toggle'
+                checked={toggle}
+                onChange={handleCheckboxClick}
+                text={checkbox.text}
+              />
+            </div>
+          )}
           {positiveButton && (
             <Button
-              text={positiveButton.text ?? 'Yes'}
-              color='tertiary'
-              className='px-6'
-              rightIcon={positiveButton.icon ?? <YesIcon />}
-              iconClassName='h-4 w-5'
+              text={positiveButton.text ?? 'Continue'}
+              color='primary'
+              className='w-full'
+              rightIcon={positiveButton.icon}
               onClick={() => handleButtonClick(positiveButton)}
               disabled={positiveButton.disabled}
             />
           )}
-          {checkbox && (
-            <Checkbox
-              name='hls-info-toggle'
-              checked={toggle}
-              onChange={handleCheckboxClick}
-              text={checkbox.text}
-            />
+        </div>
+      ) : (
+        <div
+          className={classNames(
+            'mt-10 flex justify-between gap-4 md:flex-nowrap flex-wrap',
+            positiveButton && 'flex-row-reverse',
           )}
+        >
+          <div className='flex flex-row-reverse gap-4'>
+            {positiveButton && (
+              <Button
+                text={positiveButton.text ?? 'Yes'}
+                color='tertiary'
+                className='px-6'
+                rightIcon={positiveButton.icon ?? <YesIcon />}
+                iconClassName='h-4 w-5'
+                onClick={() => handleButtonClick(positiveButton)}
+                disabled={positiveButton.disabled}
+              />
+            )}
+            {checkbox && (
+              <Checkbox
+                name='hls-info-toggle'
+                checked={toggle}
+                onChange={handleCheckboxClick}
+                text={checkbox.text}
+              />
+            )}
+          </div>
+          <Button
+            text={negativeButton?.text ?? 'No'}
+            color='secondary'
+            className='px-6'
+            rightIcon={negativeButton?.icon ?? <NoIcon />}
+            tabIndex={1}
+            onClick={() => handleButtonClick(negativeButton)}
+          />
         </div>
-        <Button
-          text={negativeButton?.text ?? 'No'}
-          color='secondary'
-          className='px-6'
-          rightIcon={negativeButton?.icon ?? <NoIcon />}
-          tabIndex={1}
-          onClick={() => handleButtonClick(negativeButton)}
-        />
-      </div>
+      )}
     </Modal>
   )
 }

src/components/common/TitleAndSubCell.tsx

@@ -7,13 +7,15 @@ interface Props {
   sub: string | React.ReactNode
   className?: string
   containerClassName?: string
+  isDeprecated?: boolean
 }
 
 export default function TitleAndSubCell(props: Props) {
   return (
     <div className={classNames('flex flex-col gap-0.5', props.containerClassName)}>
       <Text size='xs' className={props.className} tag='span'>
         {props.title}
+        {props.isDeprecated && <span className='text-info ml-1'>(disabled)</span>}
       </Text>
       <Text size='xs' className={classNames('text-white/40', props.className)} tag='span'>
         {props.sub}