Merge pull request #4033 from benjiwheeler/close-file-menu2

close file menu on uploading sb file; don't close file menu twice

src/components/menu-bar/menu-bar.jsx

@@ -161,7 +161,6 @@ class MenuBar extends React.Component {
         // since we will auto-save first. Else, confirm first.
         const readyToReplaceProject = (this.props.canSave && this.props.canCreateNew) ||
             confirm(this.props.intl.formatMessage(messages.confirmNav)); // eslint-disable-line no-alert
-        this.props.onRequestCloseFile();
         if (readyToReplaceProject) {
             this.props.onClickNew(this.props.canSave && this.props.canCreateNew);
         }

src/containers/sb-file-uploader.jsx

@@ -12,6 +12,9 @@ import {
     openLoadingProject,
     closeLoadingProject
 } from '../reducers/modals';
+import {
+    closeFileMenu
+} from '../reducers/menus';
 
 /**
  * SBFileUploader component passes a file input, load handler and props to its child.
@@ -136,6 +139,7 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
     onLoadingFinished: loadingState => {
         dispatch(onLoadedProject(loadingState, ownProps.canSave));
         dispatch(closeLoadingProject());
+        dispatch(closeFileMenu());
     },
     onLoadingStarted: () => {
         dispatch(openLoadingProject());