[TASK] Trade: Order flow eliminates unnecessary step (RT-3279)

.gitignore

@@ -5,6 +5,7 @@ js/.DS_Store
 npm-debug.log
 .DS_Store
 node_modules
+test/sauce/node_modules/
 build/
 src/js/config.js
 test/e2e/protractor.conf.js
@@ -14,6 +15,7 @@ deps/js/ripple/
 deps/js/angular/
 deps/js/angular-route/
 deps/js/angular-mocks/
+deps/js/angular-messages/
 deps/js/jquery/
 deps/js/moment/
 deps/js/spin.js/

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
   - "0.10"
-addons:
-  sauce_connect: true
+#addons:
+#  sauce_connect: true
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
@@ -12,28 +12,31 @@ before_install:
   - echo "deb-src http://nginx.org/packages/ubuntu/ precise nginx" | sudo tee -a /etc/apt/sources.list
   - sudo apt-get update -qq
   - sudo apt-get install nginx
-  - sudo mkdir -p /var/log/nginx/
+  - sudo nginx -s stop
   - npm install -g grunt-cli
+  - echo "$TRAVIS_BUILD_DIR"
+  - echo "$SAUCE_USERNAME"
+  - cd test/sauce && npm install
+  - node launch_connect.js &
+  - $TRAVIS_BUILD_DIR/test/sauce/wait_for_browser_provider.sh
+  - cd $TRAVIS_BUILD_DIR
 before_script:
   - "cp test/travis/config-travis.js src/js/config.js"
   - "cp test/travis/ripple-travis.txt ripple.txt"
   - npm install -g bower
   - bower install
-  - npm install -g se-interpreter
-  - sudo nginx -c "$TRAVIS_BUILD_DIR/test/travis/nginx.conf" &
+  - npm install -g darkdarkdragon/se-interpreter
+  - sudo nginx -c "$TRAVIS_BUILD_DIR/test/travis/nginx.conf"
+  - curl -i http://localhost:9002
   - grunt connect:sauce &
   - sudo ps aux
   - sudo ls -l /proc/*/exe || true
 script: "./test/travis-run.sh"
 after_script:
-  - echo "nginx/error:"
   - sudo cat /var/log/nginx/error.log
-  - echo "nginx/access:"
   - sudo cat /var/log/nginx/access.log
-  - echo "config.js:"
-  - curl http://localhost:9001/config.js
-  - echo "ripple.txt:"
-  - curl http://localhost:9001/ripple.txt
+  - curl -i http://localhost:9001/config.js
+  - curl -i http://localhost:9001/ripple.txt
 notifications:
   email:
     false
@@ -45,7 +48,9 @@ notifications:
     on_start: false
 env:
   global: 
+    - SAUCE_CONNECT_VERSION=4.3.6
     - SAUCE_USERNAME=tonga
-    - secure: "VJFHj5fr46Qf7h34xa/W6FmGvknPH57eQLJoEjKlZUYn0EGx9EliCdENfzAbtr3e4GnNvQh6X2bLA/lB7TRzoD84oyGkllkMayevQm/dViJbUBQsl7HOa6VwUwugW+o7T3+vPM4y5qqFv1B/fs3Fthl+eKUatccy9qK4xra1Hso="
+    - SAUCE_ACCESS_KEY=1553f141-1258-4319-b20d-7743def99fbb
+#    - secure: "VJFHj5fr46Qf7h34xa/W6FmGvknPH57eQLJoEjKlZUYn0EGx9EliCdENfzAbtr3e4GnNvQh6X2bLA/lB7TRzoD84oyGkllkMayevQm/dViJbUBQsl7HOa6VwUwugW+o7T3+vPM4y5qqFv1B/fs3Fthl+eKUatccy9qK4xra1Hso="
 
 

Gruntfile.js

@@ -11,9 +11,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-recess');
   grunt.loadNpmTasks('grunt-webpack');
   grunt.loadNpmTasks('grunt-preprocess');
-  grunt.loadNpmTasks('grunt-cache-bust');
   grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-imagemin');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
@@ -35,6 +33,7 @@ module.exports = function(grunt) {
               'deps/js/downloadify.js',
               'deps/js/angular/angular.js',
               'deps/js/angular-route/angular-route.js',
+              'deps/js/angular-messages/angular-messages.js',
               'deps/js/store.js/store.js',
               'deps/js/d3/d3.js',
               'deps/js/ripple/ripple-debug.js',
@@ -49,7 +48,6 @@ module.exports = function(grunt) {
               'deps/js/spin.js/spin.js',
               'deps/js/snapjs/snap.js',
               'deps/js/ng-sortable/dist/ng-sortable.js',
-              'deps/js/charts/ticker.js',
               'deps/js/charts/pricechart.js'];
 
   var compatIE = ['compat/ie/base64/base64.js',
@@ -201,19 +199,6 @@ module.exports = function(grunt) {
         dest: 'build/dist/compat_nw-debug.js'
       }
     },
-    cacheBust: {
-      options: {
-        encoding: 'utf8',
-        algorithm: 'md5',
-        length: 16,
-        baseDir: 'build/bundle/web/'
-      },
-      assets: {
-        files: [{
-          src: ['build/bundle/web/index.html', 'build/bundle/web/index_debug.html', 'build/bundle/web/callback.html']
-        }]
-      }
-    },
     uglify: {
       // JavaScript dependencies
       deps: {
@@ -314,17 +299,6 @@ module.exports = function(grunt) {
         ]
       }
     },
-    cssmin: {
-      options: {
-        rebase: false
-      },
-      target: {
-        files: [{
-          'build/dist/ripple.min.css': 'build/dist/ripple.css',
-          'res/fonts/stylesheet.min.css': 'res/fonts/stylesheet.css'
-        }]
-      }
-    },
     imagemin: {
       // note, this is done after 'copy' task so as not to rewrite the original img files
       dynamic: {
@@ -353,27 +327,27 @@ module.exports = function(grunt) {
       },
       scriptsDebug: {
         files: ['src/js/**/*.js', 'src/jade/**/*.jade'],
-        tasks: ['webpack:webDebug', 'copy', 'cacheBust'],
-        options: { nospawn: true, livereload: true }
+        tasks: ['version', 'versionBranch', 'webpack:webDebug', 'copy'],
+        options: { spawn: false, livereload: true }
       },
       deps: {
         files: deps,
-        tasks: ['uglify:deps', 'uglify:individualDeps', 'concat:depsDebug', 'copy', 'cacheBust'],
+        tasks: ['version', 'versionBranch', 'uglify:deps', 'uglify:individualDeps', 'concat:depsDebug', 'copy'],
         options: { livereload: true }
       },
       styles: {
         files: 'src/less/**/*.less',
-        tasks: ['recess', 'cssmin', 'copy', 'cacheBust'],
+        tasks: ['version', 'versionBranch', 'recess', 'copy'],
         options: { livereload: true }
       },
       index: {
         files: ['src/index.html'],
-        tasks: ['version', 'versionBranch', 'preprocess:webDebug', 'copy', 'cacheBust'],
+        tasks: ['version', 'versionBranch', 'preprocess:webDebug', 'copy'],
         options: { livereload: true }
       },
       callback: {
         files: ['src/callback.html'],
-        tasks: ['copy', 'cacheBust']
+        tasks: ['copy']
       },
       config: {
         files: ['src/js/config.js'],
@@ -463,7 +437,8 @@ module.exports = function(grunt) {
           'Options',
           'ripple',
           'setImmediate',
-          'store'
+          'store',
+          'rippleVaultClient'
         ]
       },
       plugins: [
@@ -522,11 +497,9 @@ module.exports = function(grunt) {
                                  'preprocess',
                                  'webpack',
                                  'recess',
-                                 'cssmin',
                                  'deps',
                                  'copy',
-                                 'imagemin',
-                                 'cacheBust']);
+                                 'imagemin']);
 
   // Dev - builds the web version of the client excluding any locales
   // Be sure to use English version for testing
@@ -537,10 +510,8 @@ module.exports = function(grunt) {
                              'webpack:webDebug',
                              'webpack:webL10n-english',
                              'recess',
-                             'cssmin',
                              'deps',
-                             'copy',
-                             'cacheBust']);
+                             'copy']);
 
   // Deps only - only rebuilds the dependencies
   grunt.registerTask('deps', ['uglify:deps', 'uglify:individualDeps',

bower.json

@@ -1,9 +1,10 @@
 {
   "name": "ripple-client",
   "dependencies": {
-    "ripple": "~0.10.0",
+    "ripple": "~0.12.1-rc5",
     "ripple-vault-client": "~0.4.7",
     "angular": "~1.3.12",
+    "angular-messages": "~1.3.12",
     "angular-route": "~1.3.12",
     "angular-mocks": "~1.3.12",
     "underscore": "~1.7.0",
@@ -12,7 +13,7 @@
     "store.js": "~1.3.16",
     "spin.js": "~2.0.1",
     "snapjs": "~1.9.3",
-    "angular-bootstrap": "~0.12.0",
+    "angular-bootstrap": "~0.12.1",
     "ng-sortable": "~1.1.9",
     "d3": "~3.5.3"
   },

deps/gateways.json

@@ -110,16 +110,11 @@
         "name": "GBI",
         "accounts": [{
             "address": "rrh7rf1gV2pXAoqA8oYbpHd8TKv5ZQeo67",
-            "currencies": [
-              {
-                "label" : "XAU", 
-                "code"  : "0158415500000000C1F76FF6ECB0BAC600000000"
-              }
-            ]
-            }],
-        "hotwallets": [
-        ],
-        "domain": "goldbullioninternational.com"
+            "currencies": ["XAU"],
+            "hotwallets": [
+            ],
+            "domain": "goldbullioninternational.com"
+            }]
     }, {
         "name": "LakeBTC",
         "accounts": [{