OSDN Git Service

update the bytom address hint.
authorZhiting Lin <zlin035@uottawa.ca>
Fri, 19 Jul 2019 06:07:51 +0000 (14:07 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Fri, 19 Jul 2019 06:07:51 +0000 (14:07 +0800)
src/features/transactions/components/New/CrossChain/CrossChainTransaction.jsx
src/locales/en/translation.json
src/locales/zh/translation.json

index 16695da..f342f9d 100644 (file)
@@ -128,6 +128,8 @@ class CrossChainTransaction extends React.Component {
 
     const showBtmAmountUnit = (assetAlias.value === 'BTM' || assetId.value === btmID)
 
+    const net = this.props.networkId
+
     return <TxContainer
       error={error}
       onSubmit={(e) => this.confirmedTransaction(e)}
@@ -171,7 +173,7 @@ class CrossChainTransaction extends React.Component {
             decimal={assetDecimal}
           />
 
-          <TextField title={t('transaction.crossChain.address')} fieldProps={address}/>
+          <TextField title={t('transaction.crossChain.address')} fieldProps={address} hint={t('transaction.crossChain.addressHint', {id: net})}/>
         </div>
 
 
@@ -231,8 +233,30 @@ const initialValues = (state, ownProps) => {
   return {}
 }
 
+const mapStateToProps = (state, ownProps) => {
+  const coreData = state.core.coreData
+  let networkId
+  if(coreData && coreData.networkId){
+    switch (coreData.networkId){
+      case 'mainnet':
+        networkId = 'bm'
+        break
+      case 'testnet':
+        networkId = 'tm'
+        break
+      case 'solonet':
+        networkId = 'sm'
+    }
+  }
+  return {
+    ...BaseNew.mapStateToProps('transaction')(state, ownProps),
+    networkId
+  }
+}
+
+
 export default withNamespaces('translations') (BaseNew.connect(
-  BaseNew.mapStateToProps('transaction'),
+  mapStateToProps,
   mapDispatchToProps,
   reduxForm({
     form: 'CrossChainTransaction',
index 16c75bf..8afb2bc 100644 (file)
     "crossChain":{
       "title":"Cross Chain info (Vapor->Bytom)",
       "address":"Bytom Address",
+      "addressHint":"Note: the address must start with '__id__'.",
       "submit":"Submit Cross Chain",
       "confirm":"Confirm Cross Chain",
       "crossChainAddress":"Cross Chain Address"
index 61db715..4ca5e9a 100644 (file)
     "crossChain":{
       "title":"跨链信息(Vapor->Bytom)",
       "address":"Bytom地址",
+      "addressHint":"注意:所填地址必须以__id__开头。",
       "submit":"提交跨链",
       "confirm":"确认跨链",
       "crossChainAddress":"跨链地址"