Revert "Fix/fix feedback tokenholding"

getnimbus · Nov 10, 2023 · dc10dba · dc10dba
1 parent 113686a
commit dc10dba
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 42 deletions.
diff --git a/src/UI/Portfolio/ClosedTokenPosition.svelte b/src/UI/Portfolio/ClosedTokenPosition.svelte
@@ -426,12 +426,8 @@
                     </td>
                   </tr>
                 {/if}
-                {#each filteredHoldingDataToken as holding, index}
-                  <ClosedHoldingTokenPosition
-                    data={holding}
-                    {selectedWallet}
-                    lastIndex={filteredHoldingDataToken.length - 1 == index}
-                  />
+                {#each filteredHoldingDataToken as holding}
+                  <ClosedHoldingTokenPosition data={holding} {selectedWallet} />
                 {/each}
               </tbody>
               {#if isLoadingToken}
@@ -479,11 +475,10 @@
                       </td>
                     </tr>
                   {:else}
-                    {#each filteredHoldingDataToken as holding, index}
+                    {#each filteredHoldingDataToken as holding}
                       <ClosedHoldingTokenPosition
                         data={holding}
                         {selectedWallet}
-                        lastIndex={filteredHoldingDataToken.length - 1 == index}
                       />
                     {/each}
                   {/if}

diff --git a/src/UI/Portfolio/Holding.svelte b/src/UI/Portfolio/Holding.svelte
@@ -764,13 +764,7 @@
                         </tr>
                       {/if}
                       {#each filteredHoldingDataNFT as holding, index}
-                        <HoldingNFT
-                          data={holding}
-                          {selectedWallet}
-                          {index}
-                          lastIndex={filteredHoldingDataNFT.length - 1 ===
-                            index}
-                        />
+                        <HoldingNFT data={holding} {selectedWallet} {index} />
                       {/each}
                     </tbody>
                     {#if isLoadingNFT}
@@ -823,8 +817,6 @@
                               data={holding}
                               {selectedWallet}
                               {index}
-                              lastIndex={filteredHoldingDataNFT.length - 1 ===
-                                index}
                             />
                           {/each}
                         {/if}

diff --git a/src/components/ClosedHoldingTokenPosition.svelte b/src/components/ClosedHoldingTokenPosition.svelte
@@ -1,4 +1,4 @@
-<script lang="ts">
+<script>
   import { typeWallet, isDarkMode, isHidePortfolio } from "~/store";
   import { detectedChain, shorterName, shorterAddress } from "~/utils";
   import CopyToClipboard from "svelte-copy-to-clipboard";
@@ -17,7 +17,6 @@
 
   export let data;
   export let selectedWallet;
-  export let lastIndex = false;
 
   let isShowTooltipName = false;
   let isShowTooltipSymbol = false;
@@ -63,13 +62,10 @@
 >
   <td
     class={`pl-3 py-3 xl:static xl:bg-transparent sticky left-0 z-9 w-[420px] ${
-      ($isDarkMode
+      $isDarkMode
         ? "bg-[#131313] group-hover:bg-[#000]"
-        : "bg-white group-hover:bg-gray-100") +
-      " " +
-      (lastIndex ? "rounded-bl-[10px]" : "")
+        : "bg-white group-hover:bg-gray-100"
     }`}
-    style={`${lastIndex ? "border-bottom-left-radius: 10px;" : ""}`}
   >
     <div class="text-left flex items-center gap-3">
       <div class="relative">
@@ -451,11 +447,9 @@
 
   {#if $typeWallet === "SOL" || $typeWallet === "EVM" || $typeWallet === "BUNDLE" || $typeWallet === "CEX"}
     <td
-      class={`py-3 xl:w-14 w-32 h-full flex justify-center items-center xl:gap-3 gap-6 rounded-xl ${
+      class={`py-3 xl:w-14 w-32 h-full flex justify-center items-center xl:gap-3 gap-6 ${
         $isDarkMode ? "group-hover:bg-[#000]" : "group-hover:bg-gray-100"
-        //
       }`}
-      style={`${lastIndex ? "border-bottom-right-radius: 10px;" : ""}`}
     >
       {#if $typeWallet === "SOL" || $typeWallet === "EVM" || $typeWallet === "BUNDLE" || $typeWallet === "CEX"}
         <div

diff --git a/src/components/HoldingNFT.svelte b/src/components/HoldingNFT.svelte
@@ -18,7 +18,6 @@
   export let data;
   export let selectedWallet;
   export let index;
-  export let lastIndex: boolean = false;
 
   const navigate = useNavigate();
 
@@ -57,7 +56,7 @@
 <svelte:window on:keydown={closeSideNFTDetail} />
 
 <tr
-  class={`group transition-all cursor-pointer rounded-xl ${
+  class={`group transition-all cursor-pointer ${
     index === 0 && "view-nft-detail"
   } `}
   on:click={() => {
@@ -74,7 +73,6 @@
         ? "bg-[#131313] group-hover:bg-[#000]"
         : "bg-white group-hover:bg-gray-100"
     }`}
-    style={`${lastIndex ? "border-bottom-left-radius: 10px;" : ""}`}
   >
     <div class="relative flex flex-col gap-1">
       <div
@@ -242,7 +240,6 @@
     class={`py-3 pr-3 ${
       $isDarkMode ? "group-hover:bg-[#000]" : "group-hover:bg-gray-100"
     }`}
-    style={`${lastIndex ? "border-bottom-right-radius: 10px;" : ""}`}
   >
     <div
       class="flex items-center justify-end gap-1 xl:text-sm text-2xl font-medium"

diff --git a/src/components/HoldingToken.svelte b/src/components/HoldingToken.svelte
@@ -246,7 +246,7 @@
         ? "bg-[#131313] group-hover:bg-[#000]"
         : "bg-white group-hover:bg-gray-100") +
       " " +
-      (lastIndex ? "rounded-bl-[10px]" : "")
+      (lastIndex ? "rounded-bl-xl" : "")
     }`}
   >
     <div class="relative flex items-center gap-3 text-left">
@@ -824,7 +824,7 @@
       class={`py-3 xl:w-14 w-32 h-full flex justify-center items-center xl:gap-3 gap-6 ${
         ($isDarkMode ? "group-hover:bg-[#000]" : "group-hover:bg-gray-100") +
         " " +
-        (lastIndex ? "rounded-br-[10px]" : "")
+        (lastIndex ? "rounded-br-xl" : "")
       }`}
     >
       {#if $typeWallet === "BUNDLE"}

diff --git a/windi.config.ts b/windi.config.ts
@@ -32,15 +32,6 @@ export default defineConfig({
       "./src/**/*.{html,js,svelte}",
       "./node_modules/flowbite-svelte/**/*.{html,js,svelte,ts}",
     ],
-    extractors: [
-      {
-        extractor: (content) => {
-          return {classes: []};
-          return { classes: content.match(/[^<>"'`\s]*[^<>"'`\s:]/g) ?? [] }
-        },
-        extensions: ['svelte'],
-      },
-    ],
   },
   // include: ["./node_modules/flowbite-svelte/**/*.{html,js,svelte,ts}"],
   darkMode: "class",