Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tx history update #518

Merged
merged 4 commits into from
Mar 7, 2018

Conversation

shanejonas
Copy link
Contributor

@shanejonas shanejonas commented Mar 7, 2018

txhistory
image

fixes #486
fixes #500
fixes #518

solution: add ui for confirmations + fix bug with tx view updating
@codecov
Copy link

codecov bot commented Mar 7, 2018

Codecov Report

Merging #518 into master will decrease coverage by 0.01%.
The diff coverage is 16%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #518      +/-   ##
==========================================
- Coverage   19.13%   19.11%   -0.02%     
==========================================
  Files         159      159              
  Lines        3162     3180      +18     
  Branches      385      390       +5     
==========================================
+ Hits          605      608       +3     
- Misses       2306     2317      +11     
- Partials      251      255       +4
Impacted Files Coverage Δ
src/components/tx/TxHistory/List/transaction.js 0% <ø> (ø) ⬆️
src/store/wallet/settings/actionTypes.js 100% <ø> (ø) ⬆️
src/store/wallet/history/historyReducers.js 89.85% <ø> (ø) ⬆️
src/components/tx/TxDetails/status.js 14.28% <0%> (ø) ⬆️
src/components/settings/settings.js 0% <0%> (ø) ⬆️
src/store/wallet/settings/settingsActions.js 0% <0%> (ø) ⬆️
src/components/tx/TxHistory/List/TxView.js 15.78% <0%> (-9.22%) ⬇️
src/components/tx/TxHistory/history.js 0% <0%> (ø) ⬆️
src/components/tx/TxHistory/Header/header.js 66.66% <100%> (ø) ⬆️
src/store/wallet/settings/settingsReducers.js 89.28% <50%> (-10.72%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9730afa...73a5f27. Read the comment docs.

@shanejonas shanejonas changed the title Feature/tx history update tx history update Mar 7, 2018
@@ -22,9 +22,11 @@ export default connect(

return {
showFiat: launcher.selectors.getChainName(state).toLowerCase() === 'mainnet',
network: state.network.toJS(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will cause re-rendering component because toJS() produces new object every time. Do we need whole network structure or currentBlockNumber is enough here ?

@@ -83,4 +105,8 @@ TxView.propTypes = {
fromAccount: PropTypes.object.isRequired,
openTx: PropTypes.func.isRequired,
refreshTx: PropTypes.func.isRequired,
currentBlock: PropTypes.string.isRequired,
Copy link
Contributor

@gagarin55 gagarin55 Mar 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't find usage of currentBlock property, instead we have network property not declared here

// TODO: move tx status to own component
// TODO: timestamp
let txStatus = null;
if (tx.get('blockNumber')) {
txStatus = <span style={{color: 'limegreen'}} onClick={ openTx }>Success</span>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use this color #47B04B for success

@shanejonas shanejonas merged commit 13e8990 into emeraldpay:master Mar 7, 2018
@shanejonas shanejonas deleted the feature/tx-history-update branch March 7, 2018 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Transaction "In queue" until clicked "In queue" indicator takes too long
2 participants