Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UPGRADE] - update dependencies #4568

Merged
merged 27 commits into from
Jun 22, 2022
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4002b27
5.3.0
metamaskbot Jun 16, 2022
b6dece6
update changelog
cortisiko Jun 16, 2022
fa74f37
update change log
cortisiko Jun 16, 2022
b124853
Update changelog
Jun 16, 2022
ef6af09
Merge branch 'release/5.3.0' of https://github.com/MetaMask/metamask-…
Jun 16, 2022
dc5e493
Update changelog
Jun 16, 2022
add16fb
Update changelog
Jun 16, 2022
341258a
Update CHANGELOG.md
cortisiko Jun 17, 2022
7e96d91
Update CHANGELOG.md
cortisiko Jun 17, 2022
d25a124
Fix onramp error loop by providing payment method change (#4528)
wachunei Jun 20, 2022
c1042e8
Add resolution for shell-quote & got (#4559)
gantunesr Jun 21, 2022
987504b
[5.3] BugFix missing close button in popular network (#4545)
blackdevelopa Jun 22, 2022
ef04558
[5.3] bugfix: for network asset education modal when network is added…
blackdevelopa Jun 22, 2022
b4d6d79
added regex to validate contract allowance contains only integers or …
sethkfman Jun 22, 2022
9d06d05
[5.3] Feature/4479 update whats new modal (#4480)
Cal-L Jun 22, 2022
142b1b9
Bump build number
gantunesr Jun 22, 2022
283f1ff
Merge branch 'release/5.3.0' of https://github.com/MetaMask/metamask-…
gantunesr Jun 22, 2022
0a43236
[5.3] Change Whats New CTA (#4566)
wachunei Jun 22, 2022
e9787f1
update got dependency and test cases
sethkfman Jun 22, 2022
8300248
Merge branch 'release/5.3.0' into fix/dependency-update-got
sethkfman Jun 22, 2022
31794b4
updated with release branch and added heremes resolution
sethkfman Jun 22, 2022
1481beb
merge conflict with release in yarn lock file
sethkfman Jun 22, 2022
bff09d4
removed 1075647 from audit exclusions
sethkfman Jun 22, 2022
a2726db
updated App test
sethkfman Jun 22, 2022
80782f9
removed e2e updates
sethkfman Jun 22, 2022
f04ce35
Solve conflicts with main
gantunesr Jun 22, 2022
e47eff6
Update yarn lock
gantunesr Jun 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[5.3] Feature/4479 update whats new modal (#4480)
* Change whatsNewList to ts

* Update WhatsNewModal to parse template

* [5.3] Add On-Ramp Aggregator What's new modal (#4484)

* Add On-Ramp Aggregator What's new modal

* Add images

* Simplify image logic

* Small adjustments

* Change onlyUpdates to false

* Update comment

Co-authored-by: Cal Leung <cleun007@gmail.com>

Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Cal-L and wachunei authored Jun 22, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 9d06d05051682b46295cdc8b82c6a570a72ef765
299 changes: 199 additions & 100 deletions app/components/UI/WhatsNewModal/index.js

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions app/components/UI/WhatsNewModal/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
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;
}
25 changes: 0 additions & 25 deletions app/components/UI/WhatsNewModal/whatsNewList.js

This file was deleted.

38 changes: 38 additions & 0 deletions app/components/UI/WhatsNewModal/whatsNewList.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/* eslint-disable import/prefer-default-export */
import Routes from '../../../constants/navigation/Routes';
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: 'button',
buttonType: 'blue',
buttonText: strings('whats_new.feature_on_ramp_button'),
onPress: ({ navigation }) =>
navigation.navigate(Routes.FIAT_ON_RAMP_AGGREGATOR.ID),
},
],
],
};
Binary file added app/images/whats_new_onramp_agg_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/images/whats_new_onramp_agg_dark@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/images/whats_new_onramp_agg_dark@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/images/whats_new_onramp_agg_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/images/whats_new_onramp_agg_light@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/images/whats_new_onramp_agg_light@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions locales/languages/en.json
Original file line number Diff line number Diff line change
@@ -1906,9 +1906,9 @@
},
"whats_new": {
"title": "See what's new",
"feature_security_settings_title": "Improved security settings",
"feature_security_settings_text": "You can now change your MetaMask app password & review how to backup your wallet Secret Recovery Phrase from Settings > Security & Privacy.",
"feature_security_settings_button": "View in Settings"
"feature_on_ramp_title": "Buy Crypto improvements",
"feature_on_ramp_text": "Our updated Buy Crypto feature aggregates quotes from multiple providers to help you find the best deal for your region and payment method.",
"feature_on_ramp_button": "Try it out"
},
"invalid_network": {
"title": "The chain ID for custom network \n %{network} \n has to be re-entered.",