Merge pull request #39 from echoprotocol/mergeMasterToDevelop

Merge master to develop
echoprotocol · Nov 6, 2019 · 84d0b82 · 84d0b82
2 parents f7ee21b + d8ab813
commit 84d0b82
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 33 deletions.
diff --git a/app/assets/scss/components/_accounts-list.scss b/app/assets/scss/components/_accounts-list.scss
@@ -115,7 +115,8 @@
 				letter-spacing: 1.2px;
 				text-transform: uppercase;
 
-				&:after {
+				.icon-info {
+					cursor: pointer;
 					@include iconmoon();
 					content: '\e906';
 					margin-left: 5px;

diff --git a/app/assets/scss/pages/_wallet.scss b/app/assets/scss/pages/_wallet.scss
@@ -22,28 +22,6 @@
 	margin-top: 38px;
 	color: #33353f;
 
-	.info {
-		@include source-semibold();
-		margin-top: 10px;
-		color: rgba(#33353f, 0.5);
-		font-size: 14px;
-
-		.coins {
-			font-size: 20px;
-		}
-
-		.currency {
-			text-transform: uppercase;
-		}
-
-		.claim-link {
-			@include heebo-regular();
-			margin-left: 5px;
-			color: #7156ad;
-			font-size: 14px;
-		}
-	}
-
 	.balance {
 		@include source-semibold();
 

diff --git a/app/components/manage-accounts/index.jsx b/app/components/manage-accounts/index.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button } from 'semantic-ui-react';
+import { Button, Popup } from 'semantic-ui-react';
 import PerfectScrollbar from 'react-perfect-scrollbar';
 import { Dropdown } from 'react-bootstrap';
 import classnames from 'classnames';
@@ -65,7 +65,13 @@ class ManageAccounts extends React.Component {
 								? (
 									<React.Fragment>
 										<div className="name">{account.get('name')}</div>
-										<div className="name-label">Primary account</div>
+										<div className="name-label">Primary account
+											<Popup
+												content="This account will be set by default while making any transactions."
+												className="tooltip-frozen"
+												trigger={<span className="icon-info" />}
+											/>
+										</div>
 									</React.Fragment>
 								)
 								: (

diff --git a/app/components/wallet/index.jsx b/app/components/wallet/index.jsx
@@ -6,7 +6,6 @@ import classnames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 import FormatHelper from '../../helpers/format-helper';
 import settings from '../../assets/images/settings.svg';
-import info from '../../assets/images/info.svg';
 import Settings from './settings';
 import { ECHO_ASSET_ID, ECHO_ASSET_PRECISION, ECHO_ASSET_SYMBOL } from '../../constants/global-constants';
 import { HISTORY } from '../../constants/routes-constants';
@@ -284,12 +283,6 @@ class Wallet extends React.Component {
 										</span>
 										<span className="currency">{ECHO_ASSET_SYMBOL}</span>
 									</div>
-									<div className="info">
-										<span className="coins">+ 0.00000 </span>
-										<span className="currency">{ECHO_ASSET_SYMBOL} </span>
-										<span className="message">(unclaimed <img src={info} alt="" />)</span>
-										{/* <span className="claim-link">Claim balance</span> */}
-									</div>
 								</div>
 								<div className="balances-list">
 									{assets ? assets.concat(tokens) : tokens}

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "blip-wallet",
   "productName": "BlipWallet",
-  "version": "0.7.0-rc.1",
+  "version": "0.7.0-rc.2",
   "description": "Blip Wallet",
   "scripts": {
     "web": "cross-env NODE_ENV=development node --trace-warnings -r @babel/register ./node_modules/webpack-dev-server/bin/webpack-dev-server --config configs/webpack.config.web.babel.js --mode development --progress --colors --history-api-fallback --hot --inline",