Merge pull request #7437 from brave/fix_pocket_icon

shifted a smidge of logic lower per suggestion by jonathansampson
brave · Mar 2, 2017 · 84129f8 · 84129f8
2 parents e01a2a9 + 8e80d8d
commit 84129f8
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/app/common/state/extensionState.js b/app/common/state/extensionState.js
@@ -91,13 +91,6 @@ const extensionState = {
     tabId = tabId ? tabId.toString() : '-1'
     let basePath = browserAction.get('base_path')
     if (basePath) {
-      let baseIcons16 = browserAction.getIn(['icons', '16'])
-      let baseIcons48 = browserAction.getIn(['icons', '48'])
-      if (baseIcons16 && baseIcons48) {
-        return `-webkit-image-set(
-                  url(${basePath}/${baseIcons16}) 1x,
-                  url(${basePath}/${baseIcons48}) 2x`
-      }
       let baseIcons19 = browserAction.getIn(['icons', '19'])
       let baseIcons38 = browserAction.getIn(['icons', '38'])
       if (baseIcons19 && baseIcons38) {
@@ -119,6 +112,13 @@ const extensionState = {
                   url(${basePath}/${basePath19}) 1x,
                   url(${basePath}/${basePath38}) 2x`
       }
+      let baseIcons16 = browserAction.getIn(['icons', '16'])
+      let baseIcons48 = browserAction.getIn(['icons', '48'])
+      if (baseIcons16 && baseIcons48) {
+        return `-webkit-image-set(
+                  url(${basePath}/${baseIcons16}) 1x,
+                  url(${basePath}/${baseIcons48}) 2x`
+      }
     }
     return ''
   },