Remove unused `time-remaining` component (#6912)

The `time-remaining` component hasn't been used since #5704, aside from
a few styles. Those styles have been integrated into the
`advanced-tab-content` styles, and the unused component has been
deleted.
feature/default_network_editable
Mark Stacey 5 years ago committed by GitHub
parent 429030a00e
commit 74639ab3ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js
  2. 24
      ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/index.scss
  3. 2
      ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/tests/advanced-tab-content-component.test.js
  4. 1
      ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/time-remaining/index.js
  5. 17
      ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/time-remaining/index.scss
  6. 30
      ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/time-remaining/tests/time-remaining-component.test.js
  7. 33
      ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/time-remaining/time-remaining.component.js
  8. 11
      ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/time-remaining/time-remaining.utils.js

@ -126,7 +126,7 @@ export default class AdvancedTabContent extends Component {
<div className="advanced-tab__transaction-data-summary__fee">
{transactionFee}
</div>
<div className="time-remaining">{timeRemaining}</div>
<div className="advanced-tab__transaction-data-summary__time-remaining">{timeRemaining}</div>
</div>
</div>
)

@ -1,5 +1,3 @@
@import './time-remaining/index';
.advanced-tab {
display: flex;
flex-flow: column;
@ -36,6 +34,24 @@
font-size: 16px;
color: #313A5E;
}
&__time-remaining {
color: #313A5E;
font-size: 16px;
.minutes-num, .seconds-num {
font-size: 16px;
}
.seconds-num {
margin-left: 7px;
font-size: 16px;
}
.minutes-label, .seconds-label {
font-size: 16px;
}
}
}
&__fee-chart {
@ -94,7 +110,7 @@
display: flex;
justify-content: space-between;
align-items: center;
.fa-info-circle {
color: $silver;
margin-left: 10px;
@ -204,4 +220,4 @@
color: $dusty-gray;
}
}
}
}

@ -124,7 +124,7 @@ describe('AdvancedTabContent Component', function () {
const dataNode = dataSummary.children().at(1)
assert(dataNode.hasClass('advanced-tab__transaction-data-summary__container'))
assert.equal(dataNode.children().at(0).text(), 'mockTotalFee')
assert(dataNode.children().at(1).hasClass('time-remaining'))
assert(dataNode.children().at(1).hasClass('advanced-tab__transaction-data-summary__time-remaining'))
assert.equal(dataNode.children().at(1).text(), 'mockMsRemaining')
})
})

@ -1,17 +0,0 @@
.time-remaining {
color: #313A5E;
font-size: 16px;
.minutes-num, .seconds-num {
font-size: 16px;
}
.seconds-num {
margin-left: 7px;
font-size: 16px;
}
.minutes-label, .seconds-label {
font-size: 16px;
}
}

@ -1,30 +0,0 @@
import React from 'react'
import assert from 'assert'
import shallow from '../../../../../../../../lib/shallow-with-context'
import TimeRemaining from '../time-remaining.component.js'
describe('TimeRemaining Component', function () {
let wrapper
beforeEach(() => {
wrapper = shallow(<TimeRemaining
milliseconds={495000}
/>)
})
describe('render()', () => {
it('should render the time-remaining root node', () => {
assert(wrapper.hasClass('time-remaining'))
})
it('should render minutes and seconds numbers and labels', () => {
const timeRemainingChildren = wrapper.children()
assert.equal(timeRemainingChildren.length, 4)
assert.equal(timeRemainingChildren.at(0).text(), 8)
assert.equal(timeRemainingChildren.at(1).text(), 'minutesShorthand')
assert.equal(timeRemainingChildren.at(2).text(), 15)
assert.equal(timeRemainingChildren.at(3).text(), 'secondsShorthand')
})
})
})

@ -1,33 +0,0 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { getTimeBreakdown } from './time-remaining.utils'
export default class TimeRemaining extends Component {
static contextTypes = {
t: PropTypes.func,
}
static propTypes = {
milliseconds: PropTypes.number,
}
render () {
const {
milliseconds,
} = this.props
const {
minutes,
seconds,
} = getTimeBreakdown(milliseconds)
return (
<div className="time-remaining">
<span className="minutes-num">{minutes}</span>
<span className="minutes-label">{this.context.t('minutesShorthand')}</span>
<span className="seconds-num">{seconds}</span>
<span className="seconds-label">{this.context.t('secondsShorthand')}</span>
</div>
)
}
}

@ -1,11 +0,0 @@
function getTimeBreakdown (milliseconds) {
return {
hours: Math.floor(milliseconds / 3600000),
minutes: Math.floor((milliseconds % 3600000) / 60000),
seconds: Math.floor((milliseconds % 60000) / 1000),
}
}
module.exports = {
getTimeBreakdown,
}
Loading…
Cancel
Save