diff --git a/cra-battery-considerate-loading/src/components/BatteryUI/index.js b/cra-battery-considerate-loading/src/components/BatteryUI/index.js index 8b72bc4cc..cd83c7ffb 100644 --- a/cra-battery-considerate-loading/src/components/BatteryUI/index.js +++ b/cra-battery-considerate-loading/src/components/BatteryUI/index.js @@ -22,7 +22,7 @@ class BatteryUI extends Component { state = { chargingTime: null, chargingState: null, - dichargeTime: null, + dischargeTime: null, level: null, unsupportMessage: null }; @@ -49,14 +49,14 @@ class BatteryUI extends Component { updateBatteryUI = battery => { this.setState({ chargingTime: `${battery.chargingTime} Seconds`, - dichargeTime: `${battery.dischargingTime} Seconds`, + dischargeTime: `${battery.dischargingTime} Seconds`, level: `${battery.level * 100}%`, chargingState: battery.charging === true ? 'Charging' : 'Discharging' }); }; render () { - const { chargingTime, chargingState, dichargeTime, level, unsupportMessage } = this.state; + const { chargingTime, chargingState, dischargeTime, level, unsupportMessage } = this.state; return (
{ unsupportMessage ? ( @@ -73,7 +73,7 @@ class BatteryUI extends Component {
Time to discharge:
-
{dichargeTime}
+
{dischargeTime}
Battery Level:
diff --git a/cra-battery-considerate-loading/src/utils/hooks.js b/cra-battery-considerate-loading/src/utils/hooks.js index 45d6d9a3d..29809073f 100644 --- a/cra-battery-considerate-loading/src/utils/hooks.js +++ b/cra-battery-considerate-loading/src/utils/hooks.js @@ -35,7 +35,7 @@ const useBatteryStatus = () => { const updateBatteryStatus = battery => { setBatteryStatus({ chargingTime: `${battery.chargingTime} Seconds`, - dichargeTime: `${battery.dischargingTime} Seconds`, + dischargeTime: `${battery.dischargingTime} Seconds`, level: battery.level, chargingState: battery.charging === true ? 'Charging' : 'Discharging' }); diff --git a/hooks/battery/battery.test.js b/hooks/battery/battery.test.js index d44190949..753af1146 100644 --- a/hooks/battery/battery.test.js +++ b/hooks/battery/battery.test.js @@ -38,7 +38,7 @@ describe('useBatteryStatus', () => { expect(result.current.batteryStatus).toEqual({ chargingTime: '20 Seconds', - dichargeTime: '40 Seconds', + dischargeTime: '40 Seconds', level: 50, chargingState: 'Charging' }); @@ -63,7 +63,7 @@ describe('useBatteryStatus', () => { expect(result.current.batteryStatus).toEqual({ chargingTime: '20 Seconds', - dichargeTime: '40 Seconds', + dischargeTime: '40 Seconds', level: 50, chargingState: 'Charging' }); @@ -105,7 +105,7 @@ describe('useBatteryStatus', () => { // batteryStatus is supposed to be updated because updateBatteryStatus should be called internally expect(result.current.batteryStatus).toEqual({ chargingTime: '20 Seconds', - dichargeTime: '40 Seconds', + dischargeTime: '40 Seconds', level: 50, chargingState: 'Charging' }); @@ -119,7 +119,7 @@ describe('useBatteryStatus', () => { expect(result.current.batteryStatus).toEqual({ chargingTime: '30 Seconds', - dichargeTime: '50 Seconds', + dischargeTime: '50 Seconds', level: 60, chargingState: 'Discharging' }); diff --git a/hooks/battery/index.js b/hooks/battery/index.js index 6bbac3c27..a70ae246a 100644 --- a/hooks/battery/index.js +++ b/hooks/battery/index.js @@ -35,7 +35,7 @@ const useBatteryStatus = () => { const updateBatteryStatus = battery => { setBatteryStatus({ chargingTime: `${battery.chargingTime} Seconds`, - dichargeTime: `${battery.dischargingTime} Seconds`, + dischargeTime: `${battery.dischargingTime} Seconds`, level: battery.level, chargingState: battery.charging === true ? 'Charging' : 'Discharging' });