Skip to content

Rework status name display #1949

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
jacogr merged 2 commits into from
Nov 26, 2019
Merged

Rework status name display #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee77e22
Rework status name display
jacogr Nov 26, 2019
d0e9453
Fix props
jacogr Nov 26, 2019
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: 15 additions & 6 deletions packages/react-components/src/Status/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ function signerIconName (status: QueueTxStatus): any {
}

function renderStatus ({ account, action, id, message, removeItem, status }: QueueStatus): React.ReactNode {
const addressRendered = account
? <AddressMini value={account} withName={false} />
: undefined;

return (
<div
className={classes('item', status)}
Expand All @@ -89,7 +85,9 @@ function renderStatus ({ account, action, id, message, removeItem, status }: Que
<div className='header'>
{action}
</div>
{addressRendered}
{account && (
<AddressMini value={account} />
)}
<div className='status'>
{message}
</div>
Expand Down Expand Up @@ -176,7 +174,6 @@ function Status ({ className, stqueue = [], txqueue = [], t }: Props): React.Rea
/>
</div>
)}

{alltx.map(renderItem)}
{allst.map(renderStatus)}
</div>
Expand Down Expand Up @@ -220,10 +217,22 @@ export default translate(
.status {
font-weight: 700;
}

.ui--AddressMini {
.ui--AddressMini-address {
min-width: 0;
text-align: left;
}
}
}

.header {
opacity: 0.66;
}

.short {
font-size: 2.5rem;
opacity: 0.75;
padding: 0.5rem;

i.icon {
Expand Down
15 changes: 6 additions & 9 deletions packages/react-query/src/AccountName.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@
// of the Apache-2.0 license. See the LICENSE file for details.

import { DeriveAccountInfo } from '@polkadot/api-derive/types';
import { BareProps, CallProps } from '@polkadot/react-api/types';
import { BareProps } from '@polkadot/react-api/types';
import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';

import React, { useState, useEffect } from 'react';
import { withCalls } from '@polkadot/react-api';
import { getAddressName } from '@polkadot/react-components/util';
import { trackStream, useApi } from '@polkadot/react-hooks';

interface Props extends BareProps, CallProps {
interface Props extends BareProps {
children?: React.ReactNode;
defaultName?: string;
info?: DeriveAccountInfo;
label?: React.ReactNode;
params?: AccountId | AccountIndex | Address | string | null;
withShort?: boolean;
Expand Down Expand Up @@ -41,7 +40,9 @@ function defaultOrAddr (defaultName = '', _address?: AccountId | AccountIndex |
return extracted;
}

export function AccountName ({ children, className, defaultName, info, label = '', params, style }: Props): React.ReactElement<Props> {
export default function AccountName ({ children, className, defaultName, label = '', params, style }: Props): React.ReactElement<Props> {
const { api } = useApi();
const info = trackStream<DeriveAccountInfo>(api.derive.accounts.info as any, [params]);
const [name, setName] = useState(defaultOrAddr(defaultName, params));

useEffect((): void => {
Expand All @@ -66,7 +67,3 @@ export function AccountName ({ children, className, defaultName, info, label = '
</div>
);
}

export default withCalls<Props>(
['derive.accounts.info', { paramName: 'params', propName: 'info' }]
)(AccountName);