From b0c4f2dab0ca5d39b98f798ae85a3e5a3647a65d Mon Sep 17 00:00:00 2001 From: Callil Capuozzo Date: Mon, 22 Jan 2018 15:53:59 -0500 Subject: [PATCH] Small fixes --- src/App.js | 2 +- src/components/ConnectionHelper.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/App.js b/src/App.js index 5bb970a95c..427cb1b1f1 100644 --- a/src/App.js +++ b/src/App.js @@ -671,7 +671,7 @@ class App extends Component {

Uniswap is a trustless, decentralized exchange for Ether and ERC20 tokens

Uniswap exchange uses a "Market Maker" mechanism, where liquidity providers store a reserve of ETH and ERC20 tokens within an Ethereum smart contract. An exchange rate is set between the tokens and ETH based on the relative availibility of each token. Arbitrage ensures that the rate will be the same as on other exchanges. Buyers who send Token 1 to the smart contract will receive back Token 2 at the current rate. A small fee is paid from the buyer to the liquidity providers to incentive participation.

-

A full writeup will be written soon. Until then, here is some more info on Market Makers:

+

A full writeup will be available soon. Until then, here is some more info on Market Makers:

https://www.reddit.com/r/ethereum/comments/55m04x/lets_run_onchain_decentralized_exchanges_the_way/ http://vitalik.ca/general/2017/06/22/marketmakers.html

Please reach out if you would like to get involved or support the project.

diff --git a/src/components/ConnectionHelper.js b/src/components/ConnectionHelper.js index e8d2c41642..8836d71ccd 100644 --- a/src/components/ConnectionHelper.js +++ b/src/components/ConnectionHelper.js @@ -4,35 +4,35 @@ function ConnectionHelper(props) { if (!props.metamask) { return (
-

Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. {props.toggleAbout()}} className="f-a">How it works.
+

Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. {props.toggleAbout()}} className="f-a">How it works ↘

To get started, please install Metamask.

) } if (props.locked) { return (
-

Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. {props.toggleAbout()}} className="f-a" >How it works.
+

Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. {props.toggleAbout()}} className="f-a" >How it works ↘

Looks like you aren't connected. Please unlock Metamask to continue.

) } else if (!props.approved && props.exchangeType === "Token to Token") { return (
-

Our smart contract has to be approved by your address to be able to swap tokens for tokens.
We set the transfer limit to 250 (Why?).

+

Our smart contract has to be approved by your address to be able to swap tokens for tokens.
We set the transfer limit to 250 ( {props.toggleAbout()}} className="f-a">Why?).

props.approveAllowance()}>Approve ⭞
) } else if (!props.approved && props.exchangeType === "Token to ETH") { return (
-

Our smart contract has to be approved by your address to be able to swap tokens for ETH.
We set the transfer limit to 250 (Why?).

+

Our smart contract has to be approved by your address to be able to swap tokens for ETH.
We set the transfer limit to 250 ( {props.toggleAbout()}} className="f-a">Why?).

props.approveAllowance()}>Approve ⭞
) } else if (!props.uniAdded && props.outputToken.value === "UNI") { return (
-

Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. {props.toggleAbout()}} className="f-a" >How it works.

+

Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. {props.toggleAbout()}} className="f-a" >How it works ↘

You’ll need to add the UNI tokens to Metamask. Here’s a step by step guide.
Add UNI with 0x350E5DD084ecF271e8d3531D4324443952F47756.

props.onCloseHelper()}>I've added the token @@ -74,7 +74,7 @@ function ConnectionHelper(props) { } else { return (
-

Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. {props.toggleAbout()}} className="f-a">How it works.
+

Welcome! Uniswap is a decentralized exhange platform for ERC20 Tokens. {props.toggleAbout()}} className="f-a">How it works ↘

Enter an input value below to get started.