Merge branch 'ref/design' into wip/design

.gitignore

@@ -4,6 +4,8 @@ i18n/crowdin_api_key.txt
 src/js/translations.js
 
 # cordova
+plugins
+platforms
 cordova/project-*/*
 cordova/*.keystore
 
@@ -89,13 +91,15 @@ Session.vim
 src/sass/*.css
 .sass-cache
 
-# copay public
+# copay www
-public/css/*
+www/css/*
-public/lib/*
+www/lib/*
-public/js/*
+www/js/*
-public/fonts
+www/fonts
 
 ## templates
+/config.xml
+/ionic.config.json
 /appConfig.json
 externalServices.json
 cordova/Makefile
@@ -104,8 +108,8 @@ app-template/bpapp
 cordova/ProjectMakefile
 cordova/config.xml
 cordova/wp/Package.appxmanifest
-public/img/logo-negative.svg
+www/img/logo-negative.svg
-public/img/logo.svg
+www/img/logo.svg
 src/js/appConfig.js
 src/js/externalServices.js
 
@@ -116,8 +120,8 @@ app-template/bpapp
 cordova/ProjectMakefile
 cordova/config.xml
 cordova/wp/Package.appxmanifest
-public/img/logo-negative.svg
+www/img/logo-negative.svg
-public/img/logo.svg
+www/img/logo.svg
 src/js/appConfig.js
 
 cordova/android/res/
@@ -127,7 +131,3 @@ cordova/wp/*.jpg
 cordova/ios/splash/
 cordova/ios/icons/
 cordova/project/
-
-
-
-

Gruntfile.js

@@ -34,17 +34,23 @@ module.exports = function(grunt) {
       wpcopy: {
         command: 'make -C cordova wp-copy',
       },
+      iosdebug: {
+        command: 'npm run build:ios',
+      },
       ios: {
-        command: 'make -C cordova ios',
+        command: 'npm run build:ios-release',
       },
       xcode: {
-        command: 'open cordova/project-ios/platforms/ios/*.xcodeproj',
+        command: 'npm run open:ios',
+      },
+      androiddebug: {
+        command: 'npm run build:android',
       },
       android: {
-        command: 'make -C cordova android',
+        command: 'npm run build:android-release',
       },
       androidrun: {
-        command: 'make -C cordova androidrun',
+        command: 'npm run run:android && npm run log:android',
       },
       androidbuild: {
         command: 'cd cordova/project && cordova build android --release',
@@ -125,7 +131,7 @@ module.exports = function(grunt) {
           'angular-pbkdf2/angular-pbkdf2.js',
           'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js'
         ],
-        dest: 'public/lib/angular.js'
+        dest: 'www/lib/angular.js'
       },
       js: {
         src: [
@@ -144,11 +150,11 @@ module.exports = function(grunt) {
           'bower_components/trezor-connect/login.js',
           'node_modules/cordova-plugin-qrscanner/dist/cordova-plugin-qrscanner-lib.min.js'
         ],
-        dest: 'public/js/copay.js'
+        dest: 'www/js/copay.js'
       },
       css: {
         src: ['src/sass/*.css', 'src/css/*.css'],
-        dest: 'public/css/copay.css'
+        dest: 'www/css/copay.css'
       }
     },
     uglify: {
@@ -157,8 +163,8 @@ module.exports = function(grunt) {
       },
       prod: {
         files: {
-          'public/js/copay.js': ['public/js/copay.js'],
+          'www/js/copay.js': ['www/js/copay.js'],
-          'public/lib/angular.js': ['public/lib/angular.js']
+          'www/lib/angular.js': ['www/lib/angular.js']
         }
       }
     },
@@ -166,8 +172,8 @@ module.exports = function(grunt) {
       pot: {
         files: {
           'i18n/po/template.pot': [
-            'public/index.html',
+            'www/index.html',
-            'public/views/**/*.html',
+            'www/views/**/*.html',
             'src/js/routes.js',
             'src/js/services/*.js',
             'src/js/controllers/**/*.js'
@@ -190,19 +196,19 @@ module.exports = function(grunt) {
         expand: true,
         flatten: true,
         src: 'bower_components/ionic/release/fonts/ionicons.*',
-        dest: 'public/fonts/'
+        dest: 'www/fonts/'
       },
       ionic_js: {
         expand: true,
         flatten: true,
         src: 'bower_components/ionic/release/js/ionic.bundle.min.js',
-        dest: 'public/lib/'
+        dest: 'www/lib/'
       },
       linux: {
         files: [{
           expand: true,
           cwd: 'webkitbuilds/',
-          src: ['.desktop', '../public/img/icons/favicon.ico', '../public/img/icons/icon-256.png'],
+          src: ['.desktop', '../www/img/icons/favicon.ico', '../www/img/icons/icon-256.png'],
           dest: 'webkitbuilds/Copay/linux64/',
           flatten: true,
           filter: 'isFile'
@@ -224,10 +230,10 @@ module.exports = function(grunt) {
         platforms: ['win64', 'osx64', 'linux64'],
         buildDir: './webkitbuilds',
         version: '0.16.0',
-        macIcns: './public/img/icons/icon.icns',
+        macIcns: './www/img/icons/icon.icns',
-        exeIco: './public/img/icons/icon.ico'
+        exeIco: './www/img/icons/icon.ico'
       },
-      src: ['./package.json', './public/**/*']
+      src: ['./package.json', './www/**/*']
     },
     compress: {
       linux: {
@@ -261,12 +267,12 @@ module.exports = function(grunt) {
   grunt.registerTask('wp', ['prod', 'exec:wp']);
   grunt.registerTask('wp-copy', ['default', 'exec:wpcopy']);
   grunt.registerTask('wp-init', ['default', 'exec:wpinit']);
-  grunt.registerTask('ios', ['prod', 'exec:ios']);
+  grunt.registerTask('ios', ['exec:ios']);
-  grunt.registerTask('ios-debug', ['default', 'exec:ios']);
+  grunt.registerTask('ios-debug', ['exec:iosdebug']);
   grunt.registerTask('ios-run', ['exec:xcode']);
   grunt.registerTask('cordovaclean', ['exec:cordovaclean']);
-  grunt.registerTask('android-debug', ['default', 'exec:android', 'exec:androidrun']);
+  grunt.registerTask('android-debug', ['exec:androiddebug', 'exec:androidrun']);
-  grunt.registerTask('android', ['prod', 'exec:android']);
+  grunt.registerTask('android', ['exec:android']);
   grunt.registerTask('android-release', ['prod', 'exec:android', 'exec:androidsign']);
   grunt.registerTask('desktopsign', ['exec:desktopsign', 'exec:desktopverify']);
 

Makefile

@@ -1 +0,0 @@
-VERSION=`cut -d '"' -f2 $BUILDDIR/../version.js`

app-template/Makefile

@@ -7,31 +7,11 @@ all:
 clean:
 	rm -Rf $(WORKDIR)*
 
-
-$(WORKDIR)android $(WORKDIR)ios:  config.xml
-	cordova create $@ com.bitpay.*BUNDLENAME* "*USERVISIBLENAME*" || echo "Project Path Existed"
-	cp ProjectMakefile $@/Makefile
-	rm -r $@/www && ln -sF ../../public $@/www
-	cp config.xml $@/config.xml
-	make -C $@  $(subst $(WORKDIR),, $@)
-
-ios: $(WORKDIR)ios
-	make -C $(WORKDIR)ios build-ios
-
-android: project-android
-	mkdir -p android/platforms/android/res/xml/
-	mkdir -p $(WORKDIR)android/scripts
-	cp -R scripts/* $(WORKDIR)android/scripts
-	cp android/build-extras.gradle  $(WORKDIR)android/platforms/android/build-extras.gradle
-	cp android/project.properties  $(WORKDIR)android/platforms/android/project.properties
-	cp -R android/res/*  $(WORKDIR)android/platforms/android/res
-	make -C $(WORKDIR)android build-android
-
 wp-init: config.xml
 	cordova create $(WORKDIR)$@ com.bitpay.*BUNDLENAME* "*USERVISIBLENAME*" || echo "Project Path Existed"
 	cp ProjectMakefile $(WORKDIR)$@/Makefile
 	mkdir -p $(WORKDIR)$@/www
-	cp -Rf ../public/* $(WORKDIR)$@/www
+	cp -Rf ../www/* $(WORKDIR)$@/www
 	cp config.xml $(WORKDIR)$@/config.xml
 	make -C $(WORKDIR)$@  $(subst $(WORKDIR),, $(WORKDIR)$@)
 
@@ -43,10 +23,5 @@ wp-copy:
 	cp -rvf wp/SplashScreenImage.jpg $(WORKDIR)wp/platforms/wp8/
 	cp -rvf wp/ApplicationIcon.png $(WORKDIR)wp/platforms/wp8/
 	cp -rvf wp/Background.png $(WORKDIR)wp/platforms/wp8/
-	cp -rvf ../public/* $(WORKDIR)wp/www
+	cp -rvf ../www/* $(WORKDIR)wp/www
 	wp/fix-svg.sh
-
-
-androidrun:
-	make -C $(WORKDIR)android run
-	adb logcat | grep chromium

app-template/ProjectMakefile

@@ -5,19 +5,13 @@ plugins:
 	cordova prepare
 	rm -rf platforms/android/res/values-es
 
-ios-platform android-platform wp8-platform:
+wp8-platform:
 	cordova platforms add $(subst -platform,,$@) || echo "Platform already added"
 
-ios: ios-platform plugins
-	echo
-
-android: android-platform plugins
-	echo
-
 wp: wp8-platform plugins
-	echo
+	cordova plugin add https://github.com/jrontend/phonegap-plugin-barcodescanner
 
-build-ios build-android build-wp8:
+build-wp8:
 	cordova build $(subst build-,,$@)
 
 run:

app-template/apply.js

@@ -5,10 +5,10 @@
 //
 
 var templates = {
-  'package.json': '/',
   'Makefile': 'cordova/',
   'ProjectMakefile': 'cordova/',
-  'config.xml': 'cordova/',
+  'config-template.xml': '/',
+  'ionic.config.json': '/',
   'Package.appxmanifest': 'cordova/wp/',
   '.desktop': 'webkitbuilds/',
   'setup-win.iss': 'webkitbuilds/',
@@ -60,6 +60,9 @@ Object.keys(templates).forEach(function(k) {
     process.exit(1);
   }
 
+  if(k === 'config-template.xml'){
+    k = 'config.xml';
+  }
   fs.writeFileSync('../' + targetDir + k, content, 'utf8');
 });
 
@@ -113,7 +116,7 @@ function copyDir(from, to, cb) {
 }
 
 
-copyDir(configDir + '/img/', '../public/img/', function() {
+copyDir(configDir + '/img/', '../www/img/', function() {
   copyDir(configDir + '/androidRes/', '../cordova/android/res/', function() {
     copyDir(configDir + '/iosIcons/', '../cordova/ios/icons/', function() {
       copyDir(configDir + '/iosSplash/', '../cordova/ios/splash/', function() {

app-template/config-template.xml

@@ -28,11 +28,6 @@
     <preference name="windows-target-version" value="8.1"/>
     <preference name="Orientation" value="default" />
 
-    <!-- Supported Platforms -->
-    <!-- <engine name="ios" spec="~4.2.1" />
-    <engine name="android" spec="~5.2.2" />
-    <engine name="wp8" spec="~3.8.2" /> -->
-
     <!-- Plugins -->
     <plugin name="cordova-plugin-globalization" spec="~1.0.4" />
     <plugin name="cordova.plugins.diagnostic" spec="~3.2.1" />
@@ -51,77 +46,36 @@
     <plugin name="cordova-plugin-touch-id" spec="~3.2.0" />
     <plugin name="cordova-plugin-transport-security" spec="~0.1.2" />
     <plugin name="cordova-ios-requires-fullscreen" spec="~0.0.2" />
-    <plugin name="cordova-plugin-disable-bitcode" spec="~1.3.2" />
     <plugin name="cordova-plugin-android-fingerprint-auth" spec="~0.2.0" />
     <plugin name="cordova-plugin-screen-orientation" spec="~1.4.2" />
     <plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
     <plugin name="cordova-plugin-whitelist" spec="~1.3.0" />
     <plugin name="cordova-plugin-wkwebview-engine" spec="https://github.com/driftyco/cordova-plugin-wkwebview-engine.git" />
-    <plugin name="cordova-plugin-qrscanner" spec="~2.3.3" />
+    <plugin name="cordova-plugin-qrscanner" spec="~2.4.0" />
+    <plugin name="cordova-plugin-customurlscheme" spec="~4.2.0">
+      <variable name="URL_SCHEME" value="UNUSED" />
+    </plugin>
+    <plugin name="phonegap-plugin-push" spec="1.8.2" />
+
+    <!-- Supported Platforms -->
+    <engine name="ios" spec="~4.2.1" />
+    <engine name="android" spec="~5.2.2" />
+    <engine name="wp8" spec="~3.8.2" />
+
+    <!-- Platform Specific Settings -->
+    <platform name="ios">
+      <!-- <hook type="after_prepare" src="util/hooks/ios/add-custom-urls-to-plist.js" />
+      <hook type="after_prepare" src="util/hooks/ios/add-uistatusbarhidden-to-plist.js" /> -->
+    </platform>
+
+    <platform name="android">
+      <hook type="after_prepare" src="util/hooks/android/add-custom-urls-to-android-manifest.js" />
+      <hook type="after_prepare" src="util/hooks/android/prohibit-cloud-backups-in-android-manifest.js" />
+      <!-- https://github.com/phonegap/phonegap-plugin-push/issues/424 -->
+    </platform>
+
     <platform name="wp8">
       <plugin name="phonegap-plugin-barcodescanner" spec="https://github.com/jrontend/phonegap-plugin-barcodescanner" />
     </platform>
-    <platform name="android">
-      <plugin name="phonegap-plugin-barcodescanner" spec="https://github.com/jrontend/phonegap-plugin-barcodescanner" />
-      <plugin name="phonegap-plugin-push" spec="~1.8.2" />
-    </platform>
-    <platform name="ios">
-      <plugin name="cordova-plugin-cszbar" spec="https://github.com/tjwoon/csZBar.git" />
-      <plugin name="phonegap-plugin-push" spec="~1.5.3" />
-    </platform>
 
-    <!-- Hooks -->
-
-    <platform name="android">
-      <hook type="after_run" src="scripts/afterRun.js" />
-    </platform>
-
-    <platform name="ios">
-      <hook type="before_build" src="../../node_modules/cordova-plugin-qrscanner/scripts/swift-support.js" />
-      <config-file target="*-Info.plist" parent="NSCameraUsageDescription">
-        <string>The camera is used to read QR codes.</string>
-      </config-file>
-    </platform>
-
-    <!-- Assets -->
-
-    <platform name="ios">
-      <!-- iOS 8.0+ -->
-      <!-- iPad Pro  -->
-      <icon src="../ios/icons/icon-83.5@2x.png" width="167" height="167" />
-      <!-- iPhone 6 Plus  -->
-      <icon src="../ios/icons/icon-60@3x.png" width="180" height="180" />
-      <!-- iOS 7.0+ -->
-      <!-- iPhone / iPod Touch  -->
-      <icon src="../ios/icons/icon-60@2x.png" width="120" height="120" />
-      <!-- iPad -->
-      <icon src="../ios/icons/icon-76.png" width="76" height="76" />
-      <icon src="../ios/icons/icon-76@2x.png" width="152" height="152" />
-      <!-- iOS 6.1 -->
-      <!-- Spotlight Icon -->
-      <icon src="../ios/icons/icon-40.png" width="40" height="40" />
-      <icon src="../ios/icons/icon-40@2x.png" width="80" height="80" />
-      <!-- iPhone / iPod Touch -->
-      <icon src="../ios/icons/icon.png" width="57" height="57" />
-      <icon src="../ios/icons/icon@2x.png" width="114" height="114" />
-      <!-- iPad -->
-      <icon src="../ios/icons/icon-72.png" width="72" height="72" />
-      <icon src="../ios/icons/icon-72@2x.png" width="144" height="144" />
-      <!-- iPhone Spotlight and Settings Icon -->
-      <icon src="../ios/icons/icon-small.png" width="29" height="29" />
-      <icon src="../ios/icons/icon-small@2x.png" width="58" height="58" />
-      <icon src="../ios/icons/icon-small@3x.png" width="87" height="87" />
-      <!-- iPad Spotlight and Settings Icon -->
-      <icon src="../ios/icons/icon-50.png" width="50" height="50" />
-      <icon src="../ios/icons/icon-50@2x.png" width="100" height="100" />
-
-      <!-- Splash -->
-      <splash src="../ios/splash/Default~iphone.png" width="320" height="480"/>
-      <splash src="../ios/splash/Default@2x~iphone.png" width="640" height="960"/>
-      <splash src="../ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
-      <splash src="../ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
-      <splash src="../ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
-      <splash src="../ios/splash/Default-667h.png" width="750" height="1334"/>
-      <splash src="../ios/splash/Default-736h.png" width="1242" height="2208"/>
-    </platform>
   </widget>

app-template/ionic.config.json

@@ -0,0 +1,4 @@
+{
+  "name": "*USERVISIBLENAME*",
+  "app_id": "com.bitpay.*BUNDLENAME*"
+}

app-template/package.json

@@ -11,10 +11,10 @@
     "multisignature",
     "bitcore"
   ],
-  "main": "public/index.html",
+  "main": "www/index.html",
   "window": {
     "title": "*USERVISIBLENAME* - *PURPOSELINE*",
-    "icon": "./public/img/icons/icon-256.png",
+    "icon": "./www/img/icons/icon-256.png",
     "toolbar": false,
     "show": true,
     "visible": true,

app-template/setup-win.iss

@@ -34,7 +34,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "*PACKAGENAME*\win64\*PACKAGENAME*.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "*PACKAGENAME*\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "../public/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion
+Source: "../www/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

app.js

@@ -1,13 +0,0 @@
-var express = require('express');
-var path = require('path');
-var app = express();
-app.use(express.static(__dirname + '/public'));
-
-var port = process.env.PORT || 3000;
-app.listen(port);
-console.log("App listening on port " + port);
-
-app.get('*', function(req, res) {
-  res.sendFile(path.join(__dirname, 'public'));
-});
-

chrome-app/Makefile

@@ -9,16 +9,16 @@ BASE=$(CURDIR)
 
 all: $(ZIPFILE)
 
-dir: 
+dir:
 	rm -rf $(BUILDDIR)
 	mkdir -p $(BUILDDIR)
 	cp manifest.json $(BUILDDIR)/manifest.json
 	cp -vf $(INITIAL) $(BUILDDIR)
 
 files:
-	cd ../public && rsync -rLRv --exclude-from $(BASE)/exclude $(INCLUDE) $(BASE)/$(BUILDDIR) && cd -
+	cd ../www && rsync -rLRv --exclude-from $(BASE)/exclude $(INCLUDE) $(BASE)/$(BUILDDIR) && cd -
 	cd .. && rsync -rLRv ./bower_components/trezor-connect/chrome/* $(BASE)/$(BUILDDIR)/ && cd -
-	
+
 
 $(ZIPFILE): dir files
 	cd $(BUILDDIR)

package.json

@@ -1,9 +1,4 @@
- { 
+{
-  "//":"PLEASE! Do not edit this file directly",
-  "//":"        Modify it at app-template/", 
-
-  "name": "bitpay-wallet",
-  "description": "Secure Bitcoin Storage",
   "author": "BitPay",
   "version": "0.14.0",
   "keywords": [
@@ -14,27 +9,6 @@
     "multisignature",
     "bitcore"
   ],
-  "main": "public/index.html",
-  "window": {
-    "title": "BitPay Wallet - Secure Bitcoin Storage",
-    "icon": "./public/img/icons/icon-256.png",
-    "toolbar": false,
-    "show": true,
-    "visible": true,
-    "resizable": true,
-    "frame": true,
-    "width": 400,
-    "height": 600,
-    "position": "center",
-    "fullscreen": false
-  },
-  "webkit": {
-    "page-cache": false,
-    "java": false,
-    "plugin": false
-  },
-  "dom_storage_quota": 200,
-  "id": "jid1-x7bV5evAaI1P9Q",
   "homepage": "https://github.com/bitpay/copay",
   "license": "MIT",
   "repository": {
@@ -85,22 +59,40 @@
     "mocha": "^2.4.5",
     "pbkdf2": "^3.0.4",
     "phantomjs-prebuilt": "^2.1.7",
-    "shelljs": "^0.3.0",
+    "shelljs": "^0.3.0"
-    "xcode": "^0.8.2"
   },
   "scripts": {
-    "preinstall": "bower install && npm i fs-extra",
+    "preinstall":             "bower install && npm i fs-extra",
-    "build": "grunt",
+    "postinstall":            "npm run apply:bitpay && cordova prepare",
-    "apply:copay": "cd app-template && node apply.js",
+    "start":                  "npm run build:www && ionic serve --nolivereload --nogulp",
-    "apply:bitpay-wallet": "cd app-template && node apply.js bitpay-wallet",
+    "start:ios":              "npm run build:www && npm run build:ios && npm run open:ios",
-    "start": "npm run build && node app.js",
+    "start:android":          "npm run build:www && npm run build:android && npm run open:android",
-    "watch": "grunt watch",
+    "watch":                  "grunt watch",
-    "test": "./node_modules/.bin/grunt test-coveralls",
+    "build:www":              "grunt",
-    "clean": "git clean -dfx",
+    "build:www-release":      "grunt prod",
-    "start:ios": "npm run build && cd cordova && trash project-ios && make ios && open project-ios/platforms/ios/BitPay\\ Wallet.xcodeproj",
+    "build:ios":              "cordova prepare ios && cordova build ios --debug",
-    "start:android": "npm run build && cd cordova && trash project-android && make android && open -a /Applications/Android\\ Studio.app project-android/platforms/android"
+    "build:android":          "cordova prepare android && cordova build android --debug",
+    "build:ios-release":      "cordova prepare ios && cordova build ios --release",
+    "build:android-release":  "cordova prepare android && cordova build android --release",
+    "open:ios":               "open platforms/ios/*.xcodeproj",
+    "open:android":           "open -a open -a /Applications/Android\\ Studio.app platforms/android",
+    "final:www":              "npm run clean && npm run build:www-release",
+    "final:ios":              "npm run final:www && npm run build:ios-release && npm run open:ios",
+    "final:android":          "npm run final:www && npm run build:android-release && npm run open:android",
+    "run:android":            "cordova run android --device",
+    "log:android":            "adb logcat | grep chromium",
+    "apply:copay":            "cd app-template && node apply.js",
+    "apply:bitpay":           "cd app-template && node apply.js bitpay-wallet",
+    "test":                   "./node_modules/.bin/grunt test-coveralls",
+    "clean":                  "git clean -dfx && npm install"
   },
   "devDependencies": {
-    "trash-cli": "^1.4.0"
+    "androidmanifest": "^2.0.0",
+    "cordova": "^5.4.1",
+    "globby": "^6.0.0",
+    "ionic": "^2.1.0",
+    "plist": "^2.0.1",
+    "trash-cli": "^1.4.0",
+    "xcode": "^0.8.2"
   }
 }

src/js/controllers/walletDetails.js

@@ -100,7 +100,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
 
   $scope.recreate = function() {
     walletService.recreate($scope.wallet, function(err) {
-      $scope.init();
       if (err) return;
       $timeout(function() {
         walletService.startScan($scope.wallet, function() {

src/js/directives/directives.js

@@ -154,8 +154,6 @@ angular.module('copayApp.directives')
       link: function(scope, element, attrs) {
         scope.$on("$ionicSlides.sliderInitialized", function(event, data) {
           scope.slider = data.slider;
-          if(scope.slider.slides.length == 1)
-            scope.slider.lockSwipes();
           scope.$emit('Wallet/Changed', scope.wallets ? scope.wallets[0] : null);
         });
 

src/sass/views/onboarding/onboard-collect-email.scss

@@ -15,6 +15,10 @@ $relish-success: 1.3s;
     margin-top: 0;
     height: 101%;
   }
+  .scroll {
+    height: 100%;
+    transform: translate3d(0px, 0px, 0px) scale(1) !important;
+  }
   .success-message {
     top: 30vh;
     position: relative;

util/hooks/android/add-custom-urls-to-android-manifest.js

@@ -0,0 +1,27 @@
+'use strict';
+
+var AndroidManifest = require('androidmanifest');
+
+var FILEPATH = 'platforms/android/AndroidManifest.xml';
+var manifest = new AndroidManifest().readFile(FILEPATH);
+
+var mainActivity = manifest.activity('MainActivity');
+
+var customUrls = ['copay', 'bitcoin', 'bitauth'];
+
+customUrls.forEach(function(url){
+  var selector = 'intent-filter > data[android\\:scheme=' + url + ']';
+  if(mainActivity.find(selector).length > 0){
+    return;
+  }
+
+  var intentFilter = manifest.$('<intent-filter>');
+  intentFilter.append('<data android:scheme="' + url + '" />');
+  intentFilter.append('<action android:name="android.intent.action.VIEW" />');
+  intentFilter.append('<category android:name="android.intent.category.DEFAULT" />');
+  intentFilter.append('<category android:name="android.intent.category.BROWSABLE" />');
+  mainActivity.append(intentFilter);
+});
+
+manifest.writeFile(FILEPATH);
+console.log('custome uri schemes written to AndroidManifest');

webkitbuilds/setup-win.iss

@@ -34,7 +34,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "bitpay-wallet\win64\bitpay-wallet.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "bitpay-wallet\win64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "../public/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion
+Source: "../www/img/icons/favicon.ico"; DestDir: "{app}"; DestName: "icon.ico"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]