Merge pull request #215 from mozilla/fix-releases

Fix deploy script and other changes.
mozilla · Oct 26, 2018 · 2daefd3 · 2daefd3
2 parents d04ef1e + 58d5c20
commit 2daefd3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.circleci/deploy_addon.sh b/.circleci/deploy_addon.sh
@@ -9,7 +9,7 @@ set -e
 
 ADDON_ID="[email protected]"
 ADDON_VERSION=${CIRCLE_TAG:1}
-ADDON_FILE="web-ext-artifacts/firefox_shopping-${ADDON_VERSION}-signed.xpi"
+ADDON_FILE="web-ext-artifacts/price_wise-${ADDON_VERSION}-signed.xpi"
 test -f $ADDON_FILE
 
 MAX_AGE=30 # We can up this at some point, but keeping it low while we work out the kinks

diff --git a/src/browser_action/components/EmptyOnboarding.css b/src/browser_action/components/EmptyOnboarding.css
@@ -9,8 +9,9 @@
   display: flex;
   flex-direction: column;
   gap: 16px;
-  margin: 16px;
+  margin: 16px auto;
   text-align: center;
+  width: 288px;
 }
 
 .empty-onboarding .hero {

diff --git a/src/browser_action/index.css b/src/browser_action/index.css
@@ -16,6 +16,7 @@ body {
   font-size: 13px;
   margin: 0;
   max-height: 600px;
+  overflow: auto;
   padding: 0;
 }
 

diff --git a/src/config.js b/src/config.js
@@ -6,7 +6,7 @@
 /**
  * Config values that are shared between files or otherwise useful to have in
  * a separate file. Config values can be overridden by setting a pref at the
- * subtree [email protected].
+ * subtree extensions.shopping-testpilot@mozilla.org.prefName.
  *
  * Content scripts cannot access the preference API, and thus cannot use this
  * module to get config values. Use commerce/config/content instead to use

diff --git a/src/experiment_apis/shoppingPrefs/api.js b/src/experiment_apis/shoppingPrefs/api.js
@@ -6,7 +6,7 @@
 this.shoppingPrefs = class extends ExtensionAPI {
   getAPI() {
     const {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm', {});
-    const branch = Services.prefs.getBranch('[email protected].');
+    const branch = Services.prefs.getBranch('extensions.shopping-testpilot@mozilla.org.');
     return {
       shoppingPrefs: {
         async getBoolPref(prefName, defaultValue) {

diff --git a/web-ext-config.js b/web-ext-config.js
@@ -1,9 +1,9 @@
 module.exports = {
   run: {
     pref: [
-      '[email protected]=30000',
-      '[email protected]=30000',
-      '[email protected]=10000',
+      'extensions.shopping-testpilot@mozilla.org.priceCheckInterval=30000',
+      'extensions.shopping-testpilot@mozilla.org.priceCheckTimeoutInterval=30000',
+      'extensions.shopping-testpilot@mozilla.org.iframeTimeout=10000',
       'network.cookie.cookieBehavior=3', // See Issue #183
     ],
     startUrl: [