Progress

app/javascript/gabsocial/components/modal/gif_picker_modal.js

@@ -208,11 +208,10 @@ class GifResultsCollection extends PureComponent {
   render() {
     const { results, handleSelectGifResult } = this.props
 
+    // : todo :
     const count = results.length
     const columnIndex = 10
 
-    console.log("results:", results)
-
     return (
       <div className={[_s.default, _s.height100PC, _s.flexRow, _s.width100PC].join(' ')}>
         <GifResultsCollectionColumn

app/javascript/gabsocial/components/modal/modal_base.js

@@ -48,8 +48,7 @@ class ModalBase extends PureComponent {
   activeElement = this.state.revealed ? document.activeElement : null
 
   handleKeyUp = (e) => {
-    if ((e.key === 'Escape' || e.key === 'Esc' || e.keyCode === 27)
-         && !!this.props.children) {
+    if ((e.key === 'Escape' || e.key === 'Esc' || e.keyCode === 27) && !!this.props.children) {
       this.handleOnClose()
     }
   }
@@ -57,9 +56,9 @@ class ModalBase extends PureComponent {
   handleOnClose = (e) => {
     const { onOpenModal, composeText, composeId, onClose, intl, type, onCancelReplyCompose } = this.props
 
-    if (this.dialog !== e.target) return
+    if (!!e && this.dialog !== e.target) return
 
-    if (!composeId && composeText && type == 'COMPOSE') {
+    if (!composeId && composeText && type === 'COMPOSE') {
       onOpenModal('CONFIRM', {
         message: intl.formatMessage(messages.delete),
         confirm: intl.formatMessage(messages.confirm),

app/javascript/gabsocial/components/modal/modal_root.js

@@ -69,8 +69,8 @@ const MODAL_COMPONENTS = {
 }
 
 const mapStateToProps = state => ({
-  type: state.get('modal').modalType,
-  props: state.get('modal').modalProps,
+  type: state.getIn(['modal', 'modalType']),
+  props: state.getIn(['modal', 'modalProps'], {}),
 })
 
 const mapDispatchToProps = (dispatch) => ({

app/javascript/gabsocial/components/modal/pro_upgrade_modal.js

@@ -61,4 +61,5 @@ class ProUpgradeModal extends ImmutablePureComponent {
       </ModalLayout>
     )
   }
+
 }