From a58c73842e97b0240d6d7e86abfebb89699f694d Mon Sep 17 00:00:00 2001 From: Grant Zukel Date: Mon, 25 Apr 2022 11:35:06 -0600 Subject: [PATCH 01/10] added IOV/starname to the mainnet assets file. --- .../networks/sifchain/assets.sifchain.mainnet.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts b/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts index e57904587..ee2c7349d 100644 --- a/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts +++ b/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts @@ -1072,6 +1072,17 @@ const assets: { imageUrl: "https://assets.coingecko.com/coins/images/13722/small/logo-200x200.jpg?1626095888", }, + { + symbol: "uiov", + displaySymbol: "iov", + decimals: 6, + name: "iov", + network: "sifchain", + homeNetwork: "Starname", + label: "iov", + imageUrl: + "https://assets.coingecko.com/coins/images/12660/small/iov.png?1601862353", + }, { symbol: "eeur", displaySymbol: "eeur", From 0c43d3a201382df6d84c7cd96441f98c4258d512 Mon Sep 17 00:00:00 2001 From: Grant Zukel Date: Mon, 25 Apr 2022 11:36:36 -0600 Subject: [PATCH 02/10] remove capital letter --- core/src/config/networks/sifchain/assets.sifchain.mainnet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts b/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts index ee2c7349d..786919dcb 100644 --- a/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts +++ b/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts @@ -1078,7 +1078,7 @@ const assets: { decimals: 6, name: "iov", network: "sifchain", - homeNetwork: "Starname", + homeNetwork: "starname", label: "iov", imageUrl: "https://assets.coingecko.com/coins/images/12660/small/iov.png?1601862353", From ebd7104d48e33ddb6d81d313658d3b1dea5cd935 Mon Sep 17 00:00:00 2001 From: Grant Zukel Date: Mon, 25 Apr 2022 11:51:13 -0600 Subject: [PATCH 03/10] increment version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c6ff29197..3446523d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sifchain-ui", - "version": "2.6.8", + "version": "2.6.9", "private": true, "license": "UNLICENSED", "packageManager": "yarn@3.2.0", From 6d34ff4a17bab8f3fba0544baf65f87218cf7a00 Mon Sep 17 00:00:00 2001 From: Grant Zukel Date: Mon, 25 Apr 2022 12:00:41 -0600 Subject: [PATCH 04/10] changed app/package.json version to push to forble --- app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index 29bbacf91..407460a46 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "2.6.8", + "version": "2.6.9", "private": true, "scripts": { "bump": "bump patch --tag --commit 'testnet release '", From 5566656e23937797ffdb0e9114b45940a8e90e99 Mon Sep 17 00:00:00 2001 From: Alan Soares Date: Tue, 9 Aug 2022 06:49:08 +1200 Subject: [PATCH 05/10] hotfix: multiply poolApr for display --- app/src/hooks/usePoolStats.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/hooks/usePoolStats.ts b/app/src/hooks/usePoolStats.ts index 28cf7a7c8..548f82a0a 100644 --- a/app/src/hooks/usePoolStats.ts +++ b/app/src/hooks/usePoolStats.ts @@ -49,7 +49,19 @@ export function useDataServicesPoolStats() { return useQuery( ["pool-stats", isPMTPEnabled], - () => services.data.getTokenStats(), + async () => { + const stats = await services.data.getTokenStats(); + return { + ...stats, + body: { + ...stats.body, + pools: stats.body.pools.map((pool) => ({ + ...pool, + poolApr: (pool.poolApr ?? 0) * 100, + })), + }, + }; + }, { staleTime: 5 * 60 * 1000, cacheTime: 5 * 60 * 1000, From e7f895bbd2de48c8f035b05417b02482d8a0ae51 Mon Sep 17 00:00:00 2001 From: Alan Soares Date: Tue, 9 Aug 2022 07:09:07 +1200 Subject: [PATCH 06/10] testnet release 2.7.11 --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index e6247d0ba..6293781aa 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "2.7.10", + "version": "2.7.11", "private": true, "scripts": { "bump": "bump patch --tag --commit 'testnet release '", diff --git a/package.json b/package.json index 5f026ce1e..bfdf27a66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sifchain-ui", - "version": "2.7.10", + "version": "2.7.11", "private": true, "license": "UNLICENSED", "packageManager": "yarn@3.2.0", From 113305ea7890b2f3a9bd28808ce3c0bee69bf50c Mon Sep 17 00:00:00 2001 From: Alan Soares Date: Tue, 9 Aug 2022 08:34:14 +1200 Subject: [PATCH 07/10] Revert "hotfix: multiply poolApr for display" --- app/package.json | 2 +- app/src/hooks/usePoolStats.ts | 14 +------------- package.json | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/app/package.json b/app/package.json index 6293781aa..e6247d0ba 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "2.7.11", + "version": "2.7.10", "private": true, "scripts": { "bump": "bump patch --tag --commit 'testnet release '", diff --git a/app/src/hooks/usePoolStats.ts b/app/src/hooks/usePoolStats.ts index 548f82a0a..28cf7a7c8 100644 --- a/app/src/hooks/usePoolStats.ts +++ b/app/src/hooks/usePoolStats.ts @@ -49,19 +49,7 @@ export function useDataServicesPoolStats() { return useQuery( ["pool-stats", isPMTPEnabled], - async () => { - const stats = await services.data.getTokenStats(); - return { - ...stats, - body: { - ...stats.body, - pools: stats.body.pools.map((pool) => ({ - ...pool, - poolApr: (pool.poolApr ?? 0) * 100, - })), - }, - }; - }, + () => services.data.getTokenStats(), { staleTime: 5 * 60 * 1000, cacheTime: 5 * 60 * 1000, diff --git a/package.json b/package.json index bfdf27a66..5f026ce1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sifchain-ui", - "version": "2.7.11", + "version": "2.7.10", "private": true, "license": "UNLICENSED", "packageManager": "yarn@3.2.0", From 4eaed90fbf35d37934a1ffbc1ccab485b3e390da Mon Sep 17 00:00:00 2001 From: Alan Soares Date: Fri, 16 Sep 2022 14:47:15 +1200 Subject: [PATCH 08/10] chore: update changelog --- app/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md index 2669460bc..1c750d68e 100644 --- a/app/CHANGELOG.md +++ b/app/CHANGELOG.md @@ -1,3 +1,9 @@ +## Release 2022.09.16 + +- Margin trading release +- 3rd party charting integration +- Margin APR’s on Pool and Pool Stats pages + ## Release 2022.09.13 - Remove PMTP rate from sidebar From c5dc44a21db537c5f9ab207548f7801b2e07b4a5 Mon Sep 17 00:00:00 2001 From: Alan Soares Date: Fri, 16 Sep 2022 14:47:33 +1200 Subject: [PATCH 09/10] chore: add missing margin apr tooltip --- app/src/views/PoolPage/usePoolPageData.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/views/PoolPage/usePoolPageData.tsx b/app/src/views/PoolPage/usePoolPageData.tsx index df8e5f65b..4379e864d 100644 --- 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: TBD, + help: ( + + 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. + + ), }, { id: "userShare", From c4da9eb15e80b6f84af4614a66f72520bd7cf7c2 Mon Sep 17 00:00:00 2001 From: Alan Soares Date: Fri, 16 Sep 2022 15:20:44 +1200 Subject: [PATCH 10/10] testnet release 2.11.0 --- app/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 8ab9f9d72..a591e8bdd 100644 --- 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/package.json b/package.json index 825caf627..f391bee45 100644 --- 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": "yarn@3.2.0",