fixed some react error

diff --git a/src/features/shared/components/ObjectSelectorField/ObjectSelectorField.jsx b/src/features/shared/components/ObjectSelectorField/ObjectSelectorField.jsx
index 15f0fa6..7f18121 100644 (file)
--- a/src/features/shared/components/ObjectSelectorField/ObjectSelectorField.jsx
+++ b/src/features/shared/components/ObjectSelectorField/ObjectSelectorField.jsx
@@ -50,6 +50,8 @@ class ObjectSelectorField extends React.Component {
     const idProps = Object.assign({...this.props.fieldProps.id}, {onChange: idOnChange})
     const aliasProps = Object.assign({...this.props.fieldProps.alias}, {onChange: aliasOnChange})
 
+
+
     return(
       <div className='form-group'>
         {this.props.title && <FieldLabel>{this.props.title}</FieldLabel>}
@@ -57,7 +59,7 @@ class ObjectSelectorField extends React.Component {
           <div className={`input-group-btn ${this.state.showDropdown && 'open'}`}>
             <DropdownButton
               className={styles.dropdownButton}
-              id='input-dropdown-addon'
+              id={ this.props.keyIndex? `input-dropdown-addon-${this.props.keyIndex}` : 'input-dropdown-addon' }
               title={(this.state.selected === ALIAS_SELECTED)? alias_title: this.state.selected}
               onSelect={this.select}
             >

diff --git a/src/features/transactions/components/New/FormActionItem.jsx b/src/features/transactions/components/New/FormActionItem.jsx
index a8a21da..ff6ad30 100644 (file)
--- a/src/features/transactions/components/New/FormActionItem.jsx
+++ b/src/features/transactions/components/New/FormActionItem.jsx
@@ -92,6 +92,7 @@ export default class ActionItem extends React.Component {
 
         {visible.account &&
           <ObjectSelectorField
+            keyIndex='advtx-account'
             lang={lang}
             title={ lang === 'zh' ? '账户' : 'Account' }
             aliasField={Autocomplete.AccountAlias}
@@ -111,6 +112,7 @@ export default class ActionItem extends React.Component {
 
         {visible.asset &&
           <ObjectSelectorField
+            keyIndex='advtx-asset'
             title={ lang === 'zh' ? '资产' :'Asset'}
             lang={lang}
             aliasField={Autocomplete.AssetAlias}

diff --git a/src/features/transactions/components/New/NormalTransactionForm.jsx b/src/features/transactions/components/New/NormalTransactionForm.jsx
index 43d7dd5..1be1a2f 100644 (file)
--- a/src/features/transactions/components/New/NormalTransactionForm.jsx
+++ b/src/features/transactions/components/New/NormalTransactionForm.jsx
@@ -187,6 +187,7 @@ class NormalTxForm extends React.Component {
             <div className={styles.main}>
               <ObjectSelectorField
                 key='account-selector-field'
+                keyIndex='normaltx-account'
                 lang={lang}
                 title={lang === 'zh' ? '账户' : 'Account'}
                 aliasField={Autocomplete.AccountAlias}
@@ -197,6 +198,7 @@ class NormalTxForm extends React.Component {
               />
               <ObjectSelectorField
                 key='asset-selector-field'
+                keyIndex='normaltx-asset'
                 lang={lang}
                 title={lang === 'zh' ? '资产' : 'Asset'}
                 aliasField={Autocomplete.AssetAlias}
@@ -230,39 +232,41 @@ class NormalTxForm extends React.Component {
             </div>
 
             <label className={styles.title}>Gas</label>
-            <table className={styles.optionsBtnContianer}>
-              {rangeOptions.map((option) =>
-                <tr className={styles.optionsBtn}>
-                  <td className={styles.optionsLabel}>
-                    <label>
-                      <input type='radio'
-                             {...gas.type}
-                             onChange={gasOnChange}
-                             value={option.label}
-                             checked={option.label == gas.type.value}
-                      />
-                      {lang === 'zh' ? option.label_zh : option.label}
-                    </label>
-                  </td>
-                  <td>
-                    {
-                      option.label == gas.type.value && option.label !== 'Customize'
-                      && this.state.estimateGas && ((lang === 'zh' ? '估算' : 'estimated') + '   ' + normalizeBTMAmountUnit(btmID,
-                        option.ratio * this.state.estimateGas,
-                        this.props.btmAmountUnit))
-                    }
-                    {
-                      option.label === 'Customize' && gas.type.value === 'Customize' &&
-                      <div>
-                        <AmountUnitField
-                          autoFocus={true}
-                          fieldProps={gas.price}
-                          placeholder='Enter gas'/>
-                      </div>
-                    }
-                  </td>
-                </tr>
-              )}
+            <table>
+              <tbody className={styles.optionsBtnContianer}>
+                {rangeOptions.map((option) =>
+                  <tr className={styles.optionsBtn}>
+                    <td className={styles.optionsLabel}>
+                      <label>
+                        <input type='radio'
+                               {...gas.type}
+                               onChange={gasOnChange}
+                               value={option.label}
+                               checked={option.label == gas.type.value}
+                        />
+                        {lang === 'zh' ? option.label_zh : option.label}
+                      </label>
+                    </td>
+                    <td>
+                      {
+                        option.label == gas.type.value && option.label !== 'Customize'
+                        && this.state.estimateGas && ((lang === 'zh' ? '估算' : 'estimated') + '   ' + normalizeBTMAmountUnit(btmID,
+                          option.ratio * this.state.estimateGas,
+                          this.props.btmAmountUnit))
+                      }
+                      {
+                        option.label === 'Customize' && gas.type.value === 'Customize' &&
+                        <div>
+                          <AmountUnitField
+                            autoFocus={true}
+                            fieldProps={gas.price}
+                            placeholder='Enter gas'/>
+                        </div>
+                      }
+                    </td>
+                  </tr>
+                )}
+              </tbody>
             </table>
 
             <label className={styles.title}>{lang === 'zh' ? '密码' : 'Password'}</label>