neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small batch submit adjustments (#8850)

Browse Source
This commit is contained in:
Jaco 2023-01-20 07:44:16 +02:00 committed by GitHub
parent 5fecaec667
commit dc96a37403
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/react-components/src/Table/Body.tsx
View File

@ -31,11 +31,9 @@ function Body ({ children, className = '', empty, emptySpinner, isEmpty, noBodyT
</tr>
</tbody>
)
: (
noBodyTag
? <>{children}</>
: <tbody className={bodyClassName}>{children}</tbody>
);
: noBodyTag
? <>{children}</>
: <tbody className={bodyClassName}>{children}</tbody>;
}
export default React.memo(Body);

30
packages/react-components/src/Table/index.tsx
View File

@ -29,24 +29,6 @@ interface Props {
noBodyTag?: boolean;
}
interface ColumnProps {
children: React.ReactNode[];
className?: string;
numColumns: number;
}
function Split ({ children, className = '', numColumns }: ColumnProps): React.ReactElement<ColumnProps> {
return (
<div className={`${className} ui--Table-Split-${numColumns}`}>
<table className='noMargin'>
<tbody className='ui--Table-Body'>
{children}
</tbody>
</table>
</div>
);
}
function TableBase ({ children, className = '', empty, emptySpinner, filter, footer, header, headerChildren, isFixed, isInline, isSplit, legend, maxColumns, noBodyTag }: Props): React.ReactElement<Props> {
const numColumns = useWindowColumns(maxColumns);
const isArray = Array.isArray(children);
@ -71,12 +53,16 @@ function TableBase ({ children, className = '', empty, emptySpinner, filter, foo
</table>
<div className='ui--Table-Split'>
{(numColumns === 2 ? [0, 1] : [0, 1, 2]).map((column) => (
<Split
<div
className={`${className} ui--Table-Split-${numColumns}`}
key={column}
numColumns={numColumns}
>
{children.filter((_, i) => (i % numColumns) === column)}
</Split>
<table className='noMargin'>
<tbody className='ui--Table-Body'>
{children.filter((_, i) => (i % numColumns) === column)}
</tbody>
</table>
</div>
))}
</div>
</StyledDiv>

35
packages/react-signer/src/TxSigned.tsx
View File

@ -348,9 +348,10 @@ function TxSigned ({ className, currentItem, isQueueSubmit, queueSize, requestAd
[_onSend, _onSendPayload, _onSign, _unlock, currentItem, isSubmit, queueSetTxStatus, senderInfo]
);
const isAutoCapable = senderInfo.signAddress && (queueSize > 1) && isSubmit && !isBusy && !(flags.isHardware || flags.isMultisig || flags.isProxied || flags.isQr || flags.isUnlockable) && !isRenderError;
const isAutoCapable = senderInfo.signAddress && (queueSize > 1) && isSubmit && !(flags.isHardware || flags.isMultisig || flags.isProxied || flags.isQr || flags.isUnlockable) && !isRenderError;
if (isAutoCapable && initialIsQueueSubmit) {
if (!isBusy && isAutoCapable && initialIsQueueSubmit) {
setBusy(true);
setTimeout(_doStart, 1000);
return null;
@ -443,8 +444,8 @@ function TxSigned ({ className, currentItem, isQueueSubmit, queueSize, requestAd
onClick={_doStart}
tabIndex={2}
/>
{!isBusy && (
<div className='signToggle'>
<div className='signToggle'>
{!isBusy && (
<Toggle
isDisabled={!!currentItem.payload}
label={
@ -455,19 +456,19 @@ function TxSigned ({ className, currentItem, isQueueSubmit, queueSize, requestAd
onChange={setIsSubmit}
value={isSubmit}
/>
{isAutoCapable && (
<Toggle
label={
isQueueSubmit
? t<string>('Submit {{queueSize}} items', { replace: { queueSize } })
: t<string>('Submit individual')
}
onChange={setIsQueueSubmit}
value={isQueueSubmit}
/>
)}
</div>
)}
)}
{isAutoCapable && (
<Toggle
label={
isQueueSubmit
? t<string>('Submit {{queueSize}} items', { replace: { queueSize } })
: t<string>('Submit individual')
}
onChange={setIsQueueSubmit}
value={isQueueSubmit}
/>
)}
</div>
</Modal.Actions>
</>
);