From b4a46cfe85ee9fe8565bd5026255aaa1de5af8c7 Mon Sep 17 00:00:00 2001
From: bartosz-lipinski <264380+bartosz-lipinski@users.noreply.github.com>
Date: Tue, 9 Mar 2021 15:56:11 -0600
Subject: [PATCH] fix: format

---
 packages/bridge/package.json                  |  2 +-
 .../src/components/EthereumUser/index.tsx     | 22 ----------
 .../bridge/src/components/Input/ethereum.tsx  | 14 ++++---
 .../bridge/src/components/Input/style.less    | 20 +++++++++-
 packages/bridge/src/components/Wrap/index.tsx | 40 -------------------
 .../bridge/src/components/Wrap/style.less     | 12 ------
 6 files changed, 29 insertions(+), 81 deletions(-)
 delete mode 100644 packages/bridge/src/components/EthereumUser/index.tsx
 delete mode 100644 packages/bridge/src/components/Wrap/index.tsx
 delete mode 100644 packages/bridge/src/components/Wrap/style.less

diff --git a/packages/bridge/package.json b/packages/bridge/package.json
index ff02081..f846190 100644
--- a/packages/bridge/package.json
+++ b/packages/bridge/package.json
@@ -62,7 +62,7 @@
     "build": "craco build",
     "test": "craco test",
     "eject": "react-scripts eject",
-    "deploy": "gh-pages -d build",
+    "deploy": "gh-pages -d ../../build/bridge --repp https://github.com/solana-labs/oyster-bridge",
     "deploy:ar": "arweave deploy-dir build --key-file ",
     "format:fix": "prettier --write \"**/*.+(js|jsx|ts|tsx|json|css|md)\"",
     "ethers": "typechain --target ethers-v4 --outDir src/contracts 'contracts/*.json'"
diff --git a/packages/bridge/src/components/EthereumUser/index.tsx b/packages/bridge/src/components/EthereumUser/index.tsx
deleted file mode 100644
index 5fbf893..0000000
--- a/packages/bridge/src/components/EthereumUser/index.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import Identicon from 'identicon.js';
-import React from 'react';
-
-export const EthereumUser = (props: {}) => {
-  return null;
-  // const { accounts } = useEthereum();
-
-  // return (
-  //   <div className="wallet-wrapper">
-  //     <span>
-
-  //     </span>
-  //     <div className="wallet-key">
-  //       {shortenAddress(`${accounts[0]}`)}
-  //       <Identicon
-  //         address={accounts[0]}
-  //         style={{ marginLeft: '0.5rem', display: 'flex' }}
-  //       />
-  //     </div>
-  //   </div>
-  // );
-};
diff --git a/packages/bridge/src/components/Input/ethereum.tsx b/packages/bridge/src/components/Input/ethereum.tsx
index 366b4e4..9e9c4b8 100644
--- a/packages/bridge/src/components/Input/ethereum.tsx
+++ b/packages/bridge/src/components/Input/ethereum.tsx
@@ -30,9 +30,13 @@ export function EthereumInput(props: {
   const renderReserveAccounts = tokens.filter(t => (t.tags?.indexOf('longList') || -1) < 0).map((token) => {
     const mint = token.address;
     return (
-      <Option key={mint} value={mint} name={token.symbol} title={token.name}>
-        <TokenDisplay asset={props.asset} token={token} chain={ASSET_CHAIN.Ethereum}/>
-        <span className={"token-name"}>{token.name}</span>
+      <Option key={mint} className="multichain-option" value={mint} name={token.symbol} title={token.name}>
+        <div className="multichain-option-content">
+          <TokenDisplay asset={props.asset} token={token} chain={ASSET_CHAIN.Ethereum}/>
+          <div  className="multichain-option-name">
+              <span className={"token-name"}>{token.symbol}</span>
+          </div>
+        </div>
       </Option>
     );
   });
@@ -99,7 +103,7 @@ export function EthereumInput(props: {
           </div>
         )}
       </div>
-      <div className="ccy-input-header" style={{ padding: '0px 10px 5px 7px' }}>
+      <div className="ccy-input-header" style={{ padding: '0px 10px 5px 7px', height: 80 }}>
         <NumericInput
           value={
             parseFloat(lastAmount || '0.00') ===  props.amount
@@ -114,7 +118,7 @@ export function EthereumInput(props: {
             setLastAmount(val);
           }}
           style={{
-            fontSize: 20,
+            fontSize: 24,
             boxShadow: 'none',
             borderColor: 'transparent',
             outline: 'transparent',
diff --git a/packages/bridge/src/components/Input/style.less b/packages/bridge/src/components/Input/style.less
index b91d955..dc3b3fc 100644
--- a/packages/bridge/src/components/Input/style.less
+++ b/packages/bridge/src/components/Input/style.less
@@ -1,17 +1,35 @@
+.multichain-option {
+  display: flex;
+  align-items: center;
+}
+
+.multichain-option-content {
+  display: flex;
+  align-items: center;
+}
+
+.multichain-option-name {
+  display: flex;
+  flex-direction: row;
+}
+
 .ccy-input {
   margin-top: 10px;
   margin-bottom: 10px;
   .ant-select-single.ant-select-lg:not(.ant-select-customize-input) .ant-select-selector {
-      height: 52px;
+      height: 70px;
   }
   .ant-select-selector,
   .ant-select-selector:focus,
   .ant-select-selector:active {
     border-color: transparent !important;
     box-shadow: none !important;
+    align-items: center;
   }
   .ant-select-selection-item {
     display: flex;
+    height: 60px;
+
     .token-name {
       display: none;
     }
diff --git a/packages/bridge/src/components/Wrap/index.tsx b/packages/bridge/src/components/Wrap/index.tsx
deleted file mode 100644
index a54af2d..0000000
--- a/packages/bridge/src/components/Wrap/index.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, { useCallback } from 'react';
-import { Button, Card } from 'antd';
-import { LAMPORTS_PER_SOL } from '@solana/web3.js';
-import { LABELS } from '../../constants';
-import { contexts, utils, ConnectButton } from '@oyster/common';
-import { useHistory, useLocation } from "react-router-dom";
-import { SolanaInput, EthereumInput } from "./../Input";
-
-import './style.less';
-
-const { useConnection } = contexts.Connection;
-const { useWallet } = contexts.Wallet;
-const { notify } = utils;
-
-export const Wrap = () => {
-  const connection = useConnection();
-  const { wallet } = useWallet();
-
-
-  return (
-    <>
-    <div className="exchange-card">
-      <SolanaInput
-          title="From Solana"
-          onInputChange={() => {}}
-          />
-      <Button type="primary" className="swap-button">
-        ⇅
-      </Button>
-      {/* <EthereumInput
-          title="To Ethereum"
-          onInputChange={() => {}}
-          /> */}
-    </div>
-    <ConnectButton type="primary">
-      Wrap
-    </ConnectButton>
-  </>
-  );
-};
diff --git a/packages/bridge/src/components/Wrap/style.less b/packages/bridge/src/components/Wrap/style.less
deleted file mode 100644
index 731fd6f..0000000
--- a/packages/bridge/src/components/Wrap/style.less
+++ /dev/null
@@ -1,12 +0,0 @@
-.input-card {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin-bottom: 10px;
-}
-
-.swap-button {
-  border-radius: 2em;
-  width: 32px;
-  padding-left: 8px;
-}