From ec875eb45015277ec59f986c9e4b3f48caa16368 Mon Sep 17 00:00:00 2001 From: Mircea Hasegan Date: Fri, 17 Nov 2023 12:07:09 +0100 Subject: [PATCH 1/2] chore: stake pools sort by ros --- .../staking/components/StakePoolsTable/StakePoolsTable.tsx | 2 +- .../features/BrowsePools/StakePoolsTable/StakePoolsTable.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/browser-extension-wallet/src/views/browser-view/features/staking/components/StakePoolsTable/StakePoolsTable.tsx b/apps/browser-extension-wallet/src/views/browser-view/features/staking/components/StakePoolsTable/StakePoolsTable.tsx index 9b671719ad..fd10a3e36c 100644 --- a/apps/browser-extension-wallet/src/views/browser-view/features/staking/components/StakePoolsTable/StakePoolsTable.tsx +++ b/apps/browser-extension-wallet/src/views/browser-view/features/staking/components/StakePoolsTable/StakePoolsTable.tsx @@ -26,7 +26,7 @@ type stakePoolsTableProps = { }; const DEFAULT_SORT_OPTIONS: StakePoolSortOptions = { - field: 'apy', + field: 'ros', order: 'desc' }; diff --git a/packages/staking/src/features/BrowsePools/StakePoolsTable/StakePoolsTable.tsx b/packages/staking/src/features/BrowsePools/StakePoolsTable/StakePoolsTable.tsx index 610ceee531..390725ac0d 100644 --- a/packages/staking/src/features/BrowsePools/StakePoolsTable/StakePoolsTable.tsx +++ b/packages/staking/src/features/BrowsePools/StakePoolsTable/StakePoolsTable.tsx @@ -15,7 +15,7 @@ type StakePoolsTableProps = { }; const DEFAULT_SORT_OPTIONS: StakePoolSortOptions = { - field: 'apy', + field: 'ros', order: 'desc', }; From 6e9da9476043e3732d8652ef2a55f2f5056c27f9 Mon Sep 17 00:00:00 2001 From: Mircea Hasegan Date: Fri, 17 Nov 2023 12:08:11 +0100 Subject: [PATCH 2/2] chore: metrics require lastRos and ros --- apps/browser-extension-wallet/src/api/mock.ts | 4 ++- .../src/utils/mocks/test-helpers.tsx | 4 ++- .../test/mocks/StakepoolSearchProviderStub.ts | 28 ++++++++++++++----- .../cardano/src/wallet/test/mocks/mock.ts | 4 ++- .../__tests__/stake-pool-transformer.test.ts | 4 ++- 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/apps/browser-extension-wallet/src/api/mock.ts b/apps/browser-extension-wallet/src/api/mock.ts index 62dc74e7c7..54dc9047b8 100644 --- a/apps/browser-extension-wallet/src/api/mock.ts +++ b/apps/browser-extension-wallet/src/api/mock.ts @@ -126,7 +126,9 @@ const getDetailsForAll = (): PoolDetails => ({ livePledge: BigInt('2000000000'), saturation: Percent(0.95), size: undefined, - stake: undefined + stake: undefined, + lastRos: Percent(1), + ros: Percent(2) }, relays: undefined, rewardAccount: Wallet.Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'), diff --git a/apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx b/apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx index 2e5c487611..1d67db4dbe 100644 --- a/apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx +++ b/apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx @@ -262,7 +262,9 @@ export const cardanoStakePoolMock: Wallet.StakePoolSearchResults = { saturation: Percent(0.0512), stake: undefined, size: undefined, - apy: Percent(0.013) + apy: Percent(0.013), + lastRos: Percent(1), + ros: Percent(2) }, owners: [ Wallet.Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'), diff --git a/packages/cardano/src/wallet/test/mocks/StakepoolSearchProviderStub.ts b/packages/cardano/src/wallet/test/mocks/StakepoolSearchProviderStub.ts index abacce350f..3a62f7ea9e 100644 --- a/packages/cardano/src/wallet/test/mocks/StakepoolSearchProviderStub.ts +++ b/packages/cardano/src/wallet/test/mocks/StakepoolSearchProviderStub.ts @@ -20,7 +20,9 @@ export const pools: Partial[] = [ livePledge: BigInt('2000000000'), saturation: Percent(0.211), size: undefined, - stake: undefined + stake: undefined, + lastRos: Percent(1), + ros: Percent(2) }, margin: { numerator: 2.01, @@ -58,7 +60,9 @@ export const pools: Partial[] = [ stake: { live: BigInt('201000000'), active: BigInt('201000000') - } + }, + lastRos: Percent(1), + ros: Percent(2) }, metadata: { name: 'THE AMSTERDAM NODE', @@ -92,7 +96,9 @@ export const pools: Partial[] = [ stake: { live: BigInt('77000000'), active: BigInt('77000000') - } + }, + lastRos: Percent(1), + ros: Percent(2) } }, { @@ -114,7 +120,9 @@ export const pools: Partial[] = [ stake: { live: BigInt('34000000'), active: BigInt('34000000') - } + }, + lastRos: Percent(1), + ros: Percent(2) }, metadata: { name: 'stakit.io Pool by TOBG', @@ -144,7 +152,9 @@ export const pools: Partial[] = [ stake: { live: BigInt('53000000'), active: BigInt('53000000') - } + }, + lastRos: Percent(1), + ros: Percent(2) }, margin: { numerator: 0.79, @@ -172,7 +182,9 @@ export const pools: Partial[] = [ stake: { live: BigInt('53000000'), active: BigInt('53000000') - } + }, + lastRos: Percent(1), + ros: Percent(2) }, metadata: { name: 'VEGASPool', @@ -202,7 +214,9 @@ const detailsForAll: PoolDetails = { stake: { live: BigInt('34000000'), active: BigInt('34000000') - } + }, + lastRos: Percent(1), + ros: Percent(2) }, relays: undefined, rewardAccount: Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'), diff --git a/packages/cardano/src/wallet/test/mocks/mock.ts b/packages/cardano/src/wallet/test/mocks/mock.ts index 723ea89e24..023b48fcec 100644 --- a/packages/cardano/src/wallet/test/mocks/mock.ts +++ b/packages/cardano/src/wallet/test/mocks/mock.ts @@ -32,7 +32,9 @@ export const stakePoolMock: Cardano.StakePool = { livePledge: BigInt('2000000000'), saturation: Percent(0.5), stake: undefined, - size: undefined + size: undefined, + lastRos: Percent(1), + ros: Percent(2) }, owners: [ Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'), diff --git a/packages/cardano/src/wallet/util/__tests__/stake-pool-transformer.test.ts b/packages/cardano/src/wallet/util/__tests__/stake-pool-transformer.test.ts index cd6dfaa23f..a8d343bf96 100644 --- a/packages/cardano/src/wallet/util/__tests__/stake-pool-transformer.test.ts +++ b/packages/cardano/src/wallet/util/__tests__/stake-pool-transformer.test.ts @@ -40,7 +40,9 @@ const cardanoStakePoolMock: StakePoolSearchResults = { saturation: Percent(0.0512), stake: undefined, size: undefined, - apy: Percent(0.013) + apy: Percent(0.013), + lastRos: Percent(1), + ros: Percent(2) }, owners: [ Cardano.RewardAccount('stake_test1uqrw9tjymlm8wrwq7jk68n6v7fs9qz8z0tkdkve26dylmfc2ux2hj'),