Merge 7a41631 into 0e1c9ce

Author: tofumatt

src/amo/components/Addon/index.js

@@ -136,7 +136,6 @@ export class AddonBase extends React.Component {
           className="Addon-theme-header"
           id="Addon-theme-header"
           data-browsertheme={getBrowserThemeData()}
-          ref={(el) => { this.wrapper = el; }}
           onClick={this.onClick}
         >
           {installStatus !== ENABLED ? (

src/core/constants.js

@@ -50,7 +50,11 @@ export const ADDON_TYPE_EXTENSION = 'extension';
 export const ADDON_TYPE_LANG = 'language';
 export const ADDON_TYPE_OPENSEARCH = 'search';
 export const ADDON_TYPE_THEME = 'persona';
+// TODO: Remove ADDON_TYPE_COMPLETE_THEME once we don't support complete
+// themes.
+export const ADDON_TYPE_COMPLETE_THEME = 'theme';
 export const validAddonTypes = [
+  ADDON_TYPE_COMPLETE_THEME,
   ADDON_TYPE_DICT,
   ADDON_TYPE_EXTENSION,
   ADDON_TYPE_LANG,

tests/unit/core/reducers/test_categories.js

@@ -1,4 +1,5 @@
 import {
+  ADDON_TYPE_COMPLETE_THEME,
   ADDON_TYPE_DICT,
   ADDON_TYPE_EXTENSION,
   ADDON_TYPE_LANG,
@@ -175,6 +176,7 @@ describe('categories reducer', () => {
       // https://github.com/mozilla/addons-server/issues/4766 is fixed.
       expect(state.categories).toEqual({
         firefox: {
+          [ADDON_TYPE_COMPLETE_THEME]: {},
           [ADDON_TYPE_DICT]: {},
           [ADDON_TYPE_EXTENSION]: {
             'alert-update': {
@@ -214,6 +216,7 @@ describe('categories reducer', () => {
           },
         },
         android: {
+          [ADDON_TYPE_COMPLETE_THEME]: {},
           [ADDON_TYPE_DICT]: {},
           [ADDON_TYPE_EXTENSION]: {
             'alert-update': {