Merge pull request #119 from ionicprotocol/development

UI fixes
ionicprotocol · Jan 26, 2024 · a224858 · a224858
2 parents ac5a7c3 + 0c084b2
commit a224858
Show file tree

Hide file tree

Showing 8 changed files with 520 additions and 385 deletions.
diff --git a/netlify.toml b/netlify.toml
@@ -2,13 +2,8 @@
 package = "@netlify/plugin-nextjs"
 
 [[redirects]]
-from = "https://linea.development.ionic.money"
-to = "https://development.ionic.money/59144/pool/1"
-status = 200
-
-[[redirects]]
-from = "https://linea.development.ionic.money/horizon-dex"
-to = "https://development.ionic.money/59144/pool/0"
+from = "https://development.ionic.money"
+to = "https://development.ionic.money/market"
 status = 200
 
 [build]

diff --git a/packages/ui/app/_components/Navbar.tsx b/packages/ui/app/_components/Navbar.tsx
@@ -77,15 +77,15 @@ export default function Navbar() {
               Lend
             </p>
           </Link> */}
-          <Link href={`/market`}>
+          {/* <Link href={`/market`}>
             <p
               className={`${
                 pathname == '/market' ? 'text-accent' : null
               } px-4 text-center transition-all duration-200 ease-linear rounded-md cursor-pointer `}
             >
               Market
             </p>
-          </Link>
+          </Link> */}
           {/* <Link href={`/borrow`}>
             <p
               className={`${

diff --git a/packages/ui/app/_components/ResultHandler.tsx b/packages/ui/app/_components/ResultHandler.tsx
@@ -20,16 +20,14 @@ export default function ResultHandler({
 }: ResultHandlerProps) {
   if (isLoading || isFetching) {
     return (
-      <div className="flex justify-center">
-        <ThreeCircles
-          visible={true}
-          height={height}
-          width={width}
-          color={color}
-          ariaLabel="three-circles-loading"
-          wrapperClass=""
-        />
-      </div>
+      <ThreeCircles
+        visible={true}
+        height={height}
+        width={width}
+        color={color}
+        ariaLabel="three-circles-loading"
+        wrapperClass=""
+      />
     );
   }
 

diff --git a/packages/ui/app/_components/markets/PoolRows.tsx b/packages/ui/app/_components/markets/PoolRows.tsx
@@ -6,23 +6,23 @@ import React, { Dispatch, SetStateAction } from 'react';
 
 interface IRows {
   asset: string;
-  colleteralT: string;
-  borrowing: string;
-  borrowingT: string;
-  lendingT: string;
-  lAPR: string;
-  bAPR: string;
+  supplyBalance: string;
+  totalSupplied: string;
+  borrowBalance: string;
+  totalBorrowing: string;
+  supplyAPR: string;
+  borrowAPR: string;
   logo: string;
   setSelectedSymbol: Dispatch<SetStateAction<string | undefined>>;
 }
 const PoolRows = ({
   asset,
-  colleteralT,
-  borrowing,
-  borrowingT,
-  lendingT,
-  lAPR,
-  bAPR,
+  supplyBalance,
+  totalSupplied,
+  borrowBalance,
+  totalBorrowing,
+  supplyAPR,
+  borrowAPR,
   logo,
   setSelectedSymbol
 }: IRows) => {
@@ -38,26 +38,26 @@ const PoolRows = ({
         />
         <h3 className={` `}>{asset}</h3>
       </div>
-      <h3 className={` col-span-2`}>{colleteralT}</h3>
-      <h3 className={` col-span-2`}>{lendingT}</h3>
-      <h3 className={` col-span-2`}>{borrowing}</h3>
-      <h3 className={` col-span-2`}>{borrowingT}</h3>
-      <h3 className={` col-span-2`}>{lAPR}</h3>
-      <h3 className={` col-span-2`}>{bAPR}</h3>
+      <h3 className={` col-span-2`}>{supplyBalance}</h3>
+      <h3 className={` col-span-2`}>{totalSupplied}</h3>
+      <h3 className={` col-span-2`}>{borrowBalance}</h3>
+      <h3 className={` col-span-2`}>{totalBorrowing}</h3>
+      <h3 className={` col-span-2`}>{supplyAPR}</h3>
+      <h3 className={` col-span-2`}>{borrowAPR}</h3>
       <div className={` col-span-4 flex items-center justify-center gap-3`}>
         <Link
-          href={`/market?popmode=SUPPLY`}
+          href={`/?popmode=SUPPLY`}
           className={`rounded-lg bg-accent text-black py-1.5 px-3`}
           onClick={() => setSelectedSymbol(asset)}
         >
-          Supply
+          Supply / Withdraw
         </Link>
         <Link
-          href={`/market?popmode=BORROW`}
+          href={`/?popmode=BORROW`}
           className={`rounded-lg border text-white/50 border-white/50 py-1.5 px-3`}
           onClick={() => setSelectedSymbol(asset)}
         >
-          Borrow
+          Borrow / Repay
         </Link>
       </div>
       {/* <Link