Skip to content

Commit 691c2c7

Browse files
therealemjytherealemjy
committed
feat: streamline how balance updates are shown on forms
1 parent 47f9b9d commit 691c2c7

48 files changed

Lines changed: 872 additions & 1305 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/clear-mails-shop.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@venusprotocol/evm": minor
3+
---
4+
5+
refactor logic to simulate user operations

‎.changeset/quiet-sites-end.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@venusprotocol/evm": minor
3+
---
4+
5+
streamline how balance updates are shown on forms

‎apps/evm/src/clients/api/queries/getSimulatedPool/index.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,16 @@ export const getSimulatedPool = async ({
3535
isUserPrime = false,
3636
userXvsStakedMantissa,
3737
}: GetSimulatedPoolInput): Promise<GetSimulatedPoolOutput> => {
38-
if (!pool || balanceMutations.length === 0) {
38+
// Filter out 0 balance mutations
39+
const filteredBalanceMutations = balanceMutations.filter(b => !b.amountTokens.isEqualTo(0));
40+
41+
if (!pool || filteredBalanceMutations.length === 0) {
3942
return {
4043
pool: undefined,
4144
};
4245
}
4346

44-
const { vaiMutations, assetMutations } = balanceMutations.reduce<{
47+
const { vaiMutations, assetMutations } = filteredBalanceMutations.reduce<{
4548
vaiMutations: VaiBalanceMutation[];
4649
assetMutations: AssetBalanceMutation[];
4750
}>(
@@ -93,7 +96,7 @@ export const getSimulatedPool = async ({
9396
let userBorrowBalanceTokens = asset.userBorrowBalanceTokens;
9497
let userBorrowBalanceCents = asset.userBorrowBalanceCents;
9598

96-
balanceMutations.forEach(({ action, amountTokens }) => {
99+
filteredBalanceMutations.forEach(({ action, amountTokens }) => {
97100
const amountCents = amountTokens.multipliedBy(asset.tokenPriceCents);
98101

99102
switch (action) {

‎apps/evm/src/clients/api/queries/useGetPools/__tests__/__snapshots__/index.eMode.spec.ts.snap‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
135135
"userBorrowBalanceCents": "0",
136136
"userBorrowBalanceTokens": "0",
137137
"userBorrowLimitSharePercentage": 0,
138-
"userCollateralFactor": 0.8,
139-
"userLiquidationThresholdPercentage": 88.00000000000001,
138+
"userCollateralFactor": 0,
139+
"userLiquidationThresholdPercentage": 0,
140140
"userSupplyBalanceCents": "0",
141141
"userSupplyBalanceTokens": "0",
142142
"userWalletBalanceCents": "0",
@@ -222,8 +222,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
222222
"userBorrowBalanceCents": "0",
223223
"userBorrowBalanceTokens": "0",
224224
"userBorrowLimitSharePercentage": 0,
225-
"userCollateralFactor": 0.8,
226-
"userLiquidationThresholdPercentage": 88.00000000000001,
225+
"userCollateralFactor": 0,
226+
"userLiquidationThresholdPercentage": 0,
227227
"userSupplyBalanceCents": "0",
228228
"userSupplyBalanceTokens": "0",
229229
"userWalletBalanceCents": "0",
@@ -281,8 +281,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
281281
"userBorrowBalanceCents": "0",
282282
"userBorrowBalanceTokens": "0",
283283
"userBorrowLimitSharePercentage": 0,
284-
"userCollateralFactor": 0.6,
285-
"userLiquidationThresholdPercentage": 66,
284+
"userCollateralFactor": 0,
285+
"userLiquidationThresholdPercentage": 0,
286286
"userSupplyBalanceCents": "0",
287287
"userSupplyBalanceTokens": "0",
288288
"userWalletBalanceCents": "0",
@@ -367,8 +367,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
367367
"userBorrowBalanceCents": "0",
368368
"userBorrowBalanceTokens": "0",
369369
"userBorrowLimitSharePercentage": 0,
370-
"userCollateralFactor": 0.8,
371-
"userLiquidationThresholdPercentage": 88.00000000000001,
370+
"userCollateralFactor": 0,
371+
"userLiquidationThresholdPercentage": 0,
372372
"userSupplyBalanceCents": "0",
373373
"userSupplyBalanceTokens": "0",
374374
"userWalletBalanceCents": "0",
@@ -453,8 +453,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
453453
"userBorrowBalanceCents": "0",
454454
"userBorrowBalanceTokens": "0",
455455
"userBorrowLimitSharePercentage": 0,
456-
"userCollateralFactor": 0.81,
457-
"userLiquidationThresholdPercentage": 89.10000000000001,
456+
"userCollateralFactor": 0,
457+
"userLiquidationThresholdPercentage": 0,
458458
"userSupplyBalanceCents": "0",
459459
"userSupplyBalanceTokens": "0",
460460
"userWalletBalanceCents": "0",
@@ -672,8 +672,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
672672
"userBorrowBalanceCents": "0",
673673
"userBorrowBalanceTokens": "0",
674674
"userBorrowLimitSharePercentage": 0,
675-
"userCollateralFactor": 0.8,
676-
"userLiquidationThresholdPercentage": 88.00000000000001,
675+
"userCollateralFactor": 0,
676+
"userLiquidationThresholdPercentage": 0,
677677
"userSupplyBalanceCents": "0",
678678
"userSupplyBalanceTokens": "0",
679679
"userWalletBalanceCents": "0",
@@ -738,8 +738,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
738738
"userBorrowBalanceCents": "0",
739739
"userBorrowBalanceTokens": "0",
740740
"userBorrowLimitSharePercentage": 0,
741-
"userCollateralFactor": 0.8,
742-
"userLiquidationThresholdPercentage": 88.00000000000001,
741+
"userCollateralFactor": 0,
742+
"userLiquidationThresholdPercentage": 0,
743743
"userSupplyBalanceCents": "0",
744744
"userSupplyBalanceTokens": "0",
745745
"userWalletBalanceCents": "0",
@@ -819,8 +819,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
819819
"userBorrowBalanceCents": "0",
820820
"userBorrowBalanceTokens": "0",
821821
"userBorrowLimitSharePercentage": 0,
822-
"userCollateralFactor": 0.8,
823-
"userLiquidationThresholdPercentage": 88.00000000000001,
822+
"userCollateralFactor": 0,
823+
"userLiquidationThresholdPercentage": 0,
824824
"userSupplyBalanceCents": "0",
825825
"userSupplyBalanceTokens": "0",
826826
"userWalletBalanceCents": "0",
@@ -869,8 +869,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
869869
"userBorrowBalanceCents": "0",
870870
"userBorrowBalanceTokens": "0",
871871
"userBorrowLimitSharePercentage": 0,
872-
"userCollateralFactor": 0.45,
873-
"userLiquidationThresholdPercentage": 49.50000000000001,
872+
"userCollateralFactor": 0,
873+
"userLiquidationThresholdPercentage": 0,
874874
"userSupplyBalanceCents": "0",
875875
"userSupplyBalanceTokens": "0",
876876
"userWalletBalanceCents": "0",
@@ -935,8 +935,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
935935
"userBorrowBalanceCents": "0",
936936
"userBorrowBalanceTokens": "0",
937937
"userBorrowLimitSharePercentage": 0,
938-
"userCollateralFactor": 0.75,
939-
"userLiquidationThresholdPercentage": 82.50000000000001,
938+
"userCollateralFactor": 0,
939+
"userLiquidationThresholdPercentage": 0,
940940
"userSupplyBalanceCents": "0",
941941
"userSupplyBalanceTokens": "0",
942942
"userWalletBalanceCents": "0",
@@ -1029,8 +1029,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
10291029
"userBorrowBalanceCents": "0",
10301030
"userBorrowBalanceTokens": "0",
10311031
"userBorrowLimitSharePercentage": 0,
1032-
"userCollateralFactor": 0.65,
1033-
"userLiquidationThresholdPercentage": 71.5,
1032+
"userCollateralFactor": 0,
1033+
"userLiquidationThresholdPercentage": 0,
10341034
"userSupplyBalanceCents": "0",
10351035
"userSupplyBalanceTokens": "0",
10361036
"userWalletBalanceCents": "0",
@@ -1094,8 +1094,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
10941094
"userBorrowBalanceCents": "0",
10951095
"userBorrowBalanceTokens": "0",
10961096
"userBorrowLimitSharePercentage": 0,
1097-
"userCollateralFactor": 0.8,
1098-
"userLiquidationThresholdPercentage": 88.00000000000001,
1097+
"userCollateralFactor": 0,
1098+
"userLiquidationThresholdPercentage": 0,
10991099
"userSupplyBalanceCents": "0",
11001100
"userSupplyBalanceTokens": "0",
11011101
"userWalletBalanceCents": "0",
@@ -1160,8 +1160,8 @@ exports[`useGetPools > fetches and formats E-mode groups associated with each po
11601160
"userBorrowBalanceCents": "0",
11611161
"userBorrowBalanceTokens": "0",
11621162
"userBorrowLimitSharePercentage": 0,
1163-
"userCollateralFactor": 0.8,
1164-
"userLiquidationThresholdPercentage": 88.00000000000001,
1163+
"userCollateralFactor": 0,
1164+
"userLiquidationThresholdPercentage": 0,
11651165
"userSupplyBalanceCents": "0",
11661166
"userSupplyBalanceTokens": "0",
11671167
"userWalletBalanceCents": "0",

0 commit comments

Comments
 (0)