Skip to content

Commit

Permalink
Release 0.9.6 (#763)
Browse files Browse the repository at this point in the history
* open sendToken from wallets list

* remove unused dashboard page

* open sendTokenForm from wallets page

* Complete pending txs widget

* Created owners widget.

* Fix layout errors.

* open sendTokenForm from wallets page

* Implement new functional in receive form.

* Created add wallet page and basic components set.

* sendToken for Ethereum

* Fix colors.

* sendToken fixes

* merge with develop fixes

* Created selector of wallets type. Created selector of eth wallets type. Changes fonts.

* merge with develop fixes

* Fix errors

* Improved trace readability

Added info about server URL into trace log

* Error Handling improvement: catch and trace HTTP errors 502 from ChronoBank middlewares
Also enhanced trace messages (added module names)

* Fix BigNumber error and tokens sorter and other.

* WIP.
Created form for Multisig wallet.

* Create an empty i18nJson file during the build

* Missed i18n features

* Complete multisig wallet form.

* Change logic in Add wallet form. Implement action for back button on top.

* fix mainWallet layout in wallets list

* fix mainWallet layout in wallets list

* Release 0.8.1

* bitcoin logic for sendToken form

* MINT-1057 implemented

* improvements & fixes on sendToken form

* Implement form for time-locked wallets and some fixes.

* fixed new layout errors

* Changes in yarn.lock.

* fix createTxModel is not a function error

* Created layout for custom wallet.

* MINT-1057 improvements

* minor fixes v1

* minor fixes v1

* minor bug fixes

* remove unnecessary code in new layout

* Keys management refactoring

* WIP

* Changes on private key login

* Change derive path

* Implement action for create new wallets from derive path.

* fixes ERC20 token estimateGas

* Implement save and load wallets list to LS.

* Changes in yarn.lock

* Added filter for wallet.

* Implement logic for wallets with custom tokens.

* sendToken multisig fix

* Implemented action for create btc/ltc wallet

* application fixes

* Added logic for ltc and some fixes

* Fixed in Send tokens form.

* wallet changes

* Implemented send for derived Eth wallets.

* Start implement watchers.

* ETH advanced mode

* Added watcher for new derive wallets.

* Fix confirmations component and other fixes.

* Fix transactions table for derive wallets.

* Fixed small bugs.

* ETH advanced mode

* Start implement logic for add wallet in runtime.

* confirmTxDialog improvements

* ETH advanced mode

* Fix login to testnet

* fixes ETH confirmationForm

* Implemented logic for add new wallets in runtime.

* ETH advanced mode

* Implemented wallet name functional.

* BTC fixes

* delete LTC condition

* Fix estimate fee logic.

* Layout fixes.

* added based on gasLimit text

* fix walletContent open form error

* Fix estimate fee action.

* Fix filter for transactions list.

* remove slider from confirmation modal

* Fixes after merge

* HWWallets fixes after merge

* remove slider from confirmation modal

* Rework in transactions.

* Removed console.log.

* tx fixes

* Fixes in confirm dialog.

* fix transition to Wallet page from left menu

* Fixes in deposit.

* Small Fixes

* fix WalletsCount on left menu

* Added warning widget for 2fa.

* fix WalletsCount on left menu

* Relogin issues ugly fix

* Added 2fa wallet form. Some other fixes.

* Added second and third steps for 2fa wallet form.

* Added 2fa enable form.

* Added license in files.

* Ugly hack to make metamask work again

* Added action for create 2fa wallet.

* WIP

* Implemented actions for confirm tx.
Implemented popup fro confirm tx.
Implemented action for create 2fa wallet.
Changed transfer for 2fa wallet.
Implemented action for getting secret code.

* save

* Implemented new api from Middleware.
Implemented all process for 2fa without confirm tx.

* Few fixes after merge

* cleanup

* Completed 2fa process.

* Layouts fixes.

* Created compact view for wallets list.

* Added some selectors and implement price layout.

* Added some selectors and implement tokens count component.

* Initial Waves commit

* Fix after PR review

* Small fixes

* Small fixes.

* Implemented signing for btc/ltc derived wallets.
Start implementing watchers.

* Start implementing watchers.
Also, fixed value in btc-like transactions.

* Implement start version of refactoring.

* Small Fixes.

* Fix re-render in main menu.

* Fix frequent re-render on wallet detail page.

* Waves support added, still need some fix and refactoring

* Cleanup

* Fixed balances for Derived wallets.

* Refactor selectors.

* Added last block watcher for btc-like coins.

* Fix comments and other improvements.

* Fix comments.

* Remove useless constants and method. Moved constants to another file.

* Remove default tokens list.

* Some fixes.

* Small fixes

* Package.json update

* Create types file and fix types.

* Package.json fix

* Travis.yml fix

* Package.json fix

* Small fix.

* Fix balances in 2fa wallets.
Fix send for btc wallets.

* Otpauth changed.

* Small fixes

* Cleanup

* Change buttons styles.

* Changed version

* Fixed login.

* Fixed login.

* Fix waves init for pkey and wallet providers

* Cleanup

* Fix.

* Changed derived path.

* Waves asset transfer fix

* Release 0.9.1

* Waves assets transfer added

* Small i18n fix for waves

* Cleanup

* Change version.

* MINT-1703 fix i18n loading problem

* MINT-1730.
Fix.

* Increased version to 0.9.5

* fix wallets page mobile layout

* MINT-1742 fix wallets page mobile layout

* MINT-1742 fixed issues with mobile layout

* MINT-1742 fixed issues with mobile layout

* MINT-1742 fixed token table in wallet

* MINT-1742 fixed token table in wallet, p2
  • Loading branch information
e-maximus authored and wAISw committed Aug 21, 2018
1 parent f98124a commit 924a963
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 22 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@chronobank/mint",
"version": "0.9.5",
"version": "0.9.6",
"description": "Control panel for ChronoBank",
"private": true,
"author": "chronobank",
Expand Down
83 changes: 65 additions & 18 deletions src/components/wallet/TokensListWidget/TokensListWidget.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
* Licensed under the AGPL Version 3 license.
*/
@import '~styles/partials/variables';
@import '~styles/partials/mixins';

.root {
width: 100%;
background: $color-white;
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.15);
border-radius: 2px;

.header {
font-weight: 500;
padding: 25px 30px;
Expand All @@ -18,85 +20,130 @@

.tokens-list {
display: flex;

.tokens-list-table {
width: 100%;
display: grid;
display: table;
border-bottom: 1px solid $button-color-3;

.tokens-list-table-tr {
display: grid;
grid-template-columns: 160px 1fr 1fr;
display: table-row;
border-top: 1px solid $button-color-3;
border-bottom: 1px solid $button-color-3;
font-weight: 500;

.tokens-list-table-cell-icon {
padding: 15px 30px;
display: flex;
align-items: center;
display: table-cell;
text-align: center;
vertical-align: middle;
border-right: 1px solid $button-color-3;
border-top: 1px solid $button-color-3;

@include sm-only {
padding: 5px 15px;
}

.table-image {
width: 40px;
width: auto;
height: 40px;
background-size: contain;
background-repeat: no-repeat;
background-position: center center;
margin-right: 20px;
text-align: center;

@include sm-only {
width: auto;
height: 40px;
margin-right: 0;
}
}
}

.tokens-list-table-cell-amount {
padding: 15px 30px;
display: flex;
align-items: center;
display: table-cell;
vertical-align: middle;
font-size: 14px;
line-height: 17px;
color: $color-primary-3;
border-right: 1px solid $button-color-3;
border-top: 1px solid $button-color-3;

@include sm-only {
padding: 5px 15px;
}
}

.tokens-list-table-cell-usd {
padding: 15px 30px;
display: flex;
align-items: center;
display: table-cell;
vertical-align: middle;
color: $color-primary-3;
font-size: 14px;
line-height: 17px
line-height: 17px;
border-right: 1px solid $button-color-3;
border-top: 1px solid $button-color-3;

@include sm-only {
padding: 5px 15px;
}
}

.tokens-list-table-cell-sort-token {
cursor: pointer;
padding: 10px 30px;
display: flex;
align-items: center;
display: table-cell;
vertical-align: middle;
text-align: center;

@include sm-only {
padding: 5px 15px;
}

&:hover {
padding-top: 10px;
background-color: $color-grey-3;
padding-bottom: 10px;
}

.table-image {
width: 40px;
height: 40px;
background-size: contain;
background-repeat: no-repeat;
background-position: center center;

@include sm-only {
width: auto;
height: 40px;
}
}
}

.tokens-list-table-cell-sort-amount {
cursor: pointer;
padding: 10px 30px;
display: flex;
align-items: center;
display: table-cell;
vertical-align: middle;
font-size: 14px;
line-height: 17px;
color: $color-primary-3;
border-right: 1px solid $button-color-3;
border-left: 1px solid $button-color-3;

&:hover {
padding-top: 10px;
background-color: $color-grey-3;
padding-bottom: 10px;
}
}

.tokens-list-table-cell-sort-usd {
cursor: pointer;
padding: 10px 30px;
display: flex;
align-items: center;
display: table-cell;
vertical-align: middle;
color: $color-primary-3;
font-size: 14px;
line-height: 17px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the AGPL Version 3 license.
*/
@import '~styles/partials/variables';
@import '~styles/partials/mixins';

.transactions {
width: 590px;
Expand All @@ -11,6 +12,11 @@
color: $color-primary-3;
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.15);
border-radius: 2px;

@include xs-only {
width: 100%;
}

.header {
padding: 25px 30px;
border-bottom: 1px solid $color-grey-1;
Expand Down
41 changes: 40 additions & 1 deletion src/components/wallet/WalletWidget/WalletWidget.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,28 @@
* Licensed under the AGPL Version 3 license.
*/
@import '~styles/partials/variables';
@import "~styles/partials/mixins";

.header-container {
width: 587px;
margin-bottom: 28px;
margin-top: 28px;

@include sm-only {
display: flex;
flex: 1;
flex-direction: column;
width: 100%;
}

.header-text {
color: $color-white;

@include sm-only {
margin-left: 5px;
}
}

.wallet-list-container {
display: flex;
flex-direction: column;
Expand All @@ -26,6 +40,11 @@
background-color: $color-white;
border-radius: 2px;
box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.15);

@include sm-only {
flex: 1;
width: auto;
}
}

.settings-container {
Expand Down Expand Up @@ -157,6 +176,12 @@
flex-direction: column;
padding-top: 50px;
width: 370px;

@include xs-only {
flex: 1;
width: 100%;
max-width: 264px;
}
}

.token-container {
Expand All @@ -165,6 +190,12 @@
flex-direction: row;
margin-right: 40px;
margin-left: 40px;

@include xs-only {
margin-right: 15px;
margin-left: 15px;
}

:global {
.SubIconForWallet_root {
position: absolute;
Expand All @@ -178,7 +209,12 @@
display: flex;
width: 100px;
height: 100px;
margin-top: 50px;
margin-top: 25px;

@include xs-only {
width: 50px;
height: 50px;
}
}

.address-title {
Expand All @@ -195,6 +231,7 @@
font-weight: 400;
line-height: 20px;
text-align: left;
word-wrap: break-word;
}

.token-amount-container {
Expand Down Expand Up @@ -302,6 +339,7 @@
.addressWrapper {
text-decoration: none;
color: $color-primary-3;

.address-address {
color: $color-grey-2;
}
Expand All @@ -323,6 +361,7 @@
position: absolute;
top: 20px;
right: 75px;

.pendings-icon {
line-height: 14px;
background-color: $color-red-2;
Expand Down
Loading

0 comments on commit 924a963

Please sign in to comment.