Skip to content

Fix rate display wOETH -> OETH #1473

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

Merged
merged 2 commits into from
May 16, 2023
Merged

Fix rate display wOETH -> OETH #1473

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c8fd68
Fix wOETH to oeth rate conversion
smitch88 May 16, 2023
5106614
Fix styling of wrap
smitch88 May 16, 2023
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
21 changes: 13 additions & 8 deletions dapp-oeth/src/components/wrap/WrapOETHPill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ const WrapOETHPill = ({
)}
</div>
<div className="d-flex flex-column justify-content-between align-items-end output-holder">
{topItem ? (
{topItem && (
<div className="d-flex align-items-center">
<div className="d-flex justify-content-between balance">
{displayBalance && (
Expand All @@ -286,8 +286,14 @@ const WrapOETHPill = ({
)}
</div>
</div>
)}
{topItem ? (
<CoinSelect selected={swapMode === 'mint' ? 'oeth' : 'woeth'} />
) : (
<div className="balance mt-auto">
<CoinSelect selected={swapMode === 'mint' ? 'woeth' : 'oeth'} />
)}
{topItem && (
<div className="balance mt-2">
{rate !== null
? fbt(
'1 wOETH = ' +
Expand All @@ -300,11 +306,6 @@ const WrapOETHPill = ({
: '-'}
</div>
)}
{topItem ? (
<CoinSelect selected={swapMode === 'mint' ? 'oeth' : 'woeth'} />
) : (
<CoinSelect selected={swapMode === 'mint' ? 'woeth' : 'oeth'} />
)}
</div>
</div>
</div>
Expand All @@ -316,13 +317,17 @@ const WrapOETHPill = ({
.currency-pill {
display: flex;
justify-content: center;
padding: 56px 40px;
padding: 24px 40px;
background-color: #1e1f25;
min-height: 150px;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}

.topItem {
background-color: #18191c;
border-bottom: solid 1px #141519;
border-radius: 0;
}

.currency-pill-inner {
Expand Down