Skip to content

Commit a2d9da4

Browse files
DDDDDanicaDDDDDanica
committed
fix(28081): revert snapshot changes in
1 parent 584d0b7 commit a2d9da4

File tree

16 files changed

+69
-25
lines changed

16 files changed

+69
-25
lines changed

‎ui/components/app/assets/token-cell/__snapshots__/token-cell.test.tsx.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exports[`Token Cell should match snapshot 1`] = `
2828
class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--rectangular-bottom-right"
2929
>
3030
<div
31-
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-default mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
31+
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network multichain-token-list-item__badge__avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-md mm-box--border-color-background-default mm-box--border-width-1 box--border-style-solid"
3232
>
3333
<img
3434
alt="network logo"

‎ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ exports[`SnapUIAddress renders Ethereum address 1`] = `
172172
<rect
173173
fill="#F29602"
174174
height="32"
175-
transform="translate(-2.8175089622830405 4.951916544006229) rotate(230.4 16 16)"
175+
transform="translate(-2.81750896228304 4.951916544006229) rotate(230.4 16 16)"
176176
width="32"
177177
x="0"
178178
y="0"
@@ -476,7 +476,7 @@ exports[`SnapUIAddress renders legacy Ethereum address 1`] = `
476476
<rect
477477
fill="#F29602"
478478
height="32"
479-
transform="translate(-2.8175089622830405 4.951916544006229) rotate(230.4 16 16)"
479+
transform="translate(-2.81750896228304 4.951916544006229) rotate(230.4 16 16)"
480480
width="32"
481481
x="0"
482482
y="0"

‎ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap

+8
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,11 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
116116
style="bottom: -1px; right: 2px;"
117117
>
118118
<div
119+
<<<<<<< HEAD
119120
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
121+
=======
122+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
123+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
120124
/>
121125
</div>
122126
</div>
@@ -424,7 +428,11 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
424428
style="bottom: -1px; right: 2px;"
425429
>
426430
<div
431+
<<<<<<< HEAD
427432
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
433+
=======
434+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
435+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
428436
/>
429437
</div>
430438
</div>

‎ui/components/multichain/account-list-item/account-list-item.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import {
6262
getMultichainShouldShowFiat,
6363
} from '../../../selectors/multichain';
6464
import { useMultichainAccountTotalFiatBalance } from '../../../hooks/useMultichainAccountTotalFiatBalance';
65-
import { ConnectedStatus } from '../connected-status';
65+
import { ConnectedStatus } from '../connected-status/connected-status';
6666
///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
6767
import { getCustodianIconForAddress } from '../../../selectors/institutional/selectors';
6868
import { useTheme } from '../../../hooks/useTheme';

‎ui/components/multichain/badge-status/badge-status.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const BadgeStatus: React.FC<BadgeStatusProps> = ({
7474
backgroundColor={badgeBackgroundColor}
7575
borderRadius={BorderRadius.full}
7676
borderColor={badgeBorderColor}
77-
borderWidth={2}
77+
borderWidth={isConnectedAndNotActive ? 2 : 4}
7878
/>
7979
}
8080
>

‎ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap

+8-4
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
159159
<rect
160160
fill="#FA4300"
161161
height="32"
162-
transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
162+
transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
163163
width="32"
164164
x="0"
165165
y="0"
@@ -202,7 +202,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
202202
<rect
203203
fill="#FA4300"
204204
height="32"
205-
transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
205+
transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
206206
width="32"
207207
x="0"
208208
y="0"
@@ -232,7 +232,11 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
232232
style="bottom: -1px; right: 2px;"
233233
>
234234
<div
235+
<<<<<<< HEAD
235236
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
237+
=======
238+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
239+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
236240
/>
237241
</div>
238242
</div>
@@ -261,7 +265,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
261265
<rect
262266
fill="#FA4300"
263267
height="32"
264-
transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
268+
transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
265269
width="32"
266270
x="0"
267271
y="0"
@@ -304,7 +308,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
304308
<rect
305309
fill="#FA4300"
306310
height="32"
307-
transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
311+
transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
308312
width="32"
309313
x="0"
310314
y="0"

‎ui/components/multichain/connected-site-menu/__snapshots__/connected-site-menu.test.js.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ exports[`Connected Site Menu should render the site menu in connected state 1`]
3232
style="bottom: -1px; right: -4px; z-index: 1;"
3333
>
3434
<div
35-
class="mm-box multichain-connected-site-menu__badge mm-box--background-color-success-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
35+
class="mm-box multichain-connected-site-menu__badge mm-box--background-color-success-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-3 box--border-style-solid"
3636
/>
3737
</div>
3838
</div>
@@ -74,7 +74,7 @@ exports[`Connected Site Menu should render the site menu in not connected state
7474
style="bottom: -1px; right: -4px; z-index: 1;"
7575
>
7676
<div
77-
class="mm-box multichain-connected-site-menu__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
77+
class="mm-box multichain-connected-site-menu__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-3 box--border-style-solid"
7878
/>
7979
</div>
8080
</div>

‎ui/components/multichain/connected-site-menu/connected-site-menu.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export const ConnectedSiteMenu = ({
9090
? BorderColor.successDefault
9191
: BorderColor.backgroundDefault
9292
}
93-
borderWidth={2}
93+
borderWidth={isConnectedtoOtherAccountOrSnap ? 2 : 3}
9494
/>
9595
}
9696
>

‎ui/components/multichain/connected-status/connected-status.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { useSelector } from 'react-redux';
33
import {
44
BackgroundColor,
55
BorderColor,
6-
Color,
76
} from '../../../helpers/constants/design-system';
87
import { isAccountConnectedToCurrentTab } from '../../../selectors';
98
import {

‎ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ exports[`Connections Content should render correctly 1`] = `
171171
style="bottom: -1px; right: 2px;"
172172
>
173173
<div
174-
class="mm-box multichain-badge-status__badge mm-box--background-color-success-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
174+
class="mm-box multichain-badge-status__badge mm-box--background-color-success-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
175175
/>
176176
</div>
177177
</div>

‎ui/components/multichain/pages/send/__snapshots__/send.test.js.snap

+4
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,11 @@ exports[`SendPage render and initialization should render correctly even when a
348348
style="bottom: -1px; right: 2px;"
349349
>
350350
<div
351+
<<<<<<< HEAD
351352
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
353+
=======
354+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
355+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
352356
/>
353357
</div>
354358
</div>

‎ui/components/multichain/pages/send/components/__snapshots__/your-accounts.test.tsx.snap

+24
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,11 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
122122
style="bottom: -1px; right: 2px;"
123123
>
124124
<div
125+
<<<<<<< HEAD
125126
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
127+
=======
128+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
129+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
126130
/>
127131
</div>
128132
</div>
@@ -421,7 +425,11 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
421425
style="bottom: -1px; right: 2px;"
422426
>
423427
<div
428+
<<<<<<< HEAD
424429
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
430+
=======
431+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
432+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
425433
/>
426434
</div>
427435
</div>
@@ -720,7 +728,11 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
720728
style="bottom: -1px; right: 2px;"
721729
>
722730
<div
731+
<<<<<<< HEAD
723732
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
733+
=======
734+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
735+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
724736
/>
725737
</div>
726738
</div>
@@ -1028,7 +1040,11 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
10281040
style="bottom: -1px; right: 2px;"
10291041
>
10301042
<div
1043+
<<<<<<< HEAD
10311044
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
1045+
=======
1046+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
1047+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
10321048
/>
10331049
</div>
10341050
</div>
@@ -1327,7 +1343,11 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
13271343
style="bottom: -1px; right: 2px;"
13281344
>
13291345
<div
1346+
<<<<<<< HEAD
13301347
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
1348+
=======
1349+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
1350+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
13311351
/>
13321352
</div>
13331353
</div>
@@ -1639,7 +1659,11 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
16391659
style="bottom: -1px; right: 2px;"
16401660
>
16411661
<div
1662+
<<<<<<< HEAD
16421663
class="mm-box multichain-badge-status__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-2 box--border-style-solid"
1664+
=======
1665+
class="mm-box multichain-badge-status__badge mm-box--background-color-border-muted mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-4 box--border-style-solid"
1666+
>>>>>>> parent of 4568f2af3f (fix(28081): design tweak for network badge)
16431667
/>
16441668
</div>
16451669
</div>

0 commit comments

Comments
 (0)