From a395a4f46a3897af55dc6c4af871cebc42f487fc Mon Sep 17 00:00:00 2001
From: Piotr Gesicki <piotr.gesicki@gmail.com>
Date: Mon, 20 Nov 2023 13:03:00 +0100
Subject: [PATCH 1/2] remove margin apy from Pools

---
 app/src/views/PoolPage/PoolItem.tsx        |  4 ++--
 app/src/views/PoolPage/usePoolPageData.tsx | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/views/PoolPage/PoolItem.tsx b/app/src/views/PoolPage/PoolItem.tsx
index e07958c1e..a0ef668ef 100644
--- a/app/src/views/PoolPage/PoolItem.tsx
+++ b/app/src/views/PoolPage/PoolItem.tsx
@@ -404,7 +404,7 @@ export default defineComponent({
               ? "..."
               : `${(this.$props.poolStat?.poolApr ?? 0).toFixed(2)}%`}
           </div>
-          <div
+          {/* <div
             class={[
               COLUMNS_LOOKUP.marginapy.class,
               "flex items-center font-mono",
@@ -413,7 +413,7 @@ export default defineComponent({
             {isNil(this.$props.poolStat?.margin_apr)
               ? "..."
               : `${prettyNumberMinMax(this.$props.poolStat?.margin_apr ?? 0)}%`}
-          </div>
+          </div> */}
           <div
             class={[
               COLUMNS_LOOKUP.userShare.class,
diff --git a/app/src/views/PoolPage/usePoolPageData.tsx b/app/src/views/PoolPage/usePoolPageData.tsx
index cd3bf4e31..c1547d385 100644
--- a/app/src/views/PoolPage/usePoolPageData.tsx
+++ b/app/src/views/PoolPage/usePoolPageData.tsx
@@ -29,7 +29,7 @@ export type PoolPageData = ReturnType<typeof usePoolPageData>;
 export type PoolPageColumnId =
   | "token"
   | "apy"
-  | "marginapy"
+  // | "marginapy"
   | "gainLoss"
   | "rewardApr"
   | "poolTvl"
@@ -81,12 +81,12 @@ export const COLUMNS: PoolPageColumn[] = [
       </code>
     ),
   },
-  {
-    id: "marginapy",
-    name: "Margin APY",
-    class: "w-[128px] text-right justify-end whitespace-nowrap",
-    sortable: true,
-  },
+  // {
+  //   id: "marginapy",
+  //   name: "Margin APY",
+  //   class: "w-[128px] text-right justify-end whitespace-nowrap",
+  //   sortable: true,
+  // },
   {
     id: "userShare",
     name: "Your Pool Share",

From c4301b4fcddb124912c1bc53ce88b3aa6eff5949 Mon Sep 17 00:00:00 2001
From: Piotr Gesicki <piotr.gesicki@gmail.com>
Date: Mon, 20 Nov 2023 13:03:16 +0100
Subject: [PATCH 2/2] testnet release 2.14.18

---
 app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index 704821187..eca6dc864 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "2.14.17",
+  "version": "2.14.18",
   "private": true,
   "scripts": {
     "bump": "bump patch --tag --commit 'testnet release '",