Skip to content

Commit

Permalink
fix: Kylan/7.35.0 e446dc1 cherry pick (#12249)
Browse files Browse the repository at this point in the history
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

Co-authored-by: sahar-fehri <[email protected]>
  • Loading branch information
kylanhurt and sahar-fehri authored Nov 8, 2024
1 parent b078933 commit 5ed86bb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/components/Views/Wallet/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ import { useAccountSyncing } from '../../../util/notifications/hooks/useAccountS
import { PortfolioBalance } from '../../UI/Tokens/TokenList/PortfolioBalance';
import useCheckNftAutoDetectionModal from '../../hooks/useCheckNftAutoDetectionModal';
import useCheckMultiRpcModal from '../../hooks/useCheckMultiRpcModal';
import { selectContractBalances } from '../../../selectors/tokenBalancesController';

const createStyles = ({ colors, typography }: Theme) =>
StyleSheet.create({
Expand Down Expand Up @@ -182,6 +183,7 @@ const Wallet = ({
* ETH to current currency conversion rate
*/
const conversionRate = useSelector(selectConversionRate);
const contractBalances = useSelector(selectContractBalances);
/**
* Currency code of the currently-active currency
*/
Expand Down Expand Up @@ -589,6 +591,7 @@ const Wallet = ({
</>
</View>
);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
tokens,
accountBalanceByChainId,
Expand All @@ -604,6 +607,7 @@ const Wallet = ({
ticker,
conversionRate,
currentCurrency,
contractBalances,
]);
const renderLoader = useCallback(
() => (
Expand Down

0 comments on commit 5ed86bb

Please sign in to comment.