diff --git a/packages/extension-polkagate/src/components/Progress.tsx b/packages/extension-polkagate/src/components/Progress.tsx index e8bf4e6fe..e187e5c90 100644 --- a/packages/extension-polkagate/src/components/Progress.tsx +++ b/packages/extension-polkagate/src/components/Progress.tsx @@ -2,27 +2,30 @@ // SPDX-License-Identifier: Apache-2.0 import { Grid, useTheme } from '@mui/material'; -//@ts-ignore -import { Circle, CubeGrid, WanderingCubes } from 'better-react-spinkit'; +// @ts-ignore +import { Circle, CubeGrid, WanderingCubes, Wordpress } from 'better-react-spinkit'; import React from 'react'; interface Props { + direction?: 'column' | 'row' fontSize?: number; + titlePaddingTop?: number; + titlePaddingLeft?: number; title?: string; pt?: number | string; size?: number; gridSize?: number; - type?: 'circle' | 'cubes' | 'grid'; + type?: 'circle' | 'cubes' | 'grid' | 'wordpress'; } -function Progress ({ fontSize = 13, gridSize = 135, pt = '50px', size = 25, title, type = 'circle' }: Props): React.ReactElement { +function Progress ({ direction = 'column', fontSize = 13, gridSize = 135, pt = '50px', size = 25, title, titlePaddingTop = 20, titlePaddingLeft = 0, type = 'circle' }: Props): React.ReactElement { const theme = useTheme(); return ( @@ -34,6 +37,12 @@ function Progress ({ fontSize = 13, gridSize = 135, pt = '50px', size = 25, titl size={size} /> } + {type === 'wordpress' && + + } {type === 'cubes' && {title} diff --git a/packages/extension-polkagate/src/popup/history/index.tsx b/packages/extension-polkagate/src/popup/history/index.tsx index 1dd41b99d..f4f090ff9 100644 --- a/packages/extension-polkagate/src/popup/history/index.tsx +++ b/packages/extension-polkagate/src/popup/history/index.tsx @@ -78,7 +78,15 @@ export default function TransactionHistory (): React.ReactElement { // staking transaction history is saved locally tabIndex !== TAB_MAP.STAKING && ((transfersTx?.hasMore) - ? 'loading...' + ? : !!tabHistory?.length && {t('No more transactions to load')} diff --git a/packages/extension-polkagate/src/popup/history/modal/HistoryModal.tsx b/packages/extension-polkagate/src/popup/history/modal/HistoryModal.tsx index bd30c3aa7..d06c8148a 100644 --- a/packages/extension-polkagate/src/popup/history/modal/HistoryModal.tsx +++ b/packages/extension-polkagate/src/popup/history/modal/HistoryModal.tsx @@ -85,7 +85,15 @@ export default function HistoryModal ({ address, setDisplayPopup }: Props): Reac // staking transaction history is saved locally tabIndex !== TAB_MAP.STAKING && ((transfersTx?.hasMore) - ? 'loading...' + ? : !!tabHistory?.length && {t('No more transactions to load')}