Skip to content

Commit

Permalink
chore: cherry pick swaps PR (#11010)
Browse files Browse the repository at this point in the history
## **Description**

Cheryy pick swaps controllers update:
#11003

## **Related issues**

Fixes:


<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling

guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
  • Loading branch information
tommasini authored Sep 3, 2024
1 parent cd94090 commit c51f030
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 343 deletions.
Original file line number Diff line number Diff line change
@@ -1,96 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

<<<<<<< HEAD
exports[`ProfileSyncing should render correctly 1`] = `
<View
style={
{
"marginVertical": 16,
}
}
>
<View
style={
{
"alignItems": "center",
"flexDirection": "row",
"justifyContent": "space-between",
"paddingBottom": 8,
}
}
>
<Text
accessibilityRole="text"
style={
{
"color": "#141618",
"fontFamily": "Euclid Circular B",
"fontSize": 16,
"fontWeight": "700",
"letterSpacing": 0,
"lineHeight": 24,
}
}
>
Profile Sync
</Text>
<RCTSwitch
accessibilityRole="switch"
disabled={true}
onChange={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
onTintColor="#0376c9"
style={
[
{
"height": 31,
"width": 51,
},
{
"backgroundColor": "#bbc0c566",
"borderRadius": 16,
},
]
}
thumbTintColor="#ffffff"
tintColor="#bbc0c566"
value={true}
/>
</View>
<Text
accessibilityRole="text"
style={
{
"color": "#6a737d",
"fontFamily": "Euclid Circular B",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
}
>
Creates a profile that MetaMask uses to sync some settings among your devices. This is required to get notifications.
<Text
accessibilityRole="text"
onPress={[Function]}
style={
{
"color": "#0376c9",
"fontFamily": "Euclid Circular B",
"fontSize": 14,
"fontWeight": "400",
"letterSpacing": 0,
"lineHeight": 22,
}
}
>
Learn how we protect your privacy
</Text>
</Text>
</View>
`;
=======
exports[`ProfileSyncing should render correctly 1`] = `null`;
>>>>>>> d98a1c9f98 (fix(notifications): hide profile sync toggle (#10900))
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,7 @@ exports[`DefaultSettings should render correctly 1`] = `
style={
{
"color": "#141618",
<<<<<<< HEAD
"fontFamily": "Euclid Circular B",
=======
"fontFamily": "EuclidCircularB-Bold",
>>>>>>> d98a1c9f98 (fix(notifications): hide profile sync toggle (#10900))
"fontSize": 16,
"fontWeight": "700",
"letterSpacing": 0,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"@metamask/snaps-sdk": "^6.2.1",
"@metamask/snaps-utils": "^8.0.1",
"@metamask/swappable-obj-proxy": "^2.1.0",
"@metamask/swaps-controller": "^9.0.2",
"@metamask/swaps-controller": "^9.0.12",
"@metamask/transaction-controller": "^35.0.0",
"@metamask/utils": "^8.1.0",
"@ngraveio/bc-ur": "^1.1.6",
Expand Down
Loading

0 comments on commit c51f030

Please sign in to comment.