diff --git a/app/components/Views/Settings/ExperimentalSettings/__snapshots__/index.test.tsx.snap b/app/components/Views/Settings/ExperimentalSettings/__snapshots__/index.test.tsx.snap index 3083aca97a5..18f687c5457 100644 --- a/app/components/Views/Settings/ExperimentalSettings/__snapshots__/index.test.tsx.snap +++ b/app/components/Views/Settings/ExperimentalSettings/__snapshots__/index.test.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ExperimentalSettings should render blockaid togggle button 1`] = ` +exports[`ExperimentalSettings should render blockaid toggle button 1`] = ` Array [ ({ createNavigatorFactory: () => ({}), })); +jest.mock('../../../../util/blockaid', () => ({ + showBlockaidUI: jest.fn().mockReturnValue(true), +})); + const store = mockStore(initialState); const setOptions = jest.fn(); @@ -47,7 +53,7 @@ describe('ExperimentalSettings', () => { expect(wrapper).toMatchSnapshot(); }); - it('should render blockaid togggle button', async () => { + it('should render blockaid toggle button', async () => { const wrapper = render( diff --git a/app/components/Views/Settings/ExperimentalSettings/index.tsx b/app/components/Views/Settings/ExperimentalSettings/index.tsx index 50b358e9e12..577019f176d 100644 --- a/app/components/Views/Settings/ExperimentalSettings/index.tsx +++ b/app/components/Views/Settings/ExperimentalSettings/index.tsx @@ -1,16 +1,18 @@ import React, { FC, useCallback, useEffect } from 'react'; import { ScrollView, StyleSheet, Switch, Text, View } from 'react-native'; import { useDispatch, useSelector } from 'react-redux'; + import { strings } from '../../../../../locales/i18n'; import { setSecurityAlertsEnabled } from '../../../../actions/experimental'; import { - fontStyles, colors as importedColors, + fontStyles, } from '../../../../styles/common'; import { useTheme } from '../../../../util/theme'; import { getNavigationOptionsTitle } from '../../../UI/Navbar'; import StyledButton from '../../../UI/StyledButton'; import SECURITY_ALERTS_TOGGLE_TEST_ID from './constants'; +import { showBlockaidUI } from '../../../../util/blockaid'; const createStyles = (colors: any) => StyleSheet.create({ @@ -197,7 +199,7 @@ const ExperimentalSettings = ({ navigation, route }: Props) => { return ( - + {showBlockaidUI() && } ); }; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6c58eb29f0b..2e3c45a113e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -828,11 +828,11 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - boost: a7c83b31436843459a1961bfd74b96033dc77234 + boost: 57d2868c099736d80fcd648bf211b4431e51a558 Branch: 4ac024cb3c29b0ef628048694db3c4cfa679beb0 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 + DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 FBLazyVector: a83ceaa8a8581003a623facdb3c44f6d4f342ac5 FBReactNativeSpec: 85eee79837cb797ab6176f0243a2b40511c09158 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 @@ -845,7 +845,7 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 5337263514dd6f09803962437687240c5dc39aa4 + glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b JitsiWebRTC: f441eb0e2d67f0588bf24e21c5162e97342714fb libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 lottie-ios: 016449b5d8be0c3dcbcfa0a9988469999cd04c5d