Skip to content
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.

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

fix(rgb++): loading picture when loading #411

Merged
merged 4 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions src/assets/small-spinner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/components/AwesomeLoadings/SmallSpinner/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import styles from './styles.module.scss'
import { ReactComponent as SmallSpinner } from '../../../assets/small-spinner.svg'

const Loading = () => {
return <SmallSpinner className={styles.container} />
}
export default Loading
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import '../../../styles/variables.module';

.container {
margin: 40px auto;
color: var(--primary-color);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
}
}

.content {
height: 100%;
display: flex;
flex-direction: column;
overflow-y: auto;
flex: 1;
}

.noRecords {
display: flex;
background: #fff;
Expand All @@ -25,7 +33,6 @@
gap: 16px;
font-size: 16px;
white-space: nowrap;
overflow: hidden;
margin-bottom: 1rem;

@media screen and (max-width: $mobileBreakPoint) {
Expand Down Expand Up @@ -144,11 +151,9 @@
}

.list {
max-height: 540px;
height: 100%;
overflow-y: auto;
scroll-snap-type: y mandatory;

& > div {
scroll-snap-align: center;
}
display: flex;
flex-direction: column;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import CloseIcon from '../../../assets/modal_close.png'
import { TransactionRGBPPDigestContent } from './TransactionRGBPPDigestContent'
import { explorerService } from '../../../services/ExplorerService'
import { TransactionLeapDirection } from '../../RGBPP/types'
import SmallSpinner from '../../AwesomeLoadings/SmallSpinner'

const TransactionRGBPPDigestModal = ({ hash, onClickClose }: { onClickClose: Function; hash: string }) => {
const { t } = useTranslation()

const { data, isFetched } = useQuery(['rgb-digest', hash], () => explorerService.api.fetchRGBDigest(hash))
const { data, isFetched, isLoading } = useQuery(['rgb-digest', hash], () => explorerService.api.fetchRGBDigest(hash))

const direction = useMemo(() => {
switch (data?.data.leapDirection) {
Expand All @@ -25,25 +26,30 @@ const TransactionRGBPPDigestModal = ({ hash, onClickClose }: { onClickClose: Fun
}
}, [data])

if (isFetched && data?.data) {
return (
<div className={styles.container}>
<div className={styles.header}>
<div className={styles.left}>
<span>{t('address.transaction_rgbpp_digest')}</span>
{direction !== TransactionLeapDirection.NONE && (
<span className={styles.leap}>{t(`address.leap_${direction}`)}</span>
)}
</div>
<button onClick={() => onClickClose()} type="button" className={styles.buttonClose}>
<img src={CloseIcon} alt="close icon" className={styles.closeIcon} />
</button>
return (
<div className={styles.container}>
{isLoading ? (
<div style={{ margin: 'auto', width: '100%', display: 'flex' }}>
<SmallSpinner />
</div>
<TransactionRGBPPDigestContent hash={hash} digest={data?.data} isFetched={isFetched} />
</div>
)
}
return null
) : (
<>
<div className={styles.header}>
<div className={styles.left}>
<span>{t('address.transaction_rgbpp_digest')}</span>
{direction !== TransactionLeapDirection.NONE && (
<span className={styles.leap}>{t(`address.leap_${direction}`)}</span>
)}
</div>
<button onClick={() => onClickClose()} type="button" className={styles.buttonClose}>
<img src={CloseIcon} alt="close icon" className={styles.closeIcon} />
</button>
</div>
<TransactionRGBPPDigestContent hash={hash} digest={data?.data} isFetched={isFetched} />
</>
)}
</div>
)
}

export default TransactionRGBPPDigestModal
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,25 @@
background-color: #fff;
padding: 20px 40px;
width: 75%;
margin: 15% auto;
max-height: 80%;
top: 50%;
left: 50%;
gap: 10px;
transform: translate(-50%, -50%);
border-radius: 4px;
position: fixed;
display: flex;
flex-direction: column;

@media screen and (max-width: $mobileBreakPoint) {
width: 90%;
padding: 16px;
margin: 178px auto;
}
}

.header {
display: flex;
justify-content: space-between;
margin-bottom: 10px;

.left {
display: flex;
Expand Down