Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird

 Conflicts:

	src/components/views/right_panel/UserInfo.js

src/components/views/elements/IconButton.js

@@ -0,0 +1,34 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import AccessibleButton from "./AccessibleButton";
+
+export default function IconButton(props) {
+    const {icon, className, ...restProps} = props;
+
+    let newClassName = (className || "") + " mx_IconButton";
+    newClassName = newClassName + " mx_IconButton_icon_" + icon;
+
+    const allProps = Object.assign({}, restProps, {className: newClassName});
+
+    return React.createElement(AccessibleButton, allProps);
+}
+
+IconButton.propTypes = Object.assign({
+    icon: PropTypes.string,
+}, AccessibleButton.propTypes);

src/components/views/elements/PowerSelector.js

@@ -129,10 +129,11 @@ module.exports = createReactClass({
 
     render: function() {
         let picker;
+        const label = typeof this.props.label === "undefined" ? _t("Power level") : this.props.label;
         if (this.state.custom) {
             picker = (
                 <Field id={`powerSelector_custom_${this.props.powerLevelKey}`} type="number"
-                       label={this.props.label || _t("Power level")} max={this.props.maxValue}
+                       label={label} max={this.props.maxValue}
                        onBlur={this.onCustomBlur} onKeyDown={this.onCustomKeyDown} onChange={this.onCustomChange}
                        value={String(this.state.customValue)} disabled={this.props.disabled} />
             );
@@ -151,7 +152,7 @@ module.exports = createReactClass({
 
             picker = (
                 <Field id={`powerSelector_notCustom_${this.props.powerLevelKey}`} element="select"
-                       label={this.props.label || _t("Power level")} onChange={this.onSelectChange}
+                       label={label} onChange={this.onSelectChange}
                        value={String(this.state.selectValue)} disabled={this.props.disabled}>
                     {options}
                 </Field>