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.

Sign up for GitHub

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

Jump to bottom

[FEAT] Keystone integration #3915

Merged
merged 211 commits into from
Apr 6, 2022
Merged

[FEAT] Keystone integration #3915

merged 211 commits into from
Apr 6, 2022

Conversation

gantunesr
Copy link
Member

@gantunesr gantunesr commented Mar 18, 2022 •
edited
Loading

gantunesr and others added 30 commits January 25, 2022 09:23
Upgrade controllers 22.0.0 -> 25.1.0
ad1ef6e
Merge branch 'develop' into depend/controllers-25.1.0
c9fbd52
Merge branch 'develop' into depend/controllers-25.1.0
5ab4e1f
@Cal-L
Update acceptance criteria with metrics line
8eab789
@Cal-L
Merge branch 'main' of https://github.com/MetaMask/metamask-mobile
b2fcf0c
@Cal-L
Merge branch 'main' of https://github.com/MetaMask/metamask-mobile
5b92f05
@Cal-L
Remove hardcoded theme on iOS
4b7f203
@Cal-L
Set up theme foundation
b9f6322
@Cal-L
Add theme toggle to react native dev menu
6eee989
@Cal-L
Add theme toggle to react native dev menu
e4949a1
@Cal-L
Fix inital theme toggle
cc56429
@Cal-L
Begin hooking up onboarding with dark mode
f3be3dd
@Cal-L
Change default theme mode
0f65795
@Cal-L
Change default theme mode
5219ac2
@Cal-L
Begin introducing dark mode to settings
3c3b028
@Cal-L
Merge branch 'feature/3705-dark-mode-onboarding' of https://github.co…
b0b7ba8 
…m/MetaMask/metamask-mobile into feature/dark-mode-feature-branch
@Cal-L
Merge branch 'feature/3707-dark-mode-settings' of https://github.com/…
5236988 
…MetaMask/metamask-mobile into feature/dark-mode-feature-branch
@Cal-L
Add context type to login screen
3a50876
@Cal-L
Merge branch 'feature/3705-dark-mode-onboarding' of https://github.co…
b094145 
…m/MetaMask/metamask-mobile into feature/dark-mode-feature-branch
@Cal-L
Begin introducing dark theme to send flow
7bcab3b
@Cal-L
Merge branch 'feature/3709-dark-mode-send' of https://github.com/Meta…
a15f80c 
…Mask/metamask-mobile into feature/dark-mode-feature-branch
@Cal-L
Introduce dark mode to swaps
1bb3bbf
@Cal-L
Merge branch 'feature/3708-dark-mode-swaps' of https://github.com/Met…
c78a425 
…aMask/metamask-mobile into feature/dark-mode-feature-branch
@Cal-L
Introduce dark mode to buy and receive screens
e89be7a
@Cal-L
Merge branch 'feature/3716-dark-mode-buy-and-receive' of https://gith…
0212956 
…ub.com/MetaMask/metamask-mobile into feature/dark-mode-feature-branch
@Cal-L
Introduce dark mode to asset screens
0cf88d9
@Cal-L
Merge branch 'feature/3710-dark-mode-import-assets' of https://github…
37c15c6 
….com/MetaMask/metamask-mobile into feature/dark-mode-feature-branch
@Cal-L
Introduce dark mode to drawer and related screens
c60e981
@Cal-L
Merge branch 'feature/3719-dark-mode-drawer' of https://github.com/Me…
6d801a8 
…taMask/metamask-mobile into feature/dark-mode-feature-branch
@Cal-L
Import design tokens library
d3c73e2
Cal-L and others added 18 commits April 4, 2022 12:10
@Cal-L
Fix color and font styles
9ca37c6
Merge branch 'main' into feat/keystone-integration
c1eb3cf
Revert boolean cast
f6fe256
Wrap keyring unlock into try-catch
bd33425
Revert canGoBack conditional
bf74a60
Move formatAddress to utils
14429a5
use formatAddress instead of clipAddress
d7b92b6
Use EthereumAddress component in account select
482a80e
Use StyledButton in SelectQRAccounts
70604c3
Update snapshots
b340ff5
@soralit
fix export hardware private key error text; Add a system settings lin…
e19eaea 
…king to error message when no camera permission available on Android (#4036)
Merge branch 'feat/keystone-integration' of https://github.com/MetaMa…
950bc27 
…sk/metamask-mobile into feat/keystone-integration
Use StyledButton in ConnectQRInstruction and update styles
0ccf01a
Move urls into constant file
43fbdfc
Revert unnecessary boolean cast
b166e89
Update checkbox style
14288b2
Update checkbox style
512a341
Remove getNetworkTypeByChainId
4665b74
@gantunesr gantunesr marked this pull request as ready for review April 5, 2022 21:47
@gantunesr gantunesr requested a review from a team as a code owner April 5, 2022 21:47
@cortisiko cortisiko added QA Passed A successful QA run through has been done and removed QA in Progress QA has started on the feature. labels Apr 5, 2022
cortisiko
cortisiko approved these changes Apr 5, 2022
View reviewed changes
Copy link
Member

@cortisiko cortisiko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🌮 🌮 🌮 🌮 🌮 🌮 🌮 🌮 🌮 🌮

@gantunesr gantunesr requested a review from Cal-L April 6, 2022 01:11
Cal-L
Cal-L approved these changes Apr 6, 2022
View reviewed changes
Copy link
Contributor

@Cal-L Cal-L left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm!

@gantunesr gantunesr merged commit b924556 into main Apr 6, 2022
@gantunesr gantunesr deleted the feat/keystone-integration branch April 6, 2022 01:31
@github-actions github-actions bot locked and limited conversation to collaborators Apr 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Cal-L Cal-L Cal-L approved these changes

@cortisiko cortisiko cortisiko approved these changes

Assignees
No one assigned
Labels
area-hardware Priority - High Task with high priority QA Passed A successful QA run through has been done security audit team-accounts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@gantunesr @Cal-L @cortisiko @AlexJupiter @mobularay @georgewrmarshall @soralit