Skip to content
This repository has been archived by the owner on Jun 30, 2021. It is now read-only.

fix bugs link typo and cache #389

Merged
merged 1 commit into from Jul 26, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -167,7 +167,7 @@ class WalletDetaillPage extends Component {
renderWalletDetailPage = ({ wallet, loadingStatus, result }) => {
return (
<WalletDetailContainer>
{loadingStatus === CONSTANT.LOADING_STATUS.SUCCESS &&
{(loadingStatus === CONSTANT.LOADING_STATUS.SUCCESS || wallet) &&
this.renderWalletDetailContainer(wallet)}
{loadingStatus === CONSTANT.LOADING_STATUS.FAILED && this.renderErrorPage(result.error)}
</WalletDetailContainer>
Expand Down
3 changes: 2 additions & 1 deletion apps/admin_panel/assets/src/omg-transaction-panel/index.js
Expand Up @@ -83,6 +83,7 @@ class TransactionRequestPanel extends Component {
const address = _.get(transaction, 'address')
const accountName = _.get(transaction, 'account.name')
const accountId = _.get(transaction, 'account.id')
const userId = _.get(transaction, 'user.id')
const tokenId = _.get(transaction, 'token.id')
return (
<TransactionInfoContainer>
Expand All @@ -100,7 +101,7 @@ class TransactionRequestPanel extends Component {
{_.get(transaction, 'user') && (
<InformationItem>
<b>User : </b>
<Link to={`accounts/${accountId}`}>{_.get(transaction, 'user.id')}</Link>
<Link to={`users/${userId}`}>{userId}</Link>
</InformationItem>
)}
<InformationItem>
Expand Down