@ -477,7 +477,9 @@ class WalletsData extends React.Component {
items . push ( items . push (
< li key = { address . address } > < li key = { address . address } >
< a tabIndex = "0" onClick = { ( ) => this . updateAddressSelection ( address . address , type , _ amount ) } > < i className = { type === 'public' ? 'icon fa-eye' : 'icon fa-eye-slash' } > < / i > < s p a n c l a s s N a m e = " t e x t " > [ { _ a m o u n t } { t h i s . p r o p s . A c t i v e C o i n . c o i n } ] { a d d r e s s . a d d r e s s } < / s p a n > < s p a n c l a s s N a m e = " g l y p h i c o n g l y p h i c o n - o k c h e c k - m a r k " > < / s p a n > < / a > < a
tabIndex = "0"
onClick = { ( ) => this . updateAddressSelection ( address . address , type , _ amount ) } > < i className = { type === 'public' ? 'icon fa-eye' : 'icon fa-eye-slash' } > < / i > < s p a n c l a s s N a m e = " t e x t " > [ { _ a m o u n t } { t h i s . p r o p s . A c t i v e C o i n . c o i n } ] { a d d r e s s . a d d r e s s } < / s p a n > < s p a n c l a s s N a m e = " g l y p h i c o n g l y p h i c o n - o k c h e c k - m a r k " > < / s p a n > < / a >
< / l i > < / l i >
) ; ) ;
} }
@ -494,7 +496,8 @@ class WalletsData extends React.Component {
this . props . ActiveCoin . addresses . public . length ) { this . props . ActiveCoin . addresses . public . length ) {
for ( let i = 0 ; i < this . props . ActiveCoin . addresses . public . length ; i ++ ) { for ( let i = 0 ; i < this . props . ActiveCoin . addresses . public . length ; i ++ ) {
if ( this . props . ActiveCoin . addresses . public [ i ] . address === this . state . currentAddress ) { if ( this . props . ActiveCoin . addresses . public [ i ] . address === this . state . currentAddress ) {
if ( this . props . ActiveCoin . addresses . public [ i ] . amount && this . props . ActiveCoin . addresses . public [ i ] . amount !== 'N/A' ) { if ( this . props . ActiveCoin . addresses . public [ i ] . amount &&
this . props . ActiveCoin . addresses . public [ i ] . amount !== 'N/A' ) {
return this . props . ActiveCoin . addresses . public [ i ] . amount ; return this . props . ActiveCoin . addresses . public [ i ] . amount ;
} else { } else {
const address = this . props . ActiveCoin . addresses . public [ i ] . address ; const address = this . props . ActiveCoin . addresses . public [ i ] . address ;
@ -512,12 +515,12 @@ class WalletsData extends React.Component {
if ( this . state . currentAddress ) { if ( this . state . currentAddress ) {
return ( return (
< span > < span >
< i className = { this . state . addressType === 'public' ? 'icon fa-eye' : 'icon fa-eye-slash' } > < / i > < s p a n c l a s s N a m e = " t e x t " > [ { t h i s . r e n d e r A d d r e s s A m o u n t ( ) } { t h i s . p r o p s . A c t i v e C o i n . c o i n } ] { t h i s . s t a t e . c u r r e n t A d d r e s s } < / s p a n > < i className = { this . state . addressType === 'public' ? 'icon fa-eye' : 'icon fa-eye-slash' } > < / i > < s p a n c l a s s N a m e = " t e x t " > [ { t h i s . r e n d e r A d d r e s s A m o u n t ( ) } { t h i s . p r o p s . A c t i v e C o i n . c o i n } ] { t h i s . s t a t e . c u r r e n t A d d r e s s } < / s p a n >
< / s p a n > < / s p a n >
) ; ) ;
} else { } else {
return ( return (
< span > - Select Transparent or Private Address - < / s p a n > < span > - { translate ( 'KMD_NATIVE.SELECT_ADDRESS' ) } - < / s p a n >
) ; ) ;
} }
} }
@ -528,16 +531,24 @@ class WalletsData extends React.Component {
this . props . Dashboard . activeHandle [ this . props . ActiveCoin . coin ] && this . props . Dashboard . activeHandle [ this . props . ActiveCoin . coin ] &&
this . props . ActiveCoin . mode === 'basilisk' ) { this . props . ActiveCoin . mode === 'basilisk' ) {
return ( return (
< div className = { 'btn-group bootstrap-select form-control form-material showkmdwalletaddrs show-tick ' + ( this . state . addressSelectorOpen ? 'open' : '' ) } > < div className = { 'btn-group bootstrap-select form-control form-material showkmdwalletaddrs show-tick ' + ( this . state . addressSelectorOpen ? 'open' : '' ) } >
< button type = "button" className = "btn dropdown-toggle btn-info" data - toggle = "dropdown" data - id = "kmd_wallet_send_from" title = "- Select Transparent or Private Address -" aria - expanded = "true" onClick = { this . openDropMenu } > < button
< span className = "filter-option pull-left" > { this . renderSelectorCurrentLabel ( ) } < / s p a n > & n b s p ; < s p a n c l a s s N a m e = " b s - c a r e t " > < s p a n c l a s s N a m e = " c a r e t " > < / s p a n > < / s p a n > type = "button"
className = "btn dropdown-toggle btn-info"
title = { '-' + translate ( 'KMD_NATIVE.SELECT_ADDRESS' ) + '-' }
aria - expanded = "true"
onClick = { this . openDropMenu } >
< span className = "filter-option pull-left" > { this . renderSelectorCurrentLabel ( ) } < / s p a n > & n b s p ;
< span className = "bs-caret" >
< span className = "caret" > < / s p a n >
< / s p a n >
< / b u t t o n > < / b u t t o n >
< div className = "dropdown-menu open" > < div className = "dropdown-menu open" >
< ul className = "dropdown-menu inner" role = "menu" > < ul className = "dropdown-menu inner" role = "menu" >
< li data - original - index = "1" className = "selected" > < li data - original - index = "1" className = "selected" >
< a tabIndex = "0" data - tokens = "null" > < span className = "text" > - Select Transparent or Private Address - < / s p a n > < s p a n c l a s s N a m e = " g l y p h i c o n g l y p h i c o n - o k c h e c k - m a r k " > < / s p a n > < / a > < a tabIndex = "0" > < span className = "text" > - { translate ( 'KMD_NATIVE.SELECT_ADDRESS' ) } - < / s p a n > < s p a n c l a s s N a m e = " g l y p h i c o n g l y p h i c o n - o k c h e c k - m a r k " > < / s p a n > < / a >
< / l i > < / l i >
{ this . renderAddressByType ( 'public' ) } { this . renderAddressByType ( 'public' ) }
< / u l > < / u l >
< / d i v > < / d i v >
< / d i v > < / d i v >
@ -560,118 +571,139 @@ class WalletsData extends React.Component {
< WalletsBasiliskConnection { ... this . props } / > < WalletsBasiliskConnection { ... this . props } / >
< WalletsNotariesList { ... this . props } / > < WalletsNotariesList { ... this . props } / >
< WalletsCacheData { ... this . props } / > < WalletsCacheData { ... this . props } / >
< div data - edexcoin = "COIN" id = "edexcoin_dashboardinfo" > < div id = "edexcoin_dashboardinfo" >
< div className = "col-xs-12 margin-top-20" > < div className = "col-xs-12 margin-top-20" >
< div className = "panel nav-tabs-horizontal" > < div className = "panel nav-tabs-horizontal" >
< div data - edexcoin = "COIN" id = "edexcoin_dashoard_section" > < div id = "edexcoin_dashoard_section" >
< div className = "col-xlg-12 col-lg-12 col-sm-12 col-xs-12 edexcoin_dashoard_section_main_div" > < div className = "col-xlg-12 col-lg-12 col-sm-12 col-xs-12 edexcoin_dashoard_section_main_div" >
< div id = "edexcoin_txhistory" className = "panel" > < div id = "edexcoin_txhistory" className = "panel" >
< header className = "panel-heading" style = { { zIndex : '10' } } > < header className = "panel-heading" style = { { zIndex : '10' } } >
< div className = { this . props . ActiveCoin . mode === 'basilisk' ? 'panel-actions' : 'panel-actions hide' } > < div className = { this . props . ActiveCoin . mode === 'basilisk' ? 'panel-actions' : 'panel-actions hide' } >
< div className = { this . state . currentStackLength === 1 || ( this . state . currentStackLength === 0 && this . state . totalStackLength === 0 ) ? 'hide' : 'progress progress-sm' } style = { { width : '100%' , marginBottom : '3px' } } > < div
< div className = "progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success" style = { { width : 100 - ( this . state . currentStackLength * 100 / this . state . totalStackLength ) + '%' , fontSize : '80%' } } role = "progressbar" > className = { this . state . currentStackLength === 1 || ( this . state . currentStackLength === 0 && this . state . totalStackLength === 0 ) ? 'hide' : 'progress progress-sm' }
Processing requests : { this . state . currentStackLength } / { this . state . totalStackLength } style = { { width : '100%' , marginBottom : '3px' } } >
< div
className = "progress-bar progress-bar-striped active progress-bar-indicating progress-bar-success"
style = { { width : 100 - ( this . state . currentStackLength * 100 / this . state . totalStackLength ) + '%' , fontSize : '80%' } }
role = "progressbar" >
{ translate ( 'SEND.PROCESSING_REQ' ) } : { this . state . currentStackLength } / { this . state . totalStackLength }
< / d i v > < / d i v >
< / d i v > < / d i v >
< div className = { this . state . basiliskActionsMenu ? 'dropdown open' : 'dropdown' } onClick = { this . toggleBasiliskActionsMenu } > < div className = { this . state . basiliskActionsMenu ? 'dropdown open' : 'dropdown' } onClick = { this . toggleBasiliskActionsMenu } >
< a className = "dropdown-toggle btn-xs btn-default" data - edexcoin = "COIN" id = "btn_edexcoin_basilisk" data - toggle = "dropdown" href = "javascript:void(0)" < a
aria - expanded = "false" role = "button" > className = "dropdown-toggle btn-xs btn-default"
< i className = "icon fa-magic margin-right-10" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . B A S I L I S K _ A C T I O N S ' ) } < s p a n c l a s s N a m e = " c a r e t " > < / s p a n > id = "btn_edexcoin_basilisk"
href = "javascript:void(0)"
aria - expanded = "false"
role = "button" >
< i className = "icon fa-magic margin-right-10" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . B A S I L I S K _ A C T I O N S ' ) } < s p a n c l a s s N a m e = " c a r e t " > < / s p a n >
< / a > < / a >
< ul className = "dropdown-menu dropdown-menu-right" aria - labelledby = "btn_edexcoin_basilisk" < ul className = "dropdown-menu dropdown-menu-right" aria - labelledby = "btn_edexcoin_basilisk" role = "menu" >
role = "menu" >
< li role = "presentation" > < li role = "presentation" >
< a className = "btn_edexcoin_dashboard_getnotaries" data - edexcoin = "COIN" id = "btn_edexcoin_dashboard_getnotaries" role = "menuitem" onClick = { this . getDexNotariesAction } > < a
< i className = "icon fa-sitemap" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . G E T _ N O T A R Y _ N O D E S _ L I S T ' ) } className = "btn_edexcoin_dashboard_getnotaries"
id = "btn_edexcoin_dashboard_getnotaries"
role = "menuitem"
onClick = { this . getDexNotariesAction } >
< i className = "icon fa-sitemap" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . G E T _ N O T A R Y _ N O D E S _ L I S T ' ) }
< / a > < / a >
< / l i > < / l i >
< li role = "presentation" > < li role = "presentation" >
< a className = "btn_edexcoin_dashboard_refresh_basilisk_conn" data - edexcoin = "COIN" id = "btn_edexcoin_dashboard_refresh_basilisk_conn" role = "menuitem" onClick = { this . basiliskConnectionAction } > < a
< i className = "icon wb-refresh" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . R E F R E S H _ B A S I L I S K _ C O N N E C T I O N S ' ) } className = "btn_edexcoin_dashboard_refresh_basilisk_conn"
id = "btn_edexcoin_dashboard_refresh_basilisk_conn"
role = "menuitem"
onClick = { this . basiliskConnectionAction } >
< i className = "icon wb-refresh" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . R E F R E S H _ B A S I L I S K _ C O N N E C T I O N S ' ) }
< / a > < / a >
< / l i > < / l i >
< li data - edexcoin = "COIN" role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } > < li role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } >
< a className = "btn_edexcoin_dashboard_fetchdata" data - edexcoin = "COIN" id = "btn_edexcoin_dashboard_fetchdata" role = "menuitem" onClick = { this . basiliskRefreshActionOne } > < a
< i className = "icon fa-cloud-download" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . F E T C H _ W A L L E T _ D A T A ' ) } ( a c t i v e a d d r e s s ) className = "btn_edexcoin_dashboard_fetchdata"
id = "btn_edexcoin_dashboard_fetchdata"
role = "menuitem"
onClick = { this . basiliskRefreshActionOne } >
< i className = "icon fa-cloud-download" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . F E T C H _ W A L L E T _ D A T A ' ) } ( { t r a n s l a t e ( ' I N D E X . A C T I V E _ A D D R E S S ' ) } )
< / a > < / a >
< / l i > < / l i >
< li data - edexcoin = "COIN" role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } > < li
< a role = "menuitem" onClick = { this . basiliskRefreshAction } > role = "presentation"
< i className = "icon fa-cloud-download" aria - hidden = "true" > < / i > F e t c h ( a l l a d d r e s s e s ) className = { ! this . state . useCache || this . props . ActiveCoin . addresses . public . length === 1 ? 'hide' : '' } >
< a role = "menuitem" onClick = { this . basiliskRefreshAction } >
< i className = "icon fa-cloud-download" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . F E T C H _ A L L _ A D D R ' ) }
< / a > < / a >
< / l i > < / l i >
< li data - edexcoin = "COIN" role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } > < li role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } >
< a className = "btn_edexcoin_dashboard_refetchdata" data - edexcoin = "COIN" id = "btn_edexcoin_dashboard_refetchdata" role = "menuitem" onClick = { this . removeAndFetchNewCache } > < a
< i className = "icon fa-history" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . R E F E T C H _ W A L L E T _ D A T A ' ) } className = "btn_edexcoin_dashboard_refetchdata"
id = "btn_edexcoin_dashboard_refetchdata"
role = "menuitem"
onClick = { this . removeAndFetchNewCache } >
< i className = "icon fa-history" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . R E F E T C H _ W A L L E T _ D A T A ' ) }
< / a > < / a >
< / l i > < / l i >
< li data - edexcoin = "COIN" role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } style = { { display : 'none' } } > < li role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } style = { { display : 'none' } } >
< a role = "menuitem" onClick = { this . _ fetchUtxoCache } > < a role = "menuitem" onClick = { this . restartBasiliskInstance } >
< i className = "icon fa-history " aria - hidden = "true" > < / i > U p d a t e U T X O < i className = "icon fa-refresh " aria - hidden = "true" > < / i > R e s t a r t B a s i l i s k I n s t a n c e ( u n s a f e ! )
< / a > < / a >
< / l i > < / l i >
< li data - edexcoin = "COIN" role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } > < li role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } >
< a role = "menuitem" onClick = { this . restartBasiliskInstance } > < a className = "btn_edexcoin_dashboard_fetchdata" role = "menuitem" onClick = { this . _ toggleViewCacheModal } >
< i className = "icon fa-refresh" aria - hidden = "true" > < / i > R e s t a r t B a s i l i s k I n s t a n c e ( ! ) < i className = "icon fa-list-alt" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . V I E W _ C A C H E _ D A T A ' ) }
< / a >
< / l i >
< li data - edexcoin = "COIN" role = "presentation" className = { ! this . state . useCache ? 'hide' : '' } >
< a className = "btn_edexcoin_dashboard_fetchdata" role = "menuitem" onClick = { this . _ toggleViewCacheModal } >
< i className = "icon fa-list-alt" aria - hidden = "true" > < / i > { t r a n s l a t e ( ' I N D E X . V I E W _ C A C H E _ D A T A ' ) }
< / a > < / a >
< / l i > < / l i >
< / u l > < / u l >
< / d i v > < / d i v >
< / d i v > < / d i v >
< h4 className = "panel-title" > { translate ( 'INDEX.TRANSACTION_HISTORY' ) } < / h 4 > < h4 className = "panel-title" > { translate ( 'INDEX.TRANSACTION_HISTORY' ) } < / h 4 >
< / h e a d e r > < / h e a d e r >
< div className = "panel-body" > < div className = "panel-body" >
< div className = "row" > < div className = "row" >
< div className = "col-sm-8" > < div className = "col-sm-8" >
{ this . renderAddressList ( ) } { this . renderAddressList ( ) }
< / d i v > < / d i v >
{ this . renderUseCacheToggle } { this . renderUseCacheToggle }
< / d i v > < / d i v >
< div className = "row" style = { { padding : '20px 0 10px 0' } } > < div className = "row" style = { { padding : '20px 0 10px 0' } } >
< div className = "col-sm-6" > < div className = "col-sm-6" >
{ this . renderPaginationItemsPerPageSelector ( ) } { this . renderPaginationItemsPerPageSelector ( ) }
< / d i v > < / d i v >
< div className = "col-sm-6" > < div className = "col-sm-6" >
< div id = "kmd-tx-history-tbl_filter" className = "dataTables_filter" > < div id = "kmd-tx-history-tbl_filter" className = "dataTables_filter" >
< label > < label >
Search : < input type = "search" className = "form-control input-sm" aria - controls = "kmd-tx-history-tbl" disabled = "true" / > { translate ( 'INDEX.SEARCH' ) } : < input type = "search" className = "form-control input-sm" aria - controls = "kmd-tx-history-tbl" disabled = "true" / >
< / l a b e l > < / l a b e l >
< / d i v > < / d i v >
< / d i v > < / d i v >
< / d i v > < / d i v >
< div className = "row" > < div className = "row" >
< table className = "table table-hover dataTable table-striped" data - edexcoin = "COIN" id = "edex-tx-history-tbl" width = "100%" > < table className = "table table-hover dataTable table-striped" id = "edex-tx-history-tbl" width = "100%" >
< thead > < thead >
< tr > < tr >
< th > { translate ( 'INDEX.DIRECTION' ) } < / t h > < th > { translate ( 'INDEX.DIRECTION' ) } < / t h >
< th className = "hidden-xs hidden-sm" > { translate ( 'INDEX.CONFIRMATIONS' ) } < / t h > < th className = "hidden-xs hidden-sm" > { translate ( 'INDEX.CONFIRMATIONS' ) } < / t h >
< th > { translate ( 'INDEX.AMOUNT' ) } < / t h > < th > { translate ( 'INDEX.AMOUNT' ) } < / t h >
< th > { translate ( 'INDEX.TIME' ) } < / t h > < th > { translate ( 'INDEX.TIME' ) } < / t h >
< th > { translate ( 'INDEX.DEST_ADDRESS' ) } < / t h > < th > { translate ( 'INDEX.DEST_ADDRESS' ) } < / t h >
< th className = "hidden-xs hidden-sm" > { translate ( 'INDEX.TX_DETAIL' ) } < / t h > < th className = "hidden-xs hidden-sm" > { translate ( 'INDEX.TX_DETAIL' ) } < / t h >
< / t r > < / t r >
< / t h e a d > < / t h e a d >
< tbody > < tbody >
{ this . renderTxHistoryList ( ) } { this . renderTxHistoryList ( ) }
< / t b o d y > < / t b o d y >
< tfoot > < tfoot >
< tr > < tr >
< th > { translate ( 'INDEX.DIRECTION' ) } < / t h > < th > { translate ( 'INDEX.DIRECTION' ) } < / t h >
< th > { translate ( 'INDEX.CONFIRMATIONS' ) } < / t h > < th > { translate ( 'INDEX.CONFIRMATIONS' ) } < / t h >
< th > { translate ( 'INDEX.AMOUNT' ) } < / t h > < th > { translate ( 'INDEX.AMOUNT' ) } < / t h >
< th > { translate ( 'INDEX.TIME' ) } < / t h > < th > { translate ( 'INDEX.TIME' ) } < / t h >
< th > { translate ( 'INDEX.DEST_ADDRESS' ) } < / t h > < th > { translate ( 'INDEX.DEST_ADDRESS' ) } < / t h >
< th className = "hidden-xs hidden-sm" > { translate ( 'INDEX.TX_DETAIL' ) } < / t h > < th className = "hidden-xs hidden-sm" > { translate ( 'INDEX.TX_DETAIL' ) } < / t h >
< / t r > < / t r >
< / t f o o t > < / t f o o t >
< / t a b l e > < / t a b l e >
< / d i v > < / d i v >
{ this . renderPagination ( ) } { this . renderPagination ( ) }
< / d i v > < / d i v >
< / d i v > < / d i v >
< / d i v > < / d i v >
pbca26
8 years ago