-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into release/7.16.0
- Loading branch information
Showing
110 changed files
with
2,542 additions
and
1,216 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.styles.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import Device from '../../../util/device'; | ||
| import { StyleSheet, TextStyle } from 'react-native'; | ||
| import { Theme } from '../../../util/theme/models'; | ||
|
|
||
| const styleSheet = (params: { theme: Theme }) => { | ||
| const { theme } = params; | ||
| const { typography } = theme; | ||
|
|
||
| return StyleSheet.create({ | ||
| centeredTitle: { | ||
| marginTop: 16, | ||
| marginBottom: 8, | ||
| fontSize: 18, | ||
| textAlign: 'center', | ||
| }, | ||
| centeredDescription: { | ||
| fontSize: 14, | ||
| textAlign: 'center', | ||
| paddingRight: 16, | ||
| paddingLeft: 16, | ||
| }, | ||
| footer: { | ||
| flexDirection: 'row', | ||
| justifyContent: 'center', | ||
| alignItems: 'center', | ||
| }, | ||
| button: { | ||
| flex: 1, | ||
| marginLeft: 16, | ||
| marginRight: 16, | ||
| marginTop: 24, | ||
| marginBottom: Device.isAndroid() ? 21 : 0, | ||
| }, | ||
| buttonLabel: { | ||
| ...typography.lBodySMMedium, | ||
| } as TextStyle, | ||
| }); | ||
| }; | ||
|
|
||
| export default styleSheet; |
72 changes: 72 additions & 0 deletions
72
app/components/UI/DeprecatedNetworkModal/DeprecatedNetworkModal.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import { useNavigation } from '@react-navigation/native'; | ||
| import React, { useRef } from 'react'; | ||
| import { Linking, View } from 'react-native'; | ||
| import { useStyles } from '../../../component-library/hooks'; | ||
| import { strings } from '../../../../locales/i18n'; | ||
| import styleSheet from './DeprecatedNetworkModal.styles'; | ||
| import Text, { | ||
| TextColor, | ||
| TextVariant, | ||
| } from '../../../component-library/components/Texts/Text'; | ||
| import Button, { | ||
| ButtonSize, | ||
| ButtonVariants, | ||
| } from '../../../component-library/components/Buttons/Button'; | ||
| import { CONNECTING_TO_DEPRECATED_NETWORK } from '../../../constants/urls'; | ||
| import BottomSheet from '../../../component-library/components/BottomSheets/BottomSheet'; | ||
| import { useMetrics } from '../../../components/hooks/useMetrics'; | ||
| import { MetaMetricsEvents } from '../../../core/Analytics'; | ||
|
|
||
| const DeprecatedNetworkModal = () => { | ||
| const { styles } = useStyles(styleSheet, {}); | ||
| const { trackEvent } = useMetrics(); | ||
| const navigation = useNavigation(); | ||
|
|
||
| const dismissModal = (): void => { | ||
| navigation.goBack(); | ||
| }; | ||
|
|
||
| const goToLearnMore = () => { | ||
| Linking.openURL(CONNECTING_TO_DEPRECATED_NETWORK); | ||
| trackEvent(MetaMetricsEvents.EXTERNAL_LINK_CLICKED, { | ||
| location: 'dapp_connection_request', | ||
| text: 'Learn More', | ||
| url_domain: CONNECTING_TO_DEPRECATED_NETWORK, | ||
| }); | ||
| }; | ||
|
|
||
| const sheetRef = useRef(null); | ||
|
|
||
| return ( | ||
| <BottomSheet ref={sheetRef}> | ||
| <Text variant={TextVariant.HeadingMD} style={styles.centeredTitle}> | ||
| {strings('networks.network_deprecated_title')} | ||
| </Text> | ||
| <Text variant={TextVariant.BodyMD} style={styles.centeredDescription}> | ||
| {strings('networks.network_deprecated_description')}{' '} | ||
| <Text color={TextColor.Info} onPress={goToLearnMore}> | ||
| {strings('accounts.learn_more')} | ||
| </Text> | ||
| </Text> | ||
| <View style={{ ...styles.footer }}> | ||
| <Button | ||
| variant={ButtonVariants.Primary} | ||
| size={ButtonSize.Lg} | ||
| onPress={dismissModal} | ||
| style={styles.button} | ||
| label={ | ||
| <Text | ||
| variant={TextVariant.BodyMD} | ||
| color={TextColor.Default} | ||
| style={styles.buttonLabel} | ||
| > | ||
| {strings('network_information.got_it')} | ||
| </Text> | ||
| } | ||
| /> | ||
| </View> | ||
| </BottomSheet> | ||
| ); | ||
| }; | ||
|
|
||
| export default DeprecatedNetworkModal; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { default } from './DeprecatedNetworkModal'; |
64 changes: 0 additions & 64 deletions
64
app/components/UI/SnapsExecutionWebView/SnapsExecutionWebView.tsx
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.