Merge branch 'staging' into develop

Sifchain · Sep 16, 2022 · ae896e0 · ae896e0
2 parents 3b6044a + 6e8073d
commit ae896e0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
@@ -1,8 +1,12 @@
 ## Release 2022.09.17
 
+- Margin APR’s on Pool Stats page
+
+## Release 2022.09.16
+
 - Margin trading release
 - 3rd party charting integration
-- Margin APR’s on Pool and Pool Stats pages
+- Margin APR’s on Pool page
 
 ## Release 2022.09.13
 

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "private": true,
   "scripts": {
     "bump": "bump patch --tag --commit 'testnet release '",

diff --git a/app/src/views/PoolPage/usePoolPageData.tsx b/app/src/views/PoolPage/usePoolPageData.tsx
@@ -86,7 +86,13 @@ export const COLUMNS: PoolPageColumn[] = [
     name: "Margin APR",
     class: "w-[128px] text-right justify-end",
     sortable: true,
-    help: <code class="text-xs">TBD</code>,
+    help: (
+      <code class="text-xs">
+        Margin APR represents the ratio of interest payments to pool balances
+        over a given time period. The current time period is set as the previous
+        600 blocks (≈ 1 hour) of trading activity.
+      </code>
+    ),
   },
   {
     id: "userShare",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sifchain-ui",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "private": true,
   "license": "UNLICENSED",
   "packageManager": "[email protected]",