From d6a3a54d28a5d1e21cc3cca9927c78f674044531 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Sat, 2 Nov 2019 00:46:57 +0100
Subject: installation popup in FF

---
 src/webex/background.ts |  2 +-
 src/webex/pages/tip.tsx |  2 +-
 src/webex/wxBackend.ts  | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/webex/background.ts b/src/webex/background.ts
index 3c63f323e..dbc540df4 100644
--- a/src/webex/background.ts
+++ b/src/webex/background.ts
@@ -23,7 +23,7 @@
 /**
  * Imports.
  */
-import {wxMain} from "./wxBackend";
+import { wxMain } from "./wxBackend";
 
 window.addEventListener("load", () => {
   wxMain();
diff --git a/src/webex/pages/tip.tsx b/src/webex/pages/tip.tsx
index 0a066053b..148b8203c 100644
--- a/src/webex/pages/tip.tsx
+++ b/src/webex/pages/tip.tsx
@@ -88,7 +88,7 @@ function TipDisplay(props: { talerTipUri: string }) {
       </p>
       <form className="pure-form">
         <ProgressButton loading={loading} onClick={() => accept()}>
-          AcceptTip
+          Accept Tip
         </ProgressButton>
         {" "}
         <button className="pure-button" type="button" onClick={() => discard()}>
diff --git a/src/webex/wxBackend.ts b/src/webex/wxBackend.ts
index 564ee24f0..16cd2a78c 100644
--- a/src/webex/wxBackend.ts
+++ b/src/webex/wxBackend.ts
@@ -547,19 +547,26 @@ function injectScript(
   });
 }
 
-/**
- * Main function to run for the WebExtension backend.
- *
- * Sets up all event handlers and other machinery.
- */
-export async function wxMain() {
+try {
+  // This needs to be outside of main, as Firefox won't fire the event if
+  // the listener isn't created synchronously on loading the backend.
   chrome.runtime.onInstalled.addListener(details => {
+    console.log("onInstalled with reason", details.reason);
     if (details.reason === "install") {
       const url = chrome.extension.getURL("/src/webex/pages/welcome.html");
       chrome.tabs.create({ active: true, url: url });
     }
   });
+} catch (e) {
+  console.error(e);
+}
 
+/**
+ * Main function to run for the WebExtension backend.
+ *
+ * Sets up all event handlers and other machinery.
+ */
+export async function wxMain() {
   // Explicitly unload the extension page as soon as an update is available,
   // so the update gets installed as soon as possible.
   chrome.runtime.onUpdateAvailable.addListener(details => {
-- 
cgit v1.2.3