Skip to content

Commit

Permalink
Merge pull request #788 from hubiinetwork/feature/1.2.7
Browse files Browse the repository at this point in the history 
1.2.7
  • Loading branch information
@katat
katat committed Oct 8, 2019
2 parents eca0654 + 4ff8ff1 commit acfb9e3
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hubii-core",
"version": "1.2.6",
"version": "1.2.7",
"author": {
"name": "hubii",
"email": "info@hubii.com",
Expand Down Expand Up @@ -318,7 +318,7 @@
"minimist": "1.2.0",
"moment": "2.22.2",
"nahmii-ethereum-address": "^2.0.1",
"nahmii-sdk": "3.1.2",
"nahmii-sdk": "3.2.0",
"prop-types": "15.6.1",
"qrcode.react": "0.8.0",
"react": "16.6.3",
Expand Down
2 changes: 1 addition & 1 deletion src/components/TransferForm/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ export class TransferForm extends React.PureComponent {
</Select>
</FormItem>
<FormItem
label={<FormItemLabel>{formatMessage({ id: 'select_recipient' })}</FormItemLabel>}
label={<FormItemLabel>{formatMessage({ id: 'select_recipient' })} {layer === 'nahmii' && `(${formatMessage({ id: 'confirm_nahmii_recipient' })})`}</FormItemLabel>}
colon={false}
help={
this.props.recipients.find((recipient) => isAddressMatch(recipient.address, address)) ?
Expand Down
40 changes: 40 additions & 0 deletions src/components/TransferForm/tests/__snapshots__/index.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -1116,6 +1117,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -1632,6 +1634,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -1817,6 +1820,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -2193,6 +2197,7 @@ ShallowWrapper {
"help": null,
"label": <Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>,
},
"ref": null,
Expand Down Expand Up @@ -3104,6 +3109,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -3689,6 +3695,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -4205,6 +4212,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -4390,6 +4398,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -4766,6 +4775,7 @@ ShallowWrapper {
"help": null,
"label": <Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>,
},
"ref": null,
Expand Down Expand Up @@ -6069,6 +6079,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -6584,6 +6595,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -7058,6 +7070,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -7201,6 +7214,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -7493,6 +7507,7 @@ ShallowWrapper {
"help": null,
"label": <Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>,
},
"ref": null,
Expand Down Expand Up @@ -8349,6 +8364,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -8864,6 +8880,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -9338,6 +9355,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -9481,6 +9499,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -9773,6 +9792,7 @@ ShallowWrapper {
"help": null,
"label": <Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>,
},
"ref": null,
Expand Down Expand Up @@ -11066,6 +11086,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -11651,6 +11672,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -12167,6 +12189,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -12352,6 +12375,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -12728,6 +12752,7 @@ ShallowWrapper {
"help": null,
"label": <Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>,
},
"ref": null,
Expand Down Expand Up @@ -13639,6 +13664,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -14224,6 +14250,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -14740,6 +14767,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -14925,6 +14953,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -15301,6 +15330,7 @@ ShallowWrapper {
"help": null,
"label": <Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>,
},
"ref": null,
Expand Down Expand Up @@ -16634,6 +16664,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -17219,6 +17250,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -17735,6 +17767,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -17920,6 +17953,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -18296,6 +18330,7 @@ ShallowWrapper {
"help": null,
"label": <Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>,
},
"ref": null,
Expand Down Expand Up @@ -19207,6 +19242,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -19792,6 +19828,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -20308,6 +20345,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -20493,6 +20531,7 @@ ShallowWrapper {
label={
<Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>
}
>
Expand Down Expand Up @@ -20869,6 +20908,7 @@ ShallowWrapper {
"help": null,
"label": <Form__FormItemLabel>
select_recipient

</Form__FormItemLabel>,
},
"ref": null,
Expand Down
3 changes: 2 additions & 1 deletion src/translations/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,5 +304,6 @@
"withdrawable": "Withdrawable",
"synchronising_settlement_status": "Synchronising settlement status...",
"i_agree": "I agree with the ",
"terms": "Terms & Conditions"
"terms": "Terms & Conditions",
"confirm_nahmii_recipient": "Please make sure the recipient can use nahmii."
}
3 changes: 2 additions & 1 deletion src/translations/zh.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,5 +304,6 @@
"withdrawable": "可取款",
"synchronising_settlement_status": "同步结算状态...",
"i_agree": "我同意",
"terms": "此条款"
"terms": "此条款",
"confirm_nahmii_recipient": "请确认收款方可以使用 nahmii"
}
8 changes: 4 additions & 4 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11245,10 +11245,10 @@ nahmii-ethereum-address@^2.0.1:
resolved "https://registry.yarnpkg.com/nahmii-ethereum-address/-/nahmii-ethereum-address-2.0.1.tgz#7b31f04d5748cb58c63312b96d7a51bb4ceab6f2"
integrity sha512-+7kwiPd5PEabU2VhMODpx1NYNvyxmvV13mWq+Iu9OVxLDwXaAk/0yRlEXYCTwaSBH/yM0ROobINCmJUCo9RONg==

nahmii-sdk@3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/nahmii-sdk/-/nahmii-sdk-3.1.2.tgz#5009c0940c89ecfc48c1e795c80fa96c0b38096a"
integrity sha512-nV3XCJknhYW9xFCoJ+HowRYbXqGQEfZYP+4puTmz4jAh0P46txHVGDkYJqpbsHQcwZDO3vu5Q0r6rlWyniDPww==
nahmii-sdk@3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/nahmii-sdk/-/nahmii-sdk-3.2.0.tgz#5f603968fe230621b9c3fdf745a39b2199c59612"
integrity sha512-1On3ZsO1Orh4V351G4Ui8SHTruOD4ifdtCn5erlu0un7nUt1mPdKRRbbWFrXii5OedplXcrbBB2rGl972NsTyQ==
dependencies:
ethereumjs-util "^6.1.0"
lodash.get "^4.4.2"
Expand Down

0 comments on commit acfb9e3

Please sign in to comment.