Skip to content

fix: sideshift button not rendering #439

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
Klakurka merged 2 commits into from
Dec 18, 2024
Merged

fix: sideshift button not rendering #439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c013635
fix: value should be null, not undefined
chedieck Dec 7, 2024
a559761
fix: readd grid to bring back button
chedieck Dec 17, 2024
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
34 changes: 21 additions & 13 deletions react/lib/components/Widget/AltpaymentWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
import {
Typography,
TextField,
Grid,
Select,
MenuItem,
makeStyles,
Expand Down Expand Up @@ -186,7 +187,7 @@ export const AltpaymentWidget: React.FunctionComponent<AltpaymentProps> = props
copiedMessage.style.padding = "5px 0 5px 5px";
copiedMessage.style.zIndex = "10";
copiedMessage.style.display = "none";

if (contentElement) {
const content = contentElement.textContent || "";
navigator.clipboard.writeText(content);
Expand Down Expand Up @@ -314,6 +315,7 @@ export const AltpaymentWidget: React.FunctionComponent<AltpaymentProps> = props
}
return coinString;
}

return (
<div className={classes.sideshift_ctn}>
{altpaymentError ? (
Expand Down Expand Up @@ -344,7 +346,7 @@ export const AltpaymentWidget: React.FunctionComponent<AltpaymentProps> = props
<div id="sideshift_id">{altpaymentShift.id}</div>
<img src={copyIcon} alt="Copy" onClick={() => copyToClipboard('sideshift_id')}/>
</div>
</div>
</div>
)
) : loadingShift ? (
<p>Loading Shift...</p>
Expand All @@ -356,15 +358,21 @@ export const AltpaymentWidget: React.FunctionComponent<AltpaymentProps> = props
{resolveNumber(coinPair.rate).toFixed(2)} XEC{' '}
</p>
{altpaymentEditable ? (
<div className={classes.editAmount}>
<TextField
label='Edit amount'
value={pairAmount ?? 0}
onChange={handlePairAmountChange}
inputProps={{ maxLength: pairAmountMaxLength }}
/>
<span>{selectedCoin?.coin}</span>
</div>
<Grid
container
spacing={2}
alignItems="flex-end"
style={{ margin: '6px auto' }}
>
<Grid item xs={6}>
<TextField
label="Amount"
value={pairAmount ?? 0}
onChange={handlePairAmountChange}
inputProps={{ maxLength: pairAmountMaxLength }}
/>
</Grid>
</Grid>
) : (
<Typography>
Send {pairAmount} {selectedCoin?.name}
Expand Down Expand Up @@ -414,7 +422,7 @@ export const AltpaymentWidget: React.FunctionComponent<AltpaymentProps> = props
<Select
labelId="select-coin-label"
className={classes.select_box}
value={selectedCoin?.coin}
value={selectedCoin?.coin ?? null}
Copy link
Collaborator Author

@chedieck chedieck Dec 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

this and the similar line below were put here to fixe console errors that would appear in the browser

onChange={e => {
handleCoinChange(e);
}}
Expand Down Expand Up @@ -453,7 +461,7 @@ export const AltpaymentWidget: React.FunctionComponent<AltpaymentProps> = props
<Select
labelId="select-network-label"
className={classes.select_box}
value={selectedCoinNetwork}
value={selectedCoinNetwork ?? null}
onChange={e => {
handleNetworkChange(e);
}}
Expand Down
Loading