diff --git a/src/js/background.js b/src/js/background.js
index fa70853..0322dc1 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -12,7 +12,7 @@ function resetBubble({ tab, apiClient, service }) {
messenger.postMessage(tab, {
type: "showBubble",
payload: {
- bookedHours: parseFloat(data.hours),
+ bookedSeconds: data.seconds,
timedActivity: data.timed_activity,
service,
},
diff --git a/src/js/components/Bubble.js b/src/js/components/Bubble.js
index b80e0b5..3a428a2 100644
--- a/src/js/components/Bubble.js
+++ b/src/js/components/Bubble.js
@@ -5,14 +5,14 @@ import mocoTimerLogo from "images/moco-timer-32x32.png"
import { parseISO } from "date-fns"
import Timer from "./shared/Timer"
-const Bubble = ({ bookedHours, timedActivity }) => {
+const Bubble = ({ bookedSeconds, timedActivity }) => {
const logo = timedActivity ? mocoTimerLogo : mocoLogo
return (
})
- {!timedActivity && bookedHours > 0 && (
-
{bookedHours.toFixed(2)}
+ {!timedActivity && bookedSeconds > 0 && (
+
{(bookedSeconds / 3600).toFixed(2)}
)}
{timedActivity && (
{
}
Bubble.propTypes = {
- bookedHours: PropTypes.number,
+ bookedSeconds: PropTypes.number,
timedActivity: PropTypes.shape({
timer_started_at: PropTypes.string.isRequired,
seconds: PropTypes.number.isRequired,
@@ -34,7 +34,7 @@ Bubble.propTypes = {
}
Bubble.defaultProps = {
- bookedHours: 0,
+ bookedSeconds: 0,
}
export default Bubble
diff --git a/src/js/content.js b/src/js/content.js
index 5d9d2f3..609bb16 100644
--- a/src/js/content.js
+++ b/src/js/content.js
@@ -25,7 +25,7 @@ chrome.runtime.onConnect.addListener(function(port) {
document.removeEventListener("click", clickHandler, true)
})
- function updateBubble({ service, bookedHours, timedActivity } = {}) {
+ function updateBubble({ service, bookedSeconds, timedActivity } = {}) {
if (!document.getElementById("moco-bx-root")) {
const domRoot = document.createElement("div")
domRoot.setAttribute("id", "moco-bx-root")
@@ -47,7 +47,11 @@ chrome.runtime.onConnect.addListener(function(port) {
// eslint-disable-next-line react/display-name
(props => (
-
+
))
}
diff --git a/src/js/utils/messageHandlers.js b/src/js/utils/messageHandlers.js
index 9ffc85d..d04fde9 100644
--- a/src/js/utils/messageHandlers.js
+++ b/src/js/utils/messageHandlers.js
@@ -10,7 +10,7 @@ import {
import { get, forEach, reject, isNil } from "lodash/fp"
import { createMatcher } from "utils/urlMatcher"
import remoteServices from "remoteServices"
-import { queryTabs, isBrowserTab, getSettings } from "utils/browser"
+import { queryTabs, isBrowserTab, getSettings, setStorage } from "utils/browser"
const matcher = createMatcher(remoteServices)
@@ -30,7 +30,7 @@ export function tabUpdated(tab, { messenger, settings }) {
messenger.postMessage(tab, {
type: "showBubble",
payload: {
- bookedHours: parseFloat(data.hours),
+ bookedSeconds: data.seconds,
timedActivity: data.timed_activity,
service,
},
@@ -40,7 +40,7 @@ export function tabUpdated(tab, { messenger, settings }) {
messenger.postMessage(tab, {
type: "showBubble",
payload: {
- bookedHours: 0,
+ bookedSeconds: 0,
service,
},
})