Merge pull request #188 from TronWatch/1.1.2

1.1.2: Remove faucet, fix token dropdown overflow

Author: KonDax

app/popup/src/components/App/index.js

@@ -17,8 +17,6 @@ import Accounts from 'pages/Accounts';
 import Transactions from 'pages/Transactions';
 import Tokens from 'pages/Tokens';
 import Send from 'pages/Send';
-
-import Redeem from 'pages/Redeem';
 import Settings from 'pages/Settings';
 
 import './App.css';
@@ -51,8 +49,7 @@ class App extends Component {
                                 <Route exact path="/main/import/tronscan" component={ ImportTronScan } />
                                 <Route exact path="/main/import/mnemonic" component={ ImportMnemonicPhrase } />
                                 <Route exact path="/main/import/privatekey" component={ ImportPrivateKey } />
-                                
-                                <Route path="/main/redeem" component={ Redeem } />
+
                                 <Route path="/main/settings" component={ Settings } />                                
                             </Switch>
                         </div>

app/popup/src/pages/Redeem/Redeem.css

@@ -207,6 +207,7 @@
     flex-direction: column;
     width: 360px;
     background: transparent;
+    max-height: 180px;
 }
 
 .send-dropdown--menu .Dropdown-option {
@@ -220,6 +221,7 @@
     overflow: hidden;
     border-top: 1px solid #eee;
     position: relative;
+    min-height: 40px;
 }
 
 .send-dropdown--menu .Dropdown-option.is-selected {

app/popup/src/pages/Redeem/index.js

@@ -46,8 +46,6 @@ class Transactions extends Component {
                 <Header 
                     navbarTitle={ 'Transaction History' }
                     navbarLabel={ this.props.account.name || this.props.account.publicKey }
-                    leftIconImg={ <MoneyIcon /> }
-                    leftIconRoute="/main/redeem"
                     rightIconImg={ <SettingsIcon /> }
                     rightIconRoute="/main/settings"
                 />

app/popup/src/pages/Send/Send.css

@@ -55,15 +55,6 @@
     "account.transactions.unfrozen": "Unfroze TRX",
     "account.transactions.voted": "Voted",
 
-    "give.sent.header": "Funds sent",
-    "give.sent.body": "You have been sent 20,000 TestNet TRX",
-    "give.failed.header:": "Failed to send funds",
-    "give.fund.header": "TestNet Funding",
-    "give.fund.body": "Sends 20,000 TestNet TRX to your account",
-    "give.fund.address": "Address: {address}",
-    "give.fund.button": "Fund Account",
-    "give.fund.title": "GRANT FUNDS",
-
     "import.header": "Import Private Key",
     "import.body": "Please enter the private key of your wallet below. We will then generate the address and fetch the past transactions",
     "import.button": "Import",

app/popup/src/pages/Transactions/index.js

@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "TronLink",
-    "version": "1.1.1",
-    "version_name": "1.1.1",
+    "version": "1.1.2",
+    "version_name": "1.1.2",
     "description": "An interactive chrome extension for signing, receiving and broadcasting TRON transactions",
     "author": "https://github.com/TronWatch",
 	"icons": {

app/popup/src/translations/en.json

@@ -1,6 +1,6 @@
 {
     "name": "tronlink",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "private": false,
     "dependencies": {
         "aes-js": "^3.1.1",