Merge branch 'main' of github.com:MetaMask/metamask-mobile into siwe_…

…support
MetaMask · Feb 4, 2025 · f98bdfe · f98bdfe
2 parents e2559b9 + 518eeef
commit f98bdfe
Show file tree

Hide file tree

Showing 61 changed files with 6,815 additions and 1,106 deletions.
diff --git a/.github/workflows/create-release-pr-v2.yml b/.github/workflows/create-release-pr-v2.yml
@@ -20,7 +20,7 @@ jobs:
 
   create-release-pr:
     needs: generate-build-version
-    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@f8467f14f7d09c5b980565f15ebc8003b0272138
+    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@4f594ca7d90378da66b7efce987eff379934524b
     with:
       platform: mobile
       base-branch: ${{ inputs.base-branch }}

diff --git a/app/components/UI/Stake/__mocks__/mockData.ts b/app/components/UI/Stake/__mocks__/mockData.ts
@@ -130,6 +130,8 @@ export const MOCK_STAKING_API_SERVICE: Partial<StakingApiService> = {
   getPooledStakes: jest.fn(),
   getVaultData: jest.fn(),
   getPooledStakingEligibility: jest.fn(),
+  getVaultDailyApys: jest.fn(),
+  getVaultApyAverages: jest.fn(),
   baseUrl: 'https://staking.api.com',
 };
 
@@ -151,7 +153,6 @@ const MOCK_POOLED_STAKING_CONTRACT_SERVICE = {
 
 export const MOCK_POOL_STAKING_SDK: Stake = {
   stakingContract: MOCK_POOLED_STAKING_CONTRACT_SERVICE,
-  stakingApiService: MOCK_STAKING_API_SERVICE as StakingApiService,
   sdkType: StakingType.POOLED,
   setSdkType: jest.fn(),
 };
diff --git a/...nents/UI/Stake/components/EarnTokenListItem/__snapshots__/EarnTokenListItem.test.tsx.snap b/...nents/UI/Stake/components/EarnTokenListItem/__snapshots__/EarnTokenListItem.test.tsx.snap
@@ -178,7 +178,7 @@ exports[`EarnTokenListItem render matches snapshot 1`] = `
         }
       }
     >
-      3.0% [missing "en.stake.apr" translation]
+      3.0% APR
     </Text>
     <Text
       accessibilityRole="text"

diff --git a/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.styles.ts b/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.styles.ts
diff --git a/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.test.tsx b/app/components/UI/Stake/components/LearnMoreModal/LearnMoreModal.test.tsx
-Original file line number
+Diff line change
@@ Expand Up / @@ -178,7 +178,7 @@ exports[`EarnTokenListItem render matches snapshot 1`] = ` @@
             }
           }
         >
-.0% [missing "en.stake.apr" translation]
+.0% APR
         </Text>
         <Text
           accessibilityRole="text"
@@ Expand Down @@