From cb29c20b3f883fd88a21be71ab482812b7f84158 Mon Sep 17 00:00:00 2001
From: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
Date: Wed, 22 Jun 2022 22:00:42 -0400
Subject: [PATCH] Revert #4568 Changes (#4573)
* Revert "[UPGRADE] - update dependencies (#4568)"
This reverts commit e7c239190fb3b2e43759c52a3e728efef355e029.
* Add audit fixes
---
CHANGELOG.md | 27 --
android/app/build.gradle | 4 +-
.../EditPermission/index.js | 4 +-
app/components/UI/DrawerView/index.js | 24 +-
.../Views/AmountToBuy.tsx | 21 +-
.../components/ErrorView.tsx | 46 +--
app/components/UI/NetworkModal/index.tsx | 2 +
.../UI/Swaps/components/InfoModal.js | 66 ++--
app/components/UI/WhatsNewModal/index.js | 299 ++++++------------
app/components/UI/WhatsNewModal/types.ts | 58 ----
.../UI/WhatsNewModal/whatsNewList.js | 25 ++
.../UI/WhatsNewModal/whatsNewList.ts | 40 ---
.../NetworksSettings/NetworkSettings/index.js | 4 +-
app/images/whats_new_onramp_agg_dark.png | Bin 7230 -> 0 bytes
app/images/whats_new_onramp_agg_dark@2x.png | Bin 18593 -> 0 bytes
app/images/whats_new_onramp_agg_dark@3x.png | Bin 30286 -> 0 bytes
app/images/whats_new_onramp_agg_light.png | Bin 6747 -> 0 bytes
app/images/whats_new_onramp_agg_light@2x.png | Bin 17294 -> 0 bytes
app/images/whats_new_onramp_agg_light@3x.png | Bin 27877 -> 0 bytes
app/util/number/index.js | 1 -
bitrise.yml | 4 +-
ios/MetaMask.xcodeproj/project.pbxproj | 8 +-
locales/languages/en.json | 11 +-
package.json | 2 +-
yarn.lock | 10 +-
25 files changed, 197 insertions(+), 459 deletions(-)
delete mode 100644 app/components/UI/WhatsNewModal/types.ts
create mode 100644 app/components/UI/WhatsNewModal/whatsNewList.js
delete mode 100644 app/components/UI/WhatsNewModal/whatsNewList.ts
delete mode 100644 app/images/whats_new_onramp_agg_dark.png
delete mode 100644 app/images/whats_new_onramp_agg_dark@2x.png
delete mode 100644 app/images/whats_new_onramp_agg_dark@3x.png
delete mode 100644 app/images/whats_new_onramp_agg_light.png
delete mode 100644 app/images/whats_new_onramp_agg_light@2x.png
delete mode 100644 app/images/whats_new_onramp_agg_light@3x.png
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30f1683f95e..a6248f1bdb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,33 +1,6 @@
# Changelog
## Current Main Branch
-- [#4506](https://github.com/MetaMask/metamask-mobile/pull/4506): [IMPROVEMENT] Add OnRamp aggregator translations
-- [#4389](https://github.com/MetaMask/metamask-mobile/pull/4389): [FEAT] Easy delete data
-- [#4510](https://github.com/MetaMask/metamask-mobile/pull/4510): [IMPROVEMENT] Update RPC URL for xDai
-- [#4269](https://github.com/MetaMask/metamask-mobile/pull/4269): [IMPROVEMENT] Show amount being approved by default on approval screens
-- [#4495](https://github.com/MetaMask/metamask-mobile/pull/4495): [FIX] WalletConnect Icon on connect screen
-- [#4505](https://github.com/MetaMask/metamask-mobile/pull/4505): [FIX] Updated new rpcUrl of gnosischain on test file
-- [#4442](https://github.com/MetaMask/metamask-mobile/pull/4442): [FIX] Skip to amount to buy when region is selected
-- [#4501](https://github.com/MetaMask/metamask-mobile/pull/4501): [FIX] Add accesible false to pressable group preventing VoiceOver interaction
-- [#4247](https://github.com/MetaMask/metamask-mobile/pull/4247): [IMPROVEMENT] Add rounded corners to svg NFTs
-- [#4470](https://github.com/MetaMask/metamask-mobile/pull/4470): [FIX] Add minimum required params to orders
-- [#4469](https://github.com/MetaMask/metamask-mobile/pull/4469): [FIX] Displaying notification when state changes
-- [#4443](https://github.com/MetaMask/metamask-mobile/pull/4443): [FIX] Wrong analytics property for region event
-- [#4468](https://github.com/MetaMask/metamask-mobile/pull/4468): [FIX] Wrong amount out for onramp analytics
-- [#4418](https://github.com/MetaMask/metamask-mobile/pull/4418): [IMPROVEMENT] Address Verification
-- [#3783](https://github.com/MetaMask/metamask-mobile/pull/3783): [FEAT] Add custom networks
-- [#4131](https://github.com/MetaMask/metamask-mobile/pull/4131): [FIX] Add method for crypto that are not in ISO4217
-- [#4187](https://github.com/MetaMask/metamask-mobile/pull/4187): [IMPROVEMENT] Update copy in Edit & Advance Screens
-- [#4060](https://github.com/MetaMask/metamask-mobile/pull/4060): [FIX] Avoid canceling transactions after submission
-- [#4478](https://github.com/MetaMask/metamask-mobile/pull/4478): [IMPROVEMENT] Video subtitles
-- [#4429](https://github.com/MetaMask/metamask-mobile/pull/4429): [FIX] Prompt camera permission
-- [#4440](https://github.com/MetaMask/metamask-mobile/pull/4440): [FIX] Updating instances of "Metamask" to "MetaMask"
-- [#4438](https://github.com/MetaMask/metamask-mobile/pull/4438): [FIX] Resolved spelling mistake
-- [#4445](https://github.com/MetaMask/metamask-mobile/pull/4445): [FIX] Adding resolutions for security critical packages
-- [#3943](https://github.com/MetaMask/metamask-mobile/pull/3943): [FIX] Remove old gas estimation
-- [#4070](https://github.com/MetaMask/metamask-mobile/pull/4070): [IMPROVEMENT] Update SelectQRAccounts UI
-- [#4178](https://github.com/MetaMask/metamask-mobile/pull/4178): [FIX] Prevent crash when funds warning is pressed
-- [#4367](https://github.com/MetaMask/metamask-mobile/pull/4367): [IMPROVEMENT] Make text hex data selectable
## 5.2.0 - May 17, 2022
- [#4349](https://github.com/MetaMask/metamask-mobile/pull/4349): [FIX] Subtitle mapping
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 0cfdb7668e6..df9c7050835 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -160,8 +160,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 926
- versionName "5.3.0"
+ versionCode 913
+ versionName "5.2.0"
multiDexEnabled true
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy "minReactNative", "minReactNative46"
diff --git a/app/components/UI/ApproveTransactionReview/EditPermission/index.js b/app/components/UI/ApproveTransactionReview/EditPermission/index.js
index 72464018a73..f1460a00d59 100644
--- a/app/components/UI/ApproveTransactionReview/EditPermission/index.js
+++ b/app/components/UI/ApproveTransactionReview/EditPermission/index.js
@@ -10,7 +10,6 @@ import Device from '../../../../util/device';
import ErrorMessage from '../../../Views/SendFlow/ErrorMessage';
import { useAppThemeFromContext, mockTheme } from '../../../../util/theme';
import formatNumber from '../../../../util/formatNumber';
-import { INTEGER_OR_FLOAT_REGEX } from '../../../../util/number';
const createStyles = (colors) =>
StyleSheet.create({
@@ -121,8 +120,7 @@ function EditPermission({
const displayErrorMessage = useMemo(
() =>
- (!spendLimitUnlimitedSelected &&
- !INTEGER_OR_FLOAT_REGEX.test(spendLimitCustomValue)) ||
+ !spendLimitUnlimitedSelected &&
Number(minimumSpendLimit) > spendLimitCustomValue,
[spendLimitUnlimitedSelected, spendLimitCustomValue, minimumSpendLimit],
);
diff --git a/app/components/UI/DrawerView/index.js b/app/components/UI/DrawerView/index.js
index cd344f3b674..a39b548e161 100644
--- a/app/components/UI/DrawerView/index.js
+++ b/app/components/UI/DrawerView/index.js
@@ -1162,7 +1162,7 @@ class DrawerView extends PureComponent {
currentRoute,
networkOnboarding,
networkOnboardedState,
- switchedNetwork: { networkUrl, networkStatus },
+ switchedNetwork,
networkModalVisible,
} = this.props;
const colors = this.context.colors || mockTheme.colors;
@@ -1196,19 +1196,9 @@ class DrawerView extends PureComponent {
const fiatBalanceStr = renderFiat(this.currentBalance, currentCurrency);
const accountName = isDefaultAccountName(name) && ens ? ens : name;
const checkIfCustomNetworkExists = networkOnboardedState.filter(
- (item) => item.network === sanitizeUrl(networkUrl),
+ (item) => item.network === sanitizeUrl(switchedNetwork.networkUrl),
);
- const networkSwitchedAndInWalletView =
- currentRoute === 'WalletView' &&
- networkStatus &&
- checkIfCustomNetworkExists.length === 0;
-
- const canShowNetworkInfoModal =
- showModal ||
- networkOnboarding.showNetworkOnboarding ||
- networkSwitchedAndInWalletView;
-
return (
@@ -1375,9 +1365,7 @@ class DrawerView extends PureComponent {
isVisible={
networkModalVisible || networkOnboarding.showNetworkOnboarding
}
- onBackdropPress={
- canShowNetworkInfoModal ? null : this.toggleNetworksModal
- }
+ onBackdropPress={showModal ? null : this.toggleNetworksModal}
onBackButtonPress={showModal ? null : this.toggleNetworksModa}
onSwipeComplete={showModal ? null : this.toggleNetworksModa}
swipeDirection={'down'}
@@ -1385,7 +1373,11 @@ class DrawerView extends PureComponent {
backdropColor={colors.overlay.default}
backdropOpacity={1}
>
- {canShowNetworkInfoModal ? (
+ {showModal ||
+ networkOnboarding.showNetworkOnboarding ||
+ (currentRoute === 'WalletView' &&
+ switchedNetwork.networkStatus &&
+ checkIfCustomNetworkExists.length === 0) ? (
{
{
region: selectedRegion?.name,
},
)}
- ctaLabel={strings('fiat_on_ramp_aggregator.change_payment_method')}
- ctaOnPress={showPaymentMethodsModal as () => void}
+ ctaLabel={strings('fiat_on_ramp_aggregator.try_different_region')}
+ ctaOnPress={toggleRegionModal as () => void}
/>
- void}
- title={strings('fiat_on_ramp_aggregator.select_payment_method')}
- paymentMethods={filteredPaymentMethods}
- selectedPaymentMethodId={selectedPaymentMethodId}
- onItemPress={handleChangePaymentMethod}
- location={'Amount to Buy Screen'}
+ void}
+ onRegionPress={handleRegionPress}
/>
);
diff --git a/app/components/UI/FiatOnRampAggregator/components/ErrorView.tsx b/app/components/UI/FiatOnRampAggregator/components/ErrorView.tsx
index 68a8d2d7fd0..889a82957bf 100644
--- a/app/components/UI/FiatOnRampAggregator/components/ErrorView.tsx
+++ b/app/components/UI/FiatOnRampAggregator/components/ErrorView.tsx
@@ -12,8 +12,6 @@ import { Colors } from '../../../../util/theme/models';
const Text = BaseText as any;
const Title = BaseTitle as any;
-type IconType = 'error' | 'info';
-
const createStyles = (colors: Colors) =>
StyleSheet.create({
screen: {
@@ -33,17 +31,12 @@ const createStyles = (colors: Colors) =>
row: {
marginVertical: 1,
},
- icon: {
+ errorIcon: {
+ color: colors.error.default,
fontSize: 38,
marginVertical: 4,
textAlign: 'center',
},
- errorIcon: {
- color: colors.error.default,
- },
- infoIcon: {
- color: colors.primary.default,
- },
});
interface Props {
@@ -51,37 +44,9 @@ interface Props {
title?: string; // The error title, default will be "Error" if not provided (Optional)
ctaLabel?: string; // The CTA button label, default will be "Try again" (Optional)
ctaOnPress?: () => any; // The optional callback to be invoked when pressing the CTA button (Optional)
- icon?: IconType;
-}
-
-function ErrorIcon({ icon }: { icon: IconType }) {
- const { colors } = useTheme();
- const styles = createStyles(colors);
- let name, style;
- switch (icon) {
- case 'info': {
- name = 'information-outline';
- style = styles.infoIcon;
- break;
- }
- case 'error':
- default: {
- name = 'close-circle-outline';
- style = styles.errorIcon;
- break;
- }
- }
-
- return ;
}
-function ErrorView({
- description,
- title,
- ctaLabel,
- ctaOnPress,
- icon = 'error',
-}: Props) {
+function ErrorView({ description, title, ctaLabel, ctaOnPress }: Props) {
const { colors } = useTheme();
const styles = createStyles(colors);
@@ -93,7 +58,10 @@ function ErrorView({
-
+
diff --git a/app/components/UI/NetworkModal/index.tsx b/app/components/UI/NetworkModal/index.tsx
index 7e082f7ca66..5d6256515dd 100644
--- a/app/components/UI/NetworkModal/index.tsx
+++ b/app/components/UI/NetworkModal/index.tsx
@@ -232,6 +232,8 @@ const NetworkModals = (props: NetworkProps) => {
isVisible
toggleModal={showToolTip}
message={strings('networks.provider')}
+ clickText={undefined}
+ clickPress={undefined}
/>
)}
diff --git a/app/components/UI/Swaps/components/InfoModal.js b/app/components/UI/Swaps/components/InfoModal.js
index 432538763d0..d910c5b55e9 100644
--- a/app/components/UI/Swaps/components/InfoModal.js
+++ b/app/components/UI/Swaps/components/InfoModal.js
@@ -50,12 +50,8 @@ const createStyles = (colors) =>
paddingHorizontal: 20,
},
messageLimit: {
- width: '80%',
- },
- infoContainer: {
- flexDirection: 'row',
- justifyContent: 'space-between',
- width: '100%',
+ width: '90%',
+ marginVertical: 10,
},
});
@@ -66,41 +62,12 @@ function InfoModal({
toggleModal,
message,
propagateSwipe,
- urlText,
- url,
+ clickText,
+ clickPress,
}) {
const { colors } = useAppThemeFromContext() || mockTheme;
const styles = createStyles(colors);
- const CloseButton = () => (
-
-
-
- );
-
- const InfoView = () => {
- if (!message) {
- return ;
- }
-
- return (
-
-
- {message}
- {urlText && (
-
- {urlText}
-
- )}
-
-
-
- );
- };
-
return (
{title && {title}}
-
+ {message && (
+
+ {message}
+ {clickText && (
+
+ {clickText}
+
+ )}
+
+ )}
+ {!message && (
+
+
+
+ )}
{body && {body}}
@@ -130,8 +114,8 @@ InfoModal.propTypes = {
toggleModal: PropTypes.func,
propagateSwipe: PropTypes.bool,
message: PropTypes.string,
- urlText: PropTypes.string,
- url: PropTypes.func,
+ clickText: PropTypes.string,
+ clickPress: PropTypes.func,
};
export default InfoModal;
diff --git a/app/components/UI/WhatsNewModal/index.js b/app/components/UI/WhatsNewModal/index.js
index 030dd1fa6bb..1091250e291 100644
--- a/app/components/UI/WhatsNewModal/index.js
+++ b/app/components/UI/WhatsNewModal/index.js
@@ -1,13 +1,13 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useState } from 'react';
import {
StyleSheet,
View,
Text,
TouchableOpacity,
ScrollView,
+ TouchableWithoutFeedback,
Image,
InteractionManager,
- TouchableWithoutFeedback,
} from 'react-native';
import { useNavigationState } from '@react-navigation/native';
import ActionModal from '../ActionModal';
@@ -23,72 +23,37 @@ import {
WHATS_NEW_APP_VERSION_SEEN,
} from '../../../constants/storage';
import compareVersions from 'compare-versions';
+import scaling from '../../../util/scaling';
import PropTypes from 'prop-types';
import { findRouteNameFromNavigatorState } from '../../../util/general';
-import StyledButton from '../StyledButton';
-import {
- useAppThemeFromContext,
- mockTheme,
- useAssetFromTheme,
-} from '../../../util/theme';
-const modalMargin = 24;
-const modalPadding = 24;
-const screenWidth = Device.getDeviceWidth();
-const screenHeight = Device.getDeviceHeight();
-const slideItemWidth = screenWidth - modalMargin * 2;
-const maxSlideItemHeight = screenHeight - 200;
-const slideImageWidth = slideItemWidth - modalPadding * 2;
-const imageAspectRatio = 128 / 264;
-const slideImageHeight = slideImageWidth * imageAspectRatio;
+import { useAppThemeFromContext, mockTheme } from '../../../util/theme';
const createStyles = (colors) =>
StyleSheet.create({
wrapper: {
marginTop: 24,
+ maxHeight: Device.getDeviceHeight() - 200,
flex: 1,
- overflow: 'hidden',
- },
- slideContent: {
- maxHeight: maxSlideItemHeight,
- },
- slideItemContainer: {
- flex: 1,
- width: slideItemWidth,
- paddingHorizontal: modalPadding,
- },
- slideItemContainerContent: {
- paddingBottom: 16,
- flexGrow: 1,
},
- slide: {
- flex: 1,
- },
- progessContainer: {
- flexDirection: 'row',
- alignSelf: 'center',
+ button: {
marginTop: 16,
- marginBottom: 8,
- },
- slideCircle: {
- width: 8,
- height: 8,
- borderRadius: 8 / 2,
- backgroundColor: colors.icon.default,
- opacity: 0.4,
- marginHorizontal: 8,
- },
- slideSolidCircle: {
- opacity: 1,
+ borderColor: colors.primary.default,
+ borderWidth: 1,
+ borderRadius: 50,
+ padding: 12,
+ paddingHorizontal: 34,
},
- button: {
- marginTop: 8,
+ buttonText: {
+ color: colors.primary.default,
+ textAlign: 'center',
+ ...fontStyles.normal,
},
header: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
- marginBottom: 20,
- paddingHorizontal: modalPadding,
+ marginBottom: 24,
+ paddingHorizontal: 24,
},
headerCenterAux: {
flex: 1,
@@ -102,40 +67,48 @@ const createStyles = (colors) =>
fontSize: 18,
color: colors.text.default,
},
- slideImageContainer: {
+ newFeatureImageContainer: {
flexDirection: 'row',
+ flex: 1,
borderRadius: 10,
marginBottom: 24,
},
- slideImage: {
+ newFeatureImage: {
flex: 1,
borderRadius: 10,
- width: slideImageWidth,
- height: slideImageHeight,
+ width: scaling.scale(280, { baseModel: 1 }),
+ height: scaling.scale(128, { baseModel: 1 }),
},
- slideTitle: {
+ newFeatureTitle: {
...fontStyles.bold,
fontSize: 16,
marginBottom: 12,
+ textAlign: 'center',
color: colors.text.default,
},
- slideDescription: {
+ newFeatureText: {
...fontStyles.normal,
fontSize: 14,
lineHeight: 20,
+ textAlign: 'center',
color: colors.text.default,
- marginBottom: 24,
+ marginBottom: 12,
+ },
+ buttonContainer: {
+ flexDirection: 'row',
+ justifyContent: 'center',
+ },
+ featureContainer: {
+ marginBottom: 25,
+ paddingHorizontal: 24,
},
});
const WhatsNewModal = (props) => {
- const scrollViewRef = useRef();
const [featuresToShow, setFeaturesToShow] = useState(null);
const [show, setShow] = useState(false);
const routes = useNavigationState((state) => state.routes);
- const [currentSlide, setCurrentSlide] = useState(0);
const { colors } = useAppThemeFromContext() || mockTheme;
- const imageKey = useAssetFromTheme('light', 'dark');
const styles = createStyles(colors);
useEffect(() => {
@@ -148,39 +121,44 @@ const WhatsNewModal = (props) => {
const lastAppVersion = await AsyncStorage.getItem(LAST_APP_VERSION);
const isUpdate = !!lastAppVersion && currentAppVersion !== lastAppVersion;
- const seen =
- !!whatsNewAppVersionSeen &&
- compareVersions.compare(
- whatsNewAppVersionSeen,
- whatsNew.minAppVersion,
- '>=',
- );
+ let showFeatures = [];
- if (seen) return;
+ whatsNew.forEach((feature) => {
+ const seen =
+ !!whatsNewAppVersionSeen &&
+ compareVersions.compare(
+ whatsNewAppVersionSeen,
+ feature.minAppVersion,
+ '>=',
+ );
- if (whatsNew.onlyUpdates) {
- const updatingCorrect = whatsNew.onlyUpdates && isUpdate;
+ if (seen) return;
- if (!updatingCorrect) return;
+ if (feature.onlyUpdates) {
+ const updatingCorrect = feature.onlyUpdates && isUpdate;
- const lastVersionCorrect = compareVersions.compare(
- lastAppVersion,
- whatsNew.maxLastAppVersion,
- '<',
- );
+ if (!updatingCorrect) return;
- if (!lastVersionCorrect) return;
- }
+ const lastVersionCorrect = compareVersions.compare(
+ lastAppVersion,
+ feature.maxLastAppVersion,
+ '<',
+ );
- const versionCorrect = compareVersions.compare(
- currentAppVersion,
- whatsNew.minAppVersion,
- '>=',
- );
+ if (!lastVersionCorrect) return;
+ }
+
+ const versionCorrect = compareVersions.compare(
+ currentAppVersion,
+ feature.minAppVersion,
+ '>=',
+ );
- if (!versionCorrect) return;
+ if (!versionCorrect) return;
- if (whatsNew.slides.length) setFeaturesToShow(true);
+ showFeatures = [...showFeatures, ...feature.features];
+ });
+ if (showFeatures.length) setFeaturesToShow(showFeatures);
};
shouldShow();
}, []);
@@ -191,13 +169,13 @@ const WhatsNewModal = (props) => {
await AsyncStorage.setItem(WHATS_NEW_APP_VERSION_SEEN, version);
};
- const callButton = (onPress) => {
+ const callButton = (feature) => {
closeModal();
- onPress(props);
+ feature.buttonPress && feature.buttonPress(props);
};
useEffect(() => {
- if (props.enabled && featuresToShow) {
+ if (props.enabled && !!featuresToShow) {
const route = findRouteNameFromNavigatorState(routes);
if (route === 'WalletView') {
InteractionManager.runAfterInteractions(() => {
@@ -209,77 +187,6 @@ const WhatsNewModal = (props) => {
}
}, [featuresToShow, props.enabled, routes]);
- const renderSlideElement = (elementInfo) => {
- switch (elementInfo.type) {
- case 'title':
- return (element = (
- {elementInfo.title}
- ));
- case 'description':
- return (element = (
- {elementInfo.description}
- ));
- case 'image': {
- let image;
- if (elementInfo.images) {
- image = elementInfo.images[imageKey];
- } else {
- image = elementInfo.image;
- }
- return (
-
-
-
- );
- }
- case 'button':
- return (
-
- callButton(elementInfo.onPress)}
- >
- {elementInfo.buttonText}
-
-
- );
- }
- return null;
- };
-
- const renderSlide = (slideInfo, index) => {
- const key = `slide-info-${index}`;
- return (
-
-
-
- {slideInfo.map((elementInfo, elIndex) => {
- const elKey = `${key}-${elIndex}`;
- return {renderSlideElement(elementInfo)};
- })}
-
-
-
- );
- };
-
- const onScrollEnd = (e) => {
- const xOffset = e.nativeEvent.contentOffset.x;
- const slideIndex = Math.round(xOffset / screenWidth);
- if (currentSlide === slideIndex) {
- return;
- }
- setCurrentSlide(slideIndex);
- };
-
return (
{
onPress={closeModal}
hitSlop={{ top: 10, left: 10, bottom: 10, right: 10 }}
>
-
+
- {whatsNew.slides.length > 0 && (
-
- 1}
- // This is not duplicate. Needed for Android.
- onScrollEndDrag={onScrollEnd}
- onMomentumScrollEnd={onScrollEnd}
- showsHorizontalScrollIndicator={false}
- horizontal
- pagingEnabled
- >
- {whatsNew.slides.map(renderSlide)}
-
- {whatsNew.slides.length > 1 && (
-
- {whatsNew.slides.map((_, index) => (
- {
- scrollViewRef?.current?.scrollTo({
- y: 0,
- x: index * slideItemWidth,
- });
- setCurrentSlide(index);
- }}
- hitSlop={{ top: 8, left: 8, bottom: 8, right: 8 }}
- >
-
-
+ {!!featuresToShow && (
+
+
+
+ {featuresToShow.map((feature, index) => (
+
+
+
+
+
+
+ {feature.title}
+
+ {feature.text}
+
+ callButton(feature)}
+ >
+
+ {feature.buttonText}
+
+
+
+
))}
- )}
-
+
+
)}
diff --git a/app/components/UI/WhatsNewModal/types.ts b/app/components/UI/WhatsNewModal/types.ts
deleted file mode 100644
index cf41881ee6a..00000000000
--- a/app/components/UI/WhatsNewModal/types.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { ImageSourcePropType } from 'react-native';
-
-interface SlideImage {
- type: 'image';
- image: ImageSourcePropType;
-}
-
-interface SlideImages {
- type: 'image';
- images: {
- light: ImageSourcePropType;
- dark: ImageSourcePropType;
- };
-}
-
-interface SlideTitle {
- type: 'title';
- title: string;
-}
-
-interface SlideDescription {
- type: 'description';
- description: string;
-}
-
-type SlideButtonType = 'normal' | 'blue';
-
-interface SlideButton {
- type: 'button';
- buttonType: SlideButtonType;
- buttonText: string;
- onPress: (props: { navigation: any }) => void;
-}
-
-type SlideContentType =
- | SlideImage
- | SlideImages
- | SlideTitle
- | SlideDescription
- | SlideButton;
-
-type WhatsNewSlides = SlideContentType[][];
-
-type VersionString = `${number}.${number}.${number}`;
-
-export interface WhatsNew {
- onlyUpdates: boolean;
- maxLastAppVersion: VersionString;
- minAppVersion: VersionString;
- /**
- * Slides utilizes a templating system in the form of a 2D array, which is eventually rendered within app/components/UI/WhatsNewModal/index.js.
- * The root layer determines the number of slides. Ex. To display 3 slides, the root layer should contain 3 arrays.
- * The inner layer determines the content that will be rendered within each slide.
- * The slide content takes the form of union types, where the possible types are `image`, `title`, `description`, or `button`.
- * Both slide count and slide content will be rendered in the same order as the data set.
- */
- slides: WhatsNewSlides;
-}
diff --git a/app/components/UI/WhatsNewModal/whatsNewList.js b/app/components/UI/WhatsNewModal/whatsNewList.js
new file mode 100644
index 00000000000..b6e95bb04e8
--- /dev/null
+++ b/app/components/UI/WhatsNewModal/whatsNewList.js
@@ -0,0 +1,25 @@
+import { strings } from '../../../../locales/i18n';
+
+export const whatsNew = [
+ {
+ // All users that have <1.0.7 and are updating to >=1.0.7 should see
+ onlyUpdates: true, // Only users who updated the app will see this, not newly installs
+ maxLastAppVersion: '1.0.7', // Only users who had a previous version <1.0.7 version will see this
+ minAppVersion: '1.0.7', // Only users who updated to a version >= 1.0.7 will see this
+ features: [
+ {
+ title: strings('whats_new.feature_security_settings_title'),
+ text: strings('whats_new.feature_security_settings_text'),
+ buttonText: strings('whats_new.feature_security_settings_button'),
+ buttonPress: (props) =>
+ props.navigation.navigate('SettingsView', {
+ screen: 'SettingsFlow',
+ params: { screen: 'SecuritySettings' },
+ }),
+ image: require('../../../images/whats-new-security.png'), // eslint-disable-line
+ },
+ ],
+ },
+];
+
+export default whatsNew;
diff --git a/app/components/UI/WhatsNewModal/whatsNewList.ts b/app/components/UI/WhatsNewModal/whatsNewList.ts
deleted file mode 100644
index 597b0306080..00000000000
--- a/app/components/UI/WhatsNewModal/whatsNewList.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-import { strings } from '../../../../locales/i18n';
-import { WhatsNew } from './types';
-
-export const whatsNew: WhatsNew = {
- // All users that have <5.3.0 and are updating to >=5.3.0 should see
- onlyUpdates: false, // Only users who updated the app will see this, not newly installs
- maxLastAppVersion: '5.3.0', // Only users who had a previous version <5.3.0 version will see this
- minAppVersion: '5.3.0', // Only users who updated to a version >=5.3.0 will see this
- slides: [
- [
- {
- type: 'image',
- /* eslint-disable import/no-commonjs, @typescript-eslint/no-require-imports */
- images: {
- light: require('../../../images/whats_new_onramp_agg_light.png'),
- dark: require('../../../images/whats_new_onramp_agg_dark.png'),
- },
- },
- {
- type: 'title',
- title: strings('whats_new.feature_on_ramp_title'),
- },
- {
- type: 'description',
- description: strings('whats_new.feature_on_ramp_text'),
- },
- {
- type: 'description',
- description: strings('whats_new.feature_on_ramp_text_description'),
- },
- {
- type: 'button',
- buttonType: 'blue',
- buttonText: strings('whats_new.feature_on_ramp_button'),
- onPress: () => null,
- },
- ],
- ],
-};
diff --git a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
index a7dca82c610..62ca7b60614 100644
--- a/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
+++ b/app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js
@@ -895,8 +895,8 @@ class NetworkSettings extends PureComponent {
)}
diff --git a/app/images/whats_new_onramp_agg_dark.png b/app/images/whats_new_onramp_agg_dark.png
deleted file mode 100644
index 3eb1430ff189e43fb7ef5d7de410497c9192502d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7230
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