Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix/swap-input-update' into tmp/…
Browse files Browse the repository at this point in the history
…20241226
  • Loading branch information
dmy147 committed Dec 26, 2024
2 parents dc2badb + 68b7f5f commit 8427298
Show file tree
Hide file tree
Showing 12 changed files with 334 additions and 281 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@rabby-wallet/gnosis-sdk": "1.3.10",
"@rabby-wallet/page-provider": "0.4.2",
"@rabby-wallet/rabby-action": "0.1.8",
"@rabby-wallet/rabby-api": "0.9.4",
"@rabby-wallet/rabby-api": "0.9.7",
"@rabby-wallet/rabby-security-engine": "2.0.7",
"@rabby-wallet/rabby-swap": "0.0.43",
"@rabby-wallet/widgets": "1.0.9",
Expand Down
4 changes: 2 additions & 2 deletions src/ui/component/ChainIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const ChainIconEle = styled.img`
height: 20px;
}
&.mini {
width: 16px;
height: 16px;
width: 18px;
height: 18px;
}
`;

Expand Down
9 changes: 5 additions & 4 deletions src/ui/component/ChainSelector/InForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ const ChainWrapper = styled.div`
}
}
&.swap {
gap: 4px;
gap: 8px;
padding: 0 16px;
border: 0.5px solid transparent;
background: var(--r-neutral-card1, #fff);
border-radius: 8px;
height: 40px;
height: 44px;
position: relative;
&::before {
content: '';
Expand All @@ -72,7 +72,8 @@ const ChainWrapper = styled.div`
}
& > .name {
color: var(--r-neutral-body, #3e495e);
color: var(--r-neutral-title-1, #192945);
font-size: 15px;
}
}
&:hover {
Expand Down Expand Up @@ -145,7 +146,7 @@ export const ChainRender = ({
size={swap ? 'mini' : 'small'}
showCustomRPCToolTip
tooltipProps={{
visible: swap ? false : undefined,
visible: swap || mini ? false : undefined,
}}
/>
)}
Expand Down
Loading

0 comments on commit 8427298

Please sign in to comment.