Merge 01bc012 into cae48c0

main.js

@@ -1,13 +1,14 @@
+// eslint-disable-next-line
 const electron = require('electron')
 // Module to control application life.
 const app = electron.app
 // Module to create native browser window.
 const BrowserWindow = electron.BrowserWindow
 
-var child = require('child_process').execFile;
-var executablePath = "./geth";
-var parameters = ["-light","--rpc"];
-
+// eslint-disable-next-line
+var child = require('child_process').execFile
+var executablePath = "./geth"
+var parameters = [ "-light", "--rpc" ]
 
 const path = require('path')
 const url = require('url')
@@ -18,24 +19,24 @@ let mainWindow
 
 function createWindow () {
   // Create the browser window.
-  mainWindow = new BrowserWindow({width: 800, height: 600})
+  mainWindow = new BrowserWindow({ width: 800, height: 600 })
 
- // and load the index.html of the app.
+  // and load the index.html of the app.
   let loadUrl = url.format({
     pathname: path.join(__dirname, 'build/index.html'),
     protocol: 'file:',
-    slashes: true
+    slashes: true,
   })
   if (process.env.LOAD_URL) {
-    loadUrl = process.env.LOAD_URL;
+    loadUrl = process.env.LOAD_URL
   }
-  mainWindow.loadURL(loadUrl);
-            console.log('hui');
-  child(executablePath, parameters, function(err, data) {
-               console.log(err)
-                            console.log(data.toString());
+  mainWindow.loadURL(loadUrl)
+  child(executablePath, parameters, function (err, data) {
+    // eslint-disable-next-line
+    console.log(err)
+    // eslint-disable-next-line
+    console.log(data.toString());
   });
-
 
   // Open the DevTools.
   // mainWindow.webContents.openDevTools()

packages/login-ui/components/LoginWithOptions/lang.js

@@ -2,17 +2,21 @@ export const en = {
   mnemonicKey: 'Mnemonic key',
   walletFile: 'Wallet file',
   privateKey: 'Private key',
-  ledgerNano: 'Ledger Nano',
+  ledgerNano: 'Ledger Nano Wallet',
   local: 'Login to TestRPC',
   metamask: 'Login to Metamask',
   selectLoginOption: 'Select login option:',
+  trezor: 'Trezor Wallet',
+  uport: 'Login with uPort',
 }
 export const ru = {
   mnemonicKey: 'Мнемонический ключ',
   walletFile: 'Файл кошелька',
   privateKey: 'Приватный ключ',
-  ledgerNano: 'Ledger Nano',
+  ledgerNano: 'Ledger Nano Wallet',
   local: 'Локальный TestRPC',
   metamask: 'Metamask',
   selectLoginOption: 'Выберите вариант входа в систему:',
+  trezor: 'Trezor Wallet',
+  uport: 'Авторизоваться через uPort',
 }

packages/login/network/ExchangeProvider.js

@@ -18,8 +18,6 @@ class ExchangeProvider {
   }
 
   async getAssetSymbols () {
-    // eslint-disable-next-line
-    console.log('getAssetSymbols', `${this.url()}events/exchangecreated/`)
     const response = await axios.get(`${this.url()}events/exchangecreated/`) //?distinct=symbol
     return response ? response.data : []
   }

src/components/common/TokenValue/TokenValue.js

@@ -40,7 +40,7 @@ class TokenValue extends PureComponent {
   }
 
   getFraction (value: BigNumber) {
-    const valueBN = new BigNumber(value)
+    const valueBN = new BigNumber(value).absoluteValue()
     const fraction = valueBN.modulo(1)
 
     if (valueBN.isZero() || fraction.isZero()) {

src/components/dialogs/ConfirmTxDialog/ConfirmTxDialog.js

@@ -194,7 +194,7 @@ export default class ConfirmTxDialog extends PureComponent {
                   </TableRow>
                 </TableBody>
               </Table>
-              {balance.lt(0) && <div styleName='error'>Not enough ETH</div>}
+              {balanceAfter.lt(0) && <div styleName='error'>Not enough ETH</div>}
             </div>
 
             <div styleName='errorMessage'>
@@ -229,8 +229,8 @@ export default class ConfirmTxDialog extends PureComponent {
               styleName='action'
               primary
               label={<Translate value='terms.confirm' />}
-              disabled={gasFee.lte(0) || balance.lt(0) || additionalActionIsFailed}
-              onTouchTap={gasFee.gte(0) && balance.gt(0) && !additionalActionIsFailed && this.handleConfirm}
+              disabled={gasFee.lte(0) || balanceAfter.lt(0) || balance.lt(0) || additionalActionIsFailed}
+              onTouchTap={gasFee.gte(0) && balanceAfter.gte(0) && balance.gt(0) && !additionalActionIsFailed && this.handleConfirm}
             />
           </div>
         </div>

src/i18n/en-notices.js

@@ -78,4 +78,9 @@ export default {
     title: 'Wallet',
     create: '%{name}: Created',
   },
+  assetsManager: {
+    title: 'Assets manager',
+    managerAdded: 'Manager added',
+    managerRemoved: 'Manager removed',
+  },
 }

src/i18n/ru-notices.js

@@ -72,4 +72,9 @@ export default {
     title: 'Мульти-кошелек',
     create: '%{address}: создан',
   },
+  assetsManager: {
+    title: 'Ассет менеджер',
+    managerAdded: 'Менеджер добавлен',
+    managerRemoved: 'Менеджер удален',
+  },
 }

src/models/notices/AssetsManagerNoticeModel.js

@@ -0,0 +1,35 @@
+import { I18n } from 'platform/i18n'
+import { Icons } from 'platform/icons'
+import { abstractNoticeModel } from './AbstractNoticeModel'
+
+export const MANAGER_ADDED = 'managerAdded'
+export const MANAGER_REMOVED = 'managerRemoved'
+
+export default class AssetsManagerNoticeModel extends abstractNoticeModel({
+  status: null,
+  transactionHash: null,
+}) {
+  icon () {
+    return Icons.get('notices.transfer.icon')
+  }
+
+  title () {
+    return I18n.t('notices.assetsManager.title')
+  }
+
+  status () {
+    return this.get('status')
+  }
+
+  transactionHash (hash) {
+    if (hash !== undefined) {
+      return this.set('transactionHash', hash)
+    }
+    return this.get('transactionHash')
+  }
+
+  message () {
+    const message = `notices.assetsManager.${this.get('status')}`
+    return I18n.t(message)
+  }
+}

src/redux/assetsManager/actions.js

@@ -1,3 +1,4 @@
+import { notify } from 'redux/notifier/actions'
 import contractManager from 'dao/ContractsManagerDAO'
 import ERC20ManagerDAO from 'dao/ERC20ManagerDAO'
 import ReissuableModel from 'models/tokens/ReissuableModel'
@@ -7,6 +8,7 @@ import OwnerModel from 'models/wallet/OwnerModel'
 import { DUCK_SESSION } from 'redux/session/actions'
 import { DUCK_TOKENS, TOKENS_FETCHED, TOKENS_REMOVE, TOKENS_UPDATE } from 'redux/tokens/actions'
 import Web3Converter from 'utils/Web3Converter'
+import AssetsManagerNoticeModel, { MANAGER_ADDED, MANAGER_REMOVED } from 'models/notices/AssetsManagerNoticeModel'
 
 export const DUCK_ASSETS_MANAGER = 'assetsManager'
 
@@ -208,16 +210,19 @@ export const setManagers = (tx) => async (dispatch, getState) => {
       }
       dispatch(getAssetsManagerData())
     } else {
+      let notice
       const { from, to } = tx.args
       const assetsManagerDao = await contractManager.getAssetsManagerDAO()
       if (token && token.managersList().isFetched()) {
         let managersList = token.managersList()
         if (assetsManagerDao.isEmptyAddress(from)) {
           managersList = managersList.add(new OwnerModel({ address: to }))
+          notice = new AssetsManagerNoticeModel({ status: MANAGER_ADDED, transactionHash: tx.transactionHash })
         } else {
           managersList = managersList.remove(new OwnerModel({ address: from }))
+          notice = new AssetsManagerNoticeModel({ status: MANAGER_REMOVED, transactionHash: tx.transactionHash })
         }
-
+        dispatch(notify(notice))
         dispatch({
           type: TOKENS_FETCHED,
           token: token.managersList(managersList),