Merge pull request #7900 from LedgerHQ/bugfix/near-rewards

fix: remove rewards from near staking
LedgerHQ · Sep 27, 2024 · 08b19b0 · 08b19b0
2 parents fb747cd + 37d8fd9
commit 08b19b0
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 48 deletions.
diff --git a/.changeset/rare-yaks-deny.md b/.changeset/rare-yaks-deny.md
@@ -0,0 +1,8 @@
+---
+"@ledgerhq/coin-near": patch
+"ledger-live-desktop": patch
+"live-mobile": patch
+"@ledgerhq/live-common": patch
+---
+
+remove rewards feature from near
diff --git a/apps/ledger-live-desktop/src/renderer/families/near/Staking/Header.tsx b/apps/ledger-live-desktop/src/renderer/families/near/Staking/Header.tsx
@@ -32,9 +32,6 @@ export const Header = () => (
     <TableLine>
       <Trans i18nKey="near.stake.table.staked" />
     </TableLine>
-    <TableLine>
-      <Trans i18nKey="delegation.rewards" />
-    </TableLine>
     <TableLine>
       <Trans i18nKey="near.stake.table.pending" />
     </TableLine>

diff --git a/apps/ledger-live-desktop/src/renderer/families/near/Staking/Row.tsx b/apps/ledger-live-desktop/src/renderer/families/near/Staking/Row.tsx
@@ -88,7 +88,6 @@ export function Row({
     validatorId,
     staked,
     formattedAmount,
-    formattedRewards,
     formattedPending,
     formattedAvailable,
     validator,
@@ -151,11 +150,6 @@ export function Row({
           <Discreet>{formattedAmount}</Discreet>
         </Ellipsis>
       </Column>
-      <Column>
-        <Ellipsis>
-          <Discreet>{formattedRewards}</Discreet>
-        </Ellipsis>
-      </Column>
       <Column>
         <Ellipsis>
           <Discreet>{formattedPending}</Discreet>

diff --git a/apps/ledger-live-mobile/src/families/near/Staking/index.tsx b/apps/ledger-live-mobile/src/families/near/Staking/index.tsx
@@ -149,14 +149,6 @@ function StakingPositions({ account }: Props) {
               </LText>
             ),
           },
-          {
-            label: t("near.staking.drawer.rewards"),
-            Component: (
-              <LText numberOfLines={1} semiBold style={[styles.valueText]}>
-                {stakingPosition.formattedRewards ?? ""}
-              </LText>
-            ),
-          },
           {
             label: t("near.staking.drawer.pending"),
             Component: (

diff --git a/apps/ledger-live-mobile/src/locales/en/common.json b/apps/ledger-live-mobile/src/locales/en/common.json
@@ -5917,7 +5917,6 @@
         "status": "Status",
         "active": "Active",
         "inactive": "Inactive",
-        "rewards": "Rewards",
         "pending": "Pending",
         "available": "Withdrawable"
       },

diff --git a/libs/coin-modules/coin-near/src/account.ts b/libs/coin-modules/coin-near/src/account.ts
@@ -24,8 +24,8 @@ function formatAccountSpecifics(account: NearAccount): string {
     str += `\n    Staking Positions:\n`;
     str += nearResources.stakingPositions
       .map(
-        ({ validatorId, staked, pending, available, rewards }) =>
-          `        Validator ID: ${validatorId} | Staked: ${staked} | Pending Release: ${pending} | Available: ${available} | Rewards: ${rewards}`,
+        ({ validatorId, staked, pending, available }) =>
+          `        Validator ID: ${validatorId} | Staked: ${staked} | Pending Release: ${pending} | Available: ${available}`,
       )
       .join("\n");
   }

diff --git a/libs/coin-modules/coin-near/src/api/node.ts b/libs/coin-modules/coin-near/src/api/node.ts
@@ -217,7 +217,7 @@ export const getStakingPositions = async (
   const activeDelegatedStakeBalance = await account.getActiveDelegatedStakeBalance();
 
   const stakingPositions = await Promise.all(
-    activeDelegatedStakeBalance.stakedValidators.map(async ({ validatorId, amount: rawTotal }) => {
+    activeDelegatedStakeBalance.stakedValidators.map(async ({ validatorId }) => {
       const contract = new nearAPI.Contract(account, validatorId, {
         viewMethods: [
           "get_account_staked_balance",
@@ -248,12 +248,10 @@ export const getStakingPositions = async (
         available = unstaked;
         pending = new BigNumber(0);
       }
-      let rewards = new BigNumber(0);
 
       const staked = new BigNumber(rawStaked);
       available = new BigNumber(available);
       pending = new BigNumber(pending);
-      rewards = new BigNumber(rawTotal || "0").minus(staked);
 
       const stakingThreshold = getYoctoThreshold();
 
@@ -271,7 +269,6 @@ export const getStakingPositions = async (
         staked,
         available,
         pending,
-        rewards: rewards.gt(0) ? rewards : new BigNumber(0),
         validatorId,
       };
     }),

diff --git a/libs/coin-modules/coin-near/src/api/sdk.types.ts b/libs/coin-modules/coin-near/src/api/sdk.types.ts
@@ -69,7 +69,6 @@ export type NearStakingPosition = {
   staked: BigNumber;
   available: BigNumber;
   pending: BigNumber;
-  rewards: BigNumber;
   validatorId: string;
 };
 

diff --git a/libs/coin-modules/coin-near/src/logic.ts b/libs/coin-modules/coin-near/src/logic.ts
@@ -119,7 +119,6 @@ export const mapStakingPositions = (
     return {
       ...sp,
       formattedAmount: formatCurrencyUnit(unit, sp.staked, formatConfig),
-      formattedRewards: formatCurrencyUnit(unit, sp.rewards, formatConfig),
       formattedPending: formatCurrencyUnit(unit, sp.pending, formatConfig),
       formattedAvailable: formatCurrencyUnit(unit, sp.available, formatConfig),
       rank,

diff --git a/libs/coin-modules/coin-near/src/serialization.ts b/libs/coin-modules/coin-near/src/serialization.ts
@@ -10,15 +10,12 @@ export function toNearResourcesRaw(r: NearResources): NearResourcesRaw {
     pendingBalance: pendingBalance.toString(),
     availableBalance: availableBalance.toString(),
     storageUsageBalance: storageUsageBalance.toString(),
-    stakingPositions: stakingPositions.map(
-      ({ staked, validatorId, available, pending, rewards }) => ({
-        staked: staked.toString(),
-        available: available.toString(),
-        pending: pending.toString(),
-        rewards: rewards.toString(),
-        validatorId,
-      }),
-    ),
+    stakingPositions: stakingPositions.map(({ staked, validatorId, available, pending }) => ({
+      staked: staked.toString(),
+      available: available.toString(),
+      pending: pending.toString(),
+      validatorId,
+    })),
   };
 }
 
@@ -35,15 +32,12 @@ export function fromNearResourcesRaw(r: NearResourcesRaw): NearResources {
     pendingBalance: new BigNumber(pendingBalance),
     availableBalance: new BigNumber(availableBalance),
     storageUsageBalance: new BigNumber(storageUsageBalance),
-    stakingPositions: stakingPositions.map(
-      ({ staked, validatorId, available, pending, rewards }) => ({
-        staked: new BigNumber(staked),
-        available: new BigNumber(available),
-        pending: new BigNumber(pending),
-        rewards: new BigNumber(rewards),
-        validatorId,
-      }),
-    ),
+    stakingPositions: stakingPositions.map(({ staked, validatorId, available, pending }) => ({
+      staked: new BigNumber(staked),
+      available: new BigNumber(available),
+      pending: new BigNumber(pending),
+      validatorId,
+    })),
   };
 }
 

diff --git a/libs/coin-modules/coin-near/src/types.ts b/libs/coin-modules/coin-near/src/types.ts
@@ -54,7 +54,6 @@ export type NearResourcesRaw = {
     staked: string;
     available: string;
     pending: string;
-    rewards: string;
     validatorId: string;
   }[];
 };
@@ -73,7 +72,6 @@ export type NearValidatorItem = {
 
 export type NearMappedStakingPosition = NearStakingPosition & {
   formattedAmount: string;
-  formattedRewards: string;
   formattedPending: string;
   formattedAvailable: string;
   rank: number;

diff --git a/libs/ledger-live-common/src/families/near/__snapshots__/bridge.integration.test.ts.snap b/libs/ledger-live-common/src/families/near/__snapshots__/bridge.integration.test.ts.snap
@@ -18,7 +18,6 @@ exports[`near currency bridge scanAccounts near seed 1 1`] = `
         {
           "available": "10000000000000000001",
           "pending": "0",
-          "rewards": "10000000000000000001",
           "staked": "0",
           "validatorId": "figment.poolv1.near",
         },

diff --git a/libs/ledger-live-common/src/families/near/banner.test.ts b/libs/ledger-live-common/src/families/near/banner.test.ts
@@ -125,7 +125,6 @@ describe("near/banner", () => {
       staked: new BigNumber("1.29802125309300073830514e+23"),
       available: new BigNumber("1"),
       pending: new BigNumber("0"),
-      rewards: new BigNumber("1.462125309300073830515e+21"),
       validatorId: "vcap.poolv1.near",
     };
     jest.spyOn(preloadedData, "getCurrentNearPreloadData").mockReturnValue(validatorsMap);