Merge branch 'develop' into andybalaam/stas-demydiuk-membership-type3

src/components/views/dialogs/devtools/BaseTool.tsx

@@ -60,7 +60,7 @@ const BaseTool: React.FC<XOR<IMinProps, IProps>> = ({
     let actionButton: ReactNode = null;
     if (message) {
         children = message;
-    } else if (onAction) {
+    } else if (onAction && actionLabel) {
         const onActionClick = (): void => {
             onAction().then((msg) => {
                 if (typeof msg === "string") {

src/components/views/dialogs/devtools/RoomState.tsx

@@ -38,7 +38,7 @@ export const StateEventEditor: React.FC<IEditorProps> = ({ mxEvent, onBack }) =>
     );
 
     const onSend = async ([eventType, stateKey]: string[], content: IContent): Promise<void> => {
-        await cli.sendStateEvent(context.room.roomId, eventType, content, stateKey);
+        await cli.sendStateEvent(context.room.roomId, eventType as any, content, stateKey);
     };
 
     const defaultContent = mxEvent ? stringify(mxEvent.getContent()) : undefined;

src/components/views/dialogs/security/AccessSecretStorageDialog.tsx

@@ -430,7 +430,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                             onPrimaryButtonClick={this.onRecoveryKeyNext}
                             hasCancel={true}
                             cancelButton={_t("action|go_back")}
-                            cancelButtonClass="danger"
+                            cancelButtonClass="warning"
                             onCancel={this.onCancel}
                             focus={false}
                             primaryDisabled={!this.state.recoveryKeyValid}