diff --git a/package.json b/package.json index e48b8ffe..559d4dcf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hubii-core", - "version": "1.2.6", + "version": "1.2.7", "author": { "name": "hubii", "email": "info@hubii.com", @@ -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", diff --git a/src/components/TransferForm/index.js b/src/components/TransferForm/index.js index a9a1bd93..dd5d9863 100644 --- a/src/components/TransferForm/index.js +++ b/src/components/TransferForm/index.js @@ -357,7 +357,7 @@ export class TransferForm extends React.PureComponent { {formatMessage({ id: 'select_recipient' })}} + label={{formatMessage({ id: 'select_recipient' })} {layer === 'nahmii' && `(${formatMessage({ id: 'confirm_nahmii_recipient' })})`}} colon={false} help={ this.props.recipients.find((recipient) => isAddressMatch(recipient.address, address)) ? diff --git a/src/components/TransferForm/tests/__snapshots__/index.test.js.snap b/src/components/TransferForm/tests/__snapshots__/index.test.js.snap index 353862f2..6c41e189 100644 --- a/src/components/TransferForm/tests/__snapshots__/index.test.js.snap +++ b/src/components/TransferForm/tests/__snapshots__/index.test.js.snap @@ -531,6 +531,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -1116,6 +1117,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -1632,6 +1634,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -1817,6 +1820,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -2193,6 +2197,7 @@ ShallowWrapper { "help": null, "label": select_recipient + , }, "ref": null, @@ -3104,6 +3109,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -3689,6 +3695,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -4205,6 +4212,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -4390,6 +4398,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -4766,6 +4775,7 @@ ShallowWrapper { "help": null, "label": select_recipient + , }, "ref": null, @@ -6069,6 +6079,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -6584,6 +6595,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -7058,6 +7070,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -7201,6 +7214,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -7493,6 +7507,7 @@ ShallowWrapper { "help": null, "label": select_recipient + , }, "ref": null, @@ -8349,6 +8364,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -8864,6 +8880,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -9338,6 +9355,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -9481,6 +9499,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -9773,6 +9792,7 @@ ShallowWrapper { "help": null, "label": select_recipient + , }, "ref": null, @@ -11066,6 +11086,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -11651,6 +11672,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -12167,6 +12189,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -12352,6 +12375,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -12728,6 +12752,7 @@ ShallowWrapper { "help": null, "label": select_recipient + , }, "ref": null, @@ -13639,6 +13664,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -14224,6 +14250,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -14740,6 +14767,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -14925,6 +14953,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -15301,6 +15330,7 @@ ShallowWrapper { "help": null, "label": select_recipient + , }, "ref": null, @@ -16634,6 +16664,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -17219,6 +17250,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -17735,6 +17767,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -17920,6 +17953,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -18296,6 +18330,7 @@ ShallowWrapper { "help": null, "label": select_recipient + , }, "ref": null, @@ -19207,6 +19242,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -19792,6 +19828,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -20308,6 +20345,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -20493,6 +20531,7 @@ ShallowWrapper { label={ select_recipient + } > @@ -20869,6 +20908,7 @@ ShallowWrapper { "help": null, "label": select_recipient + , }, "ref": null, diff --git a/src/translations/en.json b/src/translations/en.json index edf23eae..7b298b03 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -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." } diff --git a/src/translations/zh.json b/src/translations/zh.json index ad03a2c8..553c67b0 100644 --- a/src/translations/zh.json +++ b/src/translations/zh.json @@ -304,5 +304,6 @@ "withdrawable": "可取款", "synchronising_settlement_status": "同步结算状态...", "i_agree": "我同意", - "terms": "此条款" + "terms": "此条款", + "confirm_nahmii_recipient": "请确认收款方可以使用 nahmii" } diff --git a/yarn.lock b/yarn.lock index 6bfc0437..a46fafe0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"