Merge pull request #28 from mars-protocol/v1.4.6

v1.4.6

Author: linkielink

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mars",
   "homepage": "./",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "license": "SEE LICENSE IN LICENSE FILE",
   "private": false,
   "scripts": {
@@ -22,7 +22,7 @@
     "@cosmjs/launchpad": "^0.27.1",
     "@cosmjs/proto-signing": "^0.30.1",
     "@cosmjs/stargate": "^0.30.1",
-    "@marsprotocol/wallet-connector": "^1.5.3",
+    "@marsprotocol/wallet-connector": "^1.5.8",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@ramonak/react-progress-bar": "^5.0.3",

src/components/common/CosmosWalletConnectProvider/CosmosWalletConnectProvider.tsx

@@ -22,7 +22,7 @@ export const CosmosWalletConnectProvider = ({ children }: Props) => {
 
     const fetchConfig = async () => {
       const file = await import(
-        `../../../configs/${NETWORK !== 'mainnet' ? 'osmo-test-4' : 'osmosis-1'}.ts`
+        `../../../configs/${NETWORK !== 'mainnet' ? 'osmo-test-5' : 'osmosis-1'}.ts`
       )
 
       const networkConfig: NetworkConfig = file.NETWORK_CONFIG

src/components/common/Tooltip/Apr.tsx

@@ -23,6 +23,7 @@ export const Apr = ({ data }: Props) => {
     const items: HoverItem[] = []
 
     data.forEach((asset: IncentiveInfo, key: number) => {
+      if (key !== 0 && !asset.apy) return
       items.push({
         color: asset.color,
         symbol: asset.symbol,

src/components/fields/LiquidationNotification/LiquidationNotification.tsx

@@ -20,7 +20,7 @@ export const LiquidationNotification = () => {
 
   if (!elligiblePositions.length) return null
 
-  if (elligiblePositions.length === 1) {
+  if (elligiblePositions.length >= 1) {
     return (
       <Notification
         type={NotificationType.Warning}
@@ -29,7 +29,7 @@ export const LiquidationNotification = () => {
             <div className={styles.container}>
               <span>
                 {t('fields.notifications.liquidation.single.text', {
-                  lp: elligiblePositions[0].name,
+                  lp: elligiblePositions[0].name.name,
                 })}
               </span>
               <Button

src/components/redbank/BorrowColumns/useBorrowColumns.module.scss

@@ -15,11 +15,16 @@
     background-image: $colorGradientATOM;
   }
 
+  &.AXL {
+    background-image: $colorGradientAXL;
+  }
+
   &.JUNO {
     background-image: $colorGradientJUNO;
   }
 
-  &.axlUSDC {
+  &.axlUSDC,
+  &.nUSDC {
     background-image: $colorGradientAxlUSDC;
   }
 

src/components/redbank/DepositColumns/useDepositColumns.module.scss

@@ -15,11 +15,16 @@
     background-image: $colorGradientATOM;
   }
 
+  &.AXL {
+    background-image: $colorGradientAXL;
+  }
+
   &.JUNO {
     background-image: $colorGradientJUNO;
   }
 
-  &.axlUSDC {
+  &.axlUSDC,
+  &.nUSDC {
     background-image: $colorGradientAxlUSDC;
   }