Merge pull request #105 from Uniswap/ha-dev

update addresses and various text changes

README.md

-# Uniswap - a decentralized exchange for ERC20 tokens
+# Uniswap Frontend
+This is the repository for [uniswap.io](https://uniswap.io/). Uniswap is an interface for exchange of ERC20 tokens on Ethereum. To learn more about the project:
 
-Read the Whitepaper: https://hackmd.io/C-DvwDSfSxuh-Gd4WKE_ig
-
-Visit the website: https://uniswap.io/
-
-Read the smart contracts: https://github.com/uniswap
-
-Send me an email: hayden@uniswap.io
-<!-- ETH Address: 0x4779721CaC18A46DbCF148f2Dd7A8E6cc1F90078 -->
+* Read the docs: [https://docs.uniswap.io/](https://docs.uniswap.io/)
+* Join the reddit: [https://www.reddit.com/r/Uniswap/](https://www.reddit.com/r/UniSwap/)
+* Email me: [hayden@uniswap.io](mailto:hayden@uniswap.io)
+* Read the whitepaper: [Link](https://hackmd.io/C-DvwDSfSxuh-Gd4WKE_ig)

src/components/CurrencyInputPanel/index.js

@@ -156,7 +156,7 @@ class CurrencyInputPanel extends Component {
             history.push(`/create-exchange/${searchQuery}`);
           }}
         >
-          <div>{`Create exchange fro ${label}`}</div>
+          <div>{`Create exchange for ${label}`}</div>
         </div>
       ]
     }

src/components/Header/index.js

@@ -103,7 +103,7 @@ class BlockingWarning extends Component {
         <div key="warning-desc" className="header__dialog__description">
           {
             isMobile()
-              ? 'Please visit us from a web3-enabled mobile browser, such as Trust Wallet and Cipher Browser.'
+              ? 'Please visit us from a web3-enabled mobile browser such as Trust Wallet or Coinbase Wallet.'
               : 'Please visit us after installing Metamask on Chrome or Brave.'
           }
         </div>,

src/components/NavigationTabs/index.js

@@ -41,7 +41,8 @@ class NavigationTabs extends Component {
           { this.renderTab('Pool', '/add-liquidity', /add-liquidity|remove-liquidity|create-exchange/) }
         </Tabs>
         <div className="beta-message">
-          🦄 Uniswap is an experimental project. Use at your own risk 💀
+          🦄 Welcome to Uniswap! Learn more by reading the docs. <br/>
+          This project is in beta. Audit the contracts or use at your own risk. 💀
         </div>
       </div>
     );

src/ducks/addresses.js

@@ -31,33 +31,36 @@ const MAIN = {
   factoryAddress: '0xbe87b46515ab488713daA155D92abbd0E5964F6A',
   exchangeAddresses: {
     addresses: [
+      ['ANT', '0x264B884Df87fBB97997994181d054e8657eB5c78'],
       ['BAT', '0x31684EB08E0d86AE970F4C2f9110afBce9C4C984'],
       ['DAI', '0xB23601D1E65002fA3173A0982b8E4AD5B46C7863'],
+      ['KNC', '0xB03725a869D9891417830d270a350A74D0D36992'],
       ['MKR', '0x405f6187BeE030B1DF486968C673907F0fd58BE1'],
-      ['ANT', '0x264B884Df87fBB97997994181d054e8657eB5c78'],
       ['REP', '0x997C2c6b08E33313C5512Fd3C6eF235BF0139Ca3'],
-      ['ZRX', '0xE9674e73887bDCCd8fd46861a4f5b1E6485789BE'],
       ['SNT', '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2'],
+      ['ZRX', '0xE9674e73887bDCCd8fd46861a4f5b1E6485789BE'],
     ],
     fromToken: {
+      '0x960b236A07cf122663c4303350609A66A7B288C0': '0x264B884Df87fBB97997994181d054e8657eB5c78',
       '0x0D8775F648430679A709E98d2b0Cb6250d2887EF': '0x31684EB08E0d86AE970F4C2f9110afBce9C4C984',
       '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359': '0xB23601D1E65002fA3173A0982b8E4AD5B46C7863',
+      '0xdd974D5C2e2928deA5F71b9825b8b646686BD200': '0xB03725a869D9891417830d270a350A74D0D36992',
       '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2': '0x405f6187BeE030B1DF486968C673907F0fd58BE1',
-      '0x960b236A07cf122663c4303350609A66A7B288C0': '0x264B884Df87fBB97997994181d054e8657eB5c78',
       '0x1985365e9f78359a9B6AD760e32412f4a445E862': '0x997C2c6b08E33313C5512Fd3C6eF235BF0139Ca3',
-      '0xE41d2489571d322189246DaFA5ebDe1F4699F498': '0xE9674e73887bDCCd8fd46861a4f5b1E6485789BE',
       '0x744d70FDBE2Ba4CF95131626614a1763DF805B9E': '0x63d4b39137dF65ebEad4E15456c291284fCB537C',
+      '0xE41d2489571d322189246DaFA5ebDe1F4699F498': '0xE9674e73887bDCCd8fd46861a4f5b1E6485789BE',
     },
   },
   tokenAddresses: {
     addresses: [
+      ['ANT', '0x960b236A07cf122663c4303350609A66A7B288C0'],
       ['BAT', '0x0D8775F648430679A709E98d2b0Cb6250d2887EF'],
       ['DAI', '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359'],
+      ['KNC', '0xdd974D5C2e2928deA5F71b9825b8b646686BD200'],
       ['MKR', '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2'],
-      ['ANT', '0x960b236A07cf122663c4303350609A66A7B288C0'],
       ['REP', '0x1985365e9f78359a9B6AD760e32412f4a445E862'],
-      ['ZRX', '0xE41d2489571d322189246DaFA5ebDe1F4699F498'],
       ['SNT', '0x744d70FDBE2Ba4CF95131626614a1763DF805B9E'],
+      ['ZRX', '0xE41d2489571d322189246DaFA5ebDe1F4699F498'],
     ],
   },
 };

src/pages/Pool/AddLiquidity.js

@@ -547,10 +547,10 @@ class AddLiquidity extends Component {
             ? (
               <div className="pool__new-exchange-warning">
                 <div className="pool__new-exchange-warning-text">
-                  You are the first person to add liquidity🚰!
+                  🚰 You are the first person to add liquidity to this token!
                 </div>
                 <div className="pool__new-exchange-warning-text">
-                  {`A new exchange rate will be set based on your deposits. Please make sure that your ETH and ${label} deposits have the same fiat value.`}
+                  {`The initial exchange rate will be set based on your deposits. Please make sure that your ETH and ${label} deposits have the same fiat value.`}
                 </div>
               </div>
             )

src/pages/Pool/CreateExchange.js

@@ -74,7 +74,7 @@ class CreateExchange extends Component {
         }
       });
     } else {
-      errorMessage = `Already has an exchange for ${label}`;
+      errorMessage = `${label} Exchange already exists!`;
     }
 
     if (!label) {