chore(git): fix conflicts

app/components/input.js

@@ -66,11 +66,7 @@ export const InputComponent = ({
       />
     ),
     textarea: () => (
-      <Textarea
-        onChange={evt => onChange(evt.target.value)}
-        bgColor={bgColor}
-        {...props}
-      />
+      <Textarea onChange={evt => onChange(evt.target.value)} bgColor={bgColor} {...props} />
     ),
   };
 

app/components/select.js

@@ -24,9 +24,7 @@ const SelectWrapper = styled.div`
   position: relative;
 
   ${props => props.isOpen
-    && `border-${props.placement}-left-radius: 0; border-${
-      props.placement
-    }-right-radius: 0;`}
+    && `border-${props.placement}-left-radius: 0; border-${props.placement}-right-radius: 0;`}
 `;
 /* eslint-enable max-len */
 
@@ -70,23 +68,30 @@ const OptionsWrapper = styled.div`
   flex-direction: column;
   position: absolute;
   width: 100%;
-  ${props => `${props.placement}: ${`-${props.optionsAmount * 62}px`}`};
+  ${props => `${props.placement}: ${`-${props.optionsAmount * 40}px`}`};
   overflow-y: auto;
 `;
 
 const Option = styled.button`
   border: none;
   background: none;
-  height: 60px;
-  background-color: ${
-  props => props.bgColor || props.theme.colors.inputBackground};
+  height: 40px;
+  background-color: #5d5d5d;
   cursor: pointer;
   z-index: 99;
   text-transform: capitalize;
+  padding: 5px 10px;
+  border-bottom: 1px solid #4e4b4b;
 
   &:hover {
     background-color: ${props => props.theme.colors.background};
   }
+
+  &:last-child {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-bottom: 1px solid transparent;
+  }
 `;
 
 type Props = {
@@ -135,10 +140,10 @@ export class SelectComponent extends PureComponent<Props, State> {
     const { isOpen } = this.state;
 
     if (placement === 'top') {
-      return isOpen ? ChevronUp : ChevronDown;
+      return !isOpen ? ChevronUp : ChevronDown;
     }
 
-    return isOpen ? ChevronDown : ChevronUp;
+    return !isOpen ? ChevronDown : ChevronUp;
   };
 
   render() {

app/views/send.js

@@ -52,8 +52,8 @@ const FormWrapper = styled.div`
 `;
 
 const SendWrapper = styled(ColumnComponent)`
-  margin-top: 60px;
   width: 25%;
+  margin-top: 60px;
 `;
 
 const AmountWrapper = styled.div`
@@ -104,11 +104,10 @@ const SeeMoreIcon = styled.img`
 `;
 
 const FeeWrapper = styled.div`
-  background-color: ${props => props.theme.colors.cardBackgroundColor};
+  background-color: #000;
   border-radius: 6px;
   padding: 13px 19px;
   margin-bottom: 20px;
-  margin-top: 10px;
 `;
 
 const InfoCard = styled.div`
@@ -132,6 +131,7 @@ const InfoCardUSD = styled(TextComponent)`
 `;
 
 const FormButton = styled(Button)`
+  width: 100%;
   margin: 10px 0;
 `;