Skip to content

Commit

Permalink
fix: (MMS-1789) bridge api called when external services disabled (#2…
Browse files Browse the repository at this point in the history
…9077)

<!--
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?
-->

Bridge API gets called even when all privacy toggles are disabled:

https://bridge.api.cx.metamask.io/getAllFeatureFlags

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29077?quickstart=1)

## **Related issues**

Fixes: checks if external services are enabled (Basic Functionality
toggle) before calling this API in the useBridging hook.

## **Manual testing steps**

1. Start onboarding through the MetaMask wallet.
2. During onboarding, toggle the security feature 'Basic Functionality'
OFF.
3. Observe network calls to ensure this endpoint is not hit.

## **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**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] 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-extension/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.
  • Loading branch information
ghgoodreau authored Dec 12, 2024
1 parent 7ac4999 commit 0a790f5
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion ui/hooks/bridge/useBridging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
getIsBridgeEnabled,
getMetaMetricsId,
getParticipateInMetaMetrics,
getUseExternalServices,
SwapsEthToken,
///: END:ONLY_INCLUDE_IF
} from '../../selectors';
Expand Down Expand Up @@ -45,14 +46,17 @@ const useBridging = () => {
const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
const providerConfig = useSelector(getProviderConfig);
const keyring = useSelector(getCurrentKeyring);
const isExternalServicesEnabled = useSelector(getUseExternalServices);
// @ts-expect-error keyring type is wrong maybe?
const usingHardwareWallet = isHardwareKeyring(keyring.type);

const isBridgeSupported = useSelector(getIsBridgeEnabled);
const isBridgeChain = useSelector(getIsBridgeChain);

useEffect(() => {
dispatch(setBridgeFeatureFlags());
if (isExternalServicesEnabled) {
dispatch(setBridgeFeatureFlags());
}
}, [dispatch, setBridgeFeatureFlags]);

const openBridgeExperience = useCallback(
Expand Down

0 comments on commit 0a790f5

Please sign in to comment.