Merge branch 'develop' into fixit/disallow-clicking-disabled-wallet-b…

…utton
MyCryptoHQ · Nov 16, 2018 · 916db77 · 916db77
2 parents b63026c + 14eb6d8
commit 916db77
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/common/components/AddressField.tsx b/common/components/AddressField.tsx
@@ -45,7 +45,7 @@ const AddressField: React.SFC<Props> = ({
     showLabelMatch={showLabelMatch}
     showIdenticon={showIdenticon}
     onChangeOverride={onChangeOverride}
-    value={(value || '').trim()}
+    value={value}
     dropdownThreshold={dropdownThreshold}
     withProps={({ currentTo, isValid, isLabelEntry, onChange, onFocus, onBlur, readOnly }) => (
       <div className="input-group-wrapper">

diff --git a/common/components/ui/Dropdown.tsx b/common/components/ui/Dropdown.tsx
@@ -9,7 +9,7 @@ interface Props extends ReactSelectProps {
 
 export default class Dropdown extends React.Component<Props> {
   public state = {
-    selectedOption: '',
+    selectedOption: this.props.value || '',
     hasBlurred: false
   };
 

diff --git a/common/containers/Tabs/Swap/components/CurrencySwap.tsx b/common/containers/Tabs/Swap/components/CurrencySwap.tsx
@@ -263,11 +263,11 @@ export default class CurrencySwap extends PureComponent<Props, State> {
     const { origin, destination } = this.state;
     const { initSwap } = this.props;
 
-    const newOrigin = { ...origin, label: newOption.label, value: newOption.value, amount: 0 };
+    const newOrigin = { ...origin, label: newOption.label, value: newOption.value, amount: NaN };
     const newDest = {
       label: newOption.label === destination.label ? origin.label : destination.label,
       value: newOption.value === destination.value ? origin.value : destination.value,
-      amount: 0,
+      amount: NaN,
       status: '',
       image: ''
     };
@@ -286,10 +286,10 @@ export default class CurrencySwap extends PureComponent<Props, State> {
 
     const newOrigin = {
       ...origin,
-      amount: 0
+      amount: NaN
     };
 
-    const newDest = { ...destination, label: newOption.label, value: newOption.value, amount: 0 };
+    const newDest = { ...destination, label: newOption.label, value: newOption.value, amount: NaN };
     this.setState({
       origin: newOrigin,
       destination: newDest