Merge branch 'develop' into i3725-refactor-send-component-

1 files changed, 11 insertions, 11 deletions

diff --git a/gulpfile.js b/gulpfile.js
index 4f0da9d60..4dca7089f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -247,7 +247,7 @@ gulp.task('dev:scss', createScssBuildTask({
   src: 'ui/app/css/index.scss',
   dest: 'ui/app/css/output',
   devMode: true,
-  pattern: 'ui/app/css/**/*.scss',
+  pattern: 'ui/app/**/*.scss',
 }))
 
 function createScssBuildTask({ src, dest, devMode, pattern }) {
@@ -484,16 +484,6 @@ function generateBundler(opts, performBundle) {
     NODE_ENV: opts.devMode ? 'development' : 'production',
   }))
 
-  // Minification
-  if (opts.minifyBuild) {
-    bundler.transform('uglifyify', {
-      global: true,
-      mangle: {
-        reserved: [ 'MetamaskInpageProvider' ]
-      },
-    })
-  }
-
   if (opts.watch) {
     bundler = watchify(bundler)
     // on any file update, re-runs the bundler
@@ -567,6 +557,16 @@ function bundleTask(opts) {
         .pipe(sourcemaps.init({ loadMaps: true }))
     }
 
+    // Minification
+    if (opts.minifyBuild) {
+      buildStream = buildStream
+      .pipe(uglify({
+        mangle: {
+          reserved: [ 'MetamaskInpageProvider' ]
+        },
+      }))
+    }
+
     // Finalize Source Maps (writes .map file)
     if (opts.buildSourceMaps) {
       buildStream = buildStream