Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Show Staked ETH position in mobile homepage along with other tokens #4879

Merged
merged 7 commits into from
Nov 4, 2024
Merged

feat: Show Staked ETH position in mobile homepage along with other tokens #4879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9841889
feat: add ability to include Staked ETH balances in AccountTrackerCon…
nickewansmith Oct 28, 2024
a459bdd
chore: fix unit tests
nickewansmith Oct 30, 2024
cb9a55c
chore: add unit tests and clean up
nickewansmith Oct 31, 2024
bda919b
chore: merge 41.0.0 and update for version
nickewansmith Oct 31, 2024
f3a3c2e
chore(feedback): remove exchange rate calc not needed
nickewansmith Oct 31, 2024
7eeffae
chore: add jsdoc for getStakedBalanceForChain
nickewansmith Nov 1, 2024
eb10fd0
Merge branch 'main' into STAKE-817-fe-show-staked-eth-position-in-hom…
nickewansmith Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: merge 41.0.0 and update for version
  • Loading branch information
@nickewansmith
nickewansmith committed Nov 1, 2024
commit bda919b645a1db1ba7f8932f31debb48586729b0
6 changes: 3 additions & 3 deletions packages/assets-controllers/src/AssetsContractController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ describe('AssetsContractController', () => {
it('should get the staked ethereum balance for an address', async () => {
const { assetsContract, messenger, provider, networkClientConfiguration } =
await setupAssetContractControllers();
assetsContract.configure({ provider });
assetsContract.setProvider(provider);

mockNetworkWithDefaultChainId({
networkClientConfiguration,
Expand Down Expand Up @@ -1340,7 +1340,7 @@ describe('AssetsContractController', () => {
const errorSpy = jest.spyOn(console, 'error');
const { assetsContract, messenger, provider, networkClientConfiguration } =
await setupAssetContractControllers();
assetsContract.configure({ provider });
assetsContract.setProvider(provider);

mockNetworkWithDefaultChainId({
networkClientConfiguration,
Expand Down Expand Up @@ -1387,7 +1387,7 @@ describe('AssetsContractController', () => {
});
const { assetsContract, messenger, provider } =
await setupAssetContractControllers();
assetsContract.configure({ provider });
assetsContract.setProvider(provider);

const balance = await assetsContract.getStakedBalanceForChain(
TEST_ACCOUNT_PUBLIC_ADDRESS,
Expand Down
4 changes: 2 additions & 2 deletions packages/assets-controllers/src/AssetsContractController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,8 +707,8 @@ export class AssetsContractController {
address: string,
networkClientId?: NetworkClientId,
): Promise<StakedBalance> {
const chainId = this.getChainId(networkClientId);
const provider = this.getProvider(networkClientId);
const chainId = this.#getCorrectChainId(networkClientId);
const provider = this.#getCorrectProvider(networkClientId);

// balance defaults to zero
let balance: BigNumber = BigNumber.from(0);
Expand Down
4 changes: 2 additions & 2 deletions packages/assets-controllers/src/AssetsContractControllerWithNetworkClientId.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ describe('AssetsContractController with NetworkClientId', () => {
it('should get the staked ethereum balance for an address', async () => {
const { assetsContract, messenger, provider, networkClientConfiguration } =
await setupAssetContractControllers();
assetsContract.configure({ provider });
assetsContract.setProvider(provider);

mockNetworkWithDefaultChainId({
networkClientConfiguration,
Expand Down Expand Up @@ -966,7 +966,7 @@ describe('AssetsContractController with NetworkClientId', () => {

it('should default staked ethereum balance to undefined if network is not supported', async () => {
const { assetsContract, provider } = await setupAssetContractControllers();
assetsContract.configure({ provider });
assetsContract.setProvider(provider);

const balance = await assetsContract.getStakedBalanceForChain(
TEST_ACCOUNT_PUBLIC_ADDRESS,
Expand Down