Skip to content

Commit

Permalink
Display resolver name in admin
Browse files Browse the repository at this point in the history
  • Loading branch information
ilanolkies committed May 10, 2019
1 parent 733bae2 commit abb8c67
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/app/components/FieldComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class FieldComponent extends Component {
<React.Fragment>
<Row>
<Col md={2}>{fieldName}</Col>
<Col md={8}>{getting ? '...' : value}</Col>
<Col md={8}><b>{getting ? '...' : value}</b></Col>
<Col md={2}>
<Button variant='link' onClick={changeEdit}>{editOpen ? strings.cancel : strings.edit}</Button>
</Col>
Expand Down
19 changes: 14 additions & 5 deletions src/app/containers/FieldContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,27 @@ import { valueTypes } from '../types';
import { validateAddress, validatePositiveNumber, validateBytes32 } from '../validations';
import { toChecksumAddress } from '../selectors';
import { parse } from 'query-string';
import { multilanguage } from 'redux-multilanguage';
import { publicResolver, multiChainResolver } from '../../config/contracts';

function getResolverName (address, rskResolverText, multiChainResolverText) {
if (address.toLowerCase() === publicResolver.toLowerCase()) return rskResolverText;
if (address.toLowerCase() === multiChainResolver.toLowerCase()) return multiChainResolverText;
return address;
}

const mapStateToProps = (state, ownProps) => {
const { getField, valueType } = ownProps;
const { getField, valueType, strings } = ownProps;
const { getting, value, editOpen, editting } = getField(state);
const { name, network } = state.auth;
const { action, defaultValue } = parse(state.router.location.search);

const displayValue = valueType === valueTypes.ADDRESS ? toChecksumAddress(state)(value) :
valueType === valueTypes.POSITIVE_NUMBER ? value && value.toNumber() : value;
valueType === valueTypes.RESOLVER ? value && getResolverName(value, strings.rsk_resolver, strings.multi_chain_resolver) :
valueType === valueTypes.POSITIVE_NUMBER ? value && value.toNumber() : value;

const validate =
valueType === valueTypes.ADDRESS ? address => validateAddress(address, network) :
(valueType === valueTypes.ADDRESS || valueType === valueTypes.RESOLVER) ? address => validateAddress(address, network) :
valueType === valueTypes.POSITIVE_NUMBER ? number => validatePositiveNumber(number) :
valueType === valueTypes.BYTES32 ? bytes => validateBytes32(bytes) : () => null;

Expand Down Expand Up @@ -52,8 +61,8 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
}
};

export default connect(
export default multilanguage(connect(
mapStateToProps,
mapDispatchToProps,
mergeProps
)(FieldComponent);
)(FieldComponent));
2 changes: 1 addition & 1 deletion src/app/tabs/admin/containers/ResolverContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { ResolverDatalist } from '../../../components';
const registryFieldProps = {
fieldName: 'resolver',
type: 'text',
valueType: valueTypes.ADDRESS,
valueType: valueTypes.RESOLVER,
getField: state => state.admin.resolver,
get: getDomainResolver,
changeEdit: resolver.changeEdit,
Expand Down
3 changes: 2 additions & 1 deletion src/app/types.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export const valueTypes = {
ADDRESS: 'ADDRESS',
POSITIVE_NUMBER: 'POSITIVE_NUMBER',
BYTES32: 'BYTES32'
BYTES32: 'BYTES32',
RESOLVER: 'RESOLVER'
};

0 comments on commit abb8c67

Please sign in to comment.