diff --git a/app-template/config-template.xml b/app-template/config-template.xml
index 2e38c872c..1418ba9b6 100644
--- a/app-template/config-template.xml
+++ b/app-template/config-template.xml
@@ -21,9 +21,10 @@
+
-
-
+
+
@@ -35,32 +36,29 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
+
@@ -77,9 +75,6 @@
-
-
-
@@ -99,16 +94,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/app-template/index-template.html b/app-template/index-template.html
index 689248c67..35d97d348 100644
--- a/app-template/index-template.html
+++ b/app-template/index-template.html
@@ -3,7 +3,7 @@
*USERVISIBLENAME* - *PURPOSELINE*
-
+
diff --git a/package.json b/package.json
index ef163fc1c..38446efb7 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,9 @@
"url": "https://github.com/bitpay/copay/issues"
},
"scripts": {
+ "postinstall": "sed -i -e \"s/.*require(...\\/...);//g\" node_modules/asn1.js-rfc5280/index.js;",
"start": "ionic serve",
- "clean": "trash platforms && trash plugins",
+ "clean": "trash platforms && trash plugins && trash config.xml",
"clean-all": "git clean -dfx",
"build": "ionic-app-scripts build",
"lint": "ionic-app-scripts lint",
@@ -79,35 +80,32 @@
"autoprefixer": "^7.1.6",
"bitcore-wallet-client": "^6.4.0",
"buffer-compare": "^1.1.1",
- "cordova-android": "^6.3.0",
+ "cordova-android": "6.4.0",
"cordova-clipboard": "^1.1.0",
"cordova-custom-config": "^4.0.2",
- "cordova-ios": "^4.5.3",
- "cordova-ios-requires-fullscreen": "^0.0.2",
+ "cordova-ios": "4.5.3",
"cordova-plugin-android-fingerprint-auth": "^1.4.0",
"cordova-plugin-compat": "^1.2.0",
"cordova-plugin-customurlscheme": "https://github.com/cmgustavo/Custom-URL-scheme.git#v4.0",
- "cordova-plugin-device": "^1.1.6",
- "cordova-plugin-dialogs": "^1.3.3",
+ "cordova-plugin-device": "^1.1.7",
+ "cordova-plugin-dialogs": "^1.3.4",
"cordova-plugin-fcm": "https://github.com/cmgustavo/cordova-plugin-fcm.git",
- "cordova-plugin-file": "^4.3.3",
- "cordova-plugin-globalization": "^1.0.7",
- "cordova-plugin-inappbrowser": "^1.7.1",
+ "cordova-plugin-file": "^5.0.0",
+ "cordova-plugin-globalization": "^1.0.8",
+ "cordova-plugin-inappbrowser": "^1.7.2",
"cordova-plugin-ionic-webview": "^1.1.16",
- "cordova-plugin-native-spinner": "^1.0.8",
- "cordova-plugin-network-information": "^1.3.3",
+ "cordova-plugin-network-information": "^1.3.4",
"cordova-plugin-qrscanner": "^2.5.0",
- "cordova-plugin-screen-orientation": "^2.0.1",
- "cordova-plugin-splashscreen": "^4.0.3",
- "cordova-plugin-statusbar": "^2.2.3",
+ "cordova-plugin-spinner-dialog": "^1.3.1",
+ "cordova-plugin-splashscreen": "^4.1.0",
+ "cordova-plugin-statusbar": "^2.3.0",
"cordova-plugin-swift-support": "^3.1.1",
"cordova-plugin-touch-id": "^3.3.1",
- "cordova-plugin-transport-security": "^0.1.2",
"cordova-plugin-uniquedeviceid": "^1.3.2",
- "cordova-plugin-whitelist": "^1.3.2",
+ "cordova-plugin-whitelist": "^1.3.3",
"cordova-plugin-x-socialsharing": "^5.2.1",
"cordova-plugin-x-toast": "^2.6.0",
- "es6-promise-plugin": "^4.1.0",
+ "es6-promise-plugin": "^4.1.1",
"ionic-angular": "^3.9.2",
"ionic-plugin-keyboard": "^2.2.1",
"ionicons": "^3.0.0",
@@ -122,7 +120,7 @@
"@angular/cli": "^1.5.0",
"@biesbjerg/ngx-translate-extract": "^2.3.4",
"@ionic/app-scripts": "^3.1.0",
- "@types/chrome": "^0.0.52",
+ "@types/chrome": "^0.0.54",
"@types/cordova-plugin-qrscanner": "^1.0.31",
"@types/jasmine": "^2.6.3",
"@types/lodash": "^4.14.83",
@@ -163,16 +161,14 @@
"cordova-plugin-x-toast": {},
"cordova-plugin-x-socialsharing": {},
"cordova-plugin-qrscanner": {},
- "cordova-plugin-touch-id": {},
+ "cordova-plugin-touch-id": {
+ "FACEID_USAGE_DESCRIPTION": " "
+ },
"cordova-plugin-android-fingerprint-auth": {},
- "cordova-plugin-native-spinner": {},
"cordova-plugin-dialogs": {},
"cordova-plugin-network-information": {},
"cordova-plugin-uniquedeviceid": {},
"cordova-plugin-file": {},
- "cordova-plugin-transport-security": {},
- "cordova-ios-requires-fullscreen": {},
- "cordova-plugin-screen-orientation": {},
"cordova-plugin-ionic-webview": {},
"cordova-custom-config": {},
"cordova-plugin-customurlscheme": {
@@ -182,11 +178,13 @@
},
"cordova-plugin-fcm": {},
"cordova-plugin-globalization": {},
- "cordova-plugin-inappbrowser": {}
+ "cordova-plugin-inappbrowser": {},
+ "com.greybax.spinnerdialog": {},
+ "cordova-plugin-spinner-dialog": {}
},
"platforms": [
"android",
"ios"
]
}
-}
\ No newline at end of file
+}
diff --git a/resources/bitpay/ios/splash/Default-568h@2x~iphone.png b/resources/bitpay/ios/splash/Default-568h@2x~iphone.png
deleted file mode 100644
index 9ca8301cc..000000000
Binary files a/resources/bitpay/ios/splash/Default-568h@2x~iphone.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default-667h.png b/resources/bitpay/ios/splash/Default-667h.png
deleted file mode 100644
index 7fae7b4ed..000000000
Binary files a/resources/bitpay/ios/splash/Default-667h.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default-736h.png b/resources/bitpay/ios/splash/Default-736h.png
deleted file mode 100644
index 8b45a0c52..000000000
Binary files a/resources/bitpay/ios/splash/Default-736h.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default-Landscape-736h.png b/resources/bitpay/ios/splash/Default-Landscape-736h.png
deleted file mode 100644
index e5f01b243..000000000
Binary files a/resources/bitpay/ios/splash/Default-Landscape-736h.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png b/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png
deleted file mode 100644
index b438f7bb2..000000000
Binary files a/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default-Landscape~ipad.png b/resources/bitpay/ios/splash/Default-Landscape~ipad.png
deleted file mode 100644
index 0aa0f69fa..000000000
Binary files a/resources/bitpay/ios/splash/Default-Landscape~ipad.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png b/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png
deleted file mode 100644
index c4b71c2a9..000000000
Binary files a/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default-Portrait~ipad.png b/resources/bitpay/ios/splash/Default-Portrait~ipad.png
deleted file mode 100644
index cd13e0811..000000000
Binary files a/resources/bitpay/ios/splash/Default-Portrait~ipad.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default@2x~iphone.png b/resources/bitpay/ios/splash/Default@2x~iphone.png
deleted file mode 100644
index 50dc4f6ee..000000000
Binary files a/resources/bitpay/ios/splash/Default@2x~iphone.png and /dev/null differ
diff --git a/resources/bitpay/ios/splash/Default@2x~universal~anyany.png b/resources/bitpay/ios/splash/Default@2x~universal~anyany.png
new file mode 100644
index 000000000..fac9c37ff
Binary files /dev/null and b/resources/bitpay/ios/splash/Default@2x~universal~anyany.png differ
diff --git a/resources/bitpay/ios/splash/Default@2x~universal~comany.png b/resources/bitpay/ios/splash/Default@2x~universal~comany.png
new file mode 100644
index 000000000..2bcb0c665
Binary files /dev/null and b/resources/bitpay/ios/splash/Default@2x~universal~comany.png differ
diff --git a/resources/bitpay/ios/splash/Default@2x~universal~comcom.png b/resources/bitpay/ios/splash/Default@2x~universal~comcom.png
new file mode 100644
index 000000000..d7db734a6
Binary files /dev/null and b/resources/bitpay/ios/splash/Default@2x~universal~comcom.png differ
diff --git a/resources/bitpay/ios/splash/Default@3x~universal~anyany.png b/resources/bitpay/ios/splash/Default@3x~universal~anyany.png
new file mode 100644
index 000000000..028c012ce
Binary files /dev/null and b/resources/bitpay/ios/splash/Default@3x~universal~anyany.png differ
diff --git a/resources/bitpay/ios/splash/Default@3x~universal~anycom.png b/resources/bitpay/ios/splash/Default@3x~universal~anycom.png
new file mode 100644
index 000000000..a964db69b
Binary files /dev/null and b/resources/bitpay/ios/splash/Default@3x~universal~anycom.png differ
diff --git a/resources/bitpay/ios/splash/Default@3x~universal~comany.png b/resources/bitpay/ios/splash/Default@3x~universal~comany.png
new file mode 100644
index 000000000..108583da6
Binary files /dev/null and b/resources/bitpay/ios/splash/Default@3x~universal~comany.png differ
diff --git a/resources/bitpay/ios/splash/Default~iphone.png b/resources/bitpay/ios/splash/Default~iphone.png
deleted file mode 100644
index 6d5bbf417..000000000
Binary files a/resources/bitpay/ios/splash/Default~iphone.png and /dev/null differ
diff --git a/resources/copay/ios/splash/Default-568h@2x~iphone.png b/resources/copay/ios/splash/Default-568h@2x~iphone.png
deleted file mode 100644
index 24b19e527..000000000
Binary files a/resources/copay/ios/splash/Default-568h@2x~iphone.png and /dev/null differ
diff --git a/resources/copay/ios/splash/Default-667h.png b/resources/copay/ios/splash/Default-667h.png
deleted file mode 100644
index 3a031d24f..000000000
Binary files a/resources/copay/ios/splash/Default-667h.png and /dev/null differ
diff --git a/resources/copay/ios/splash/Default-Landscape@2x~ipad.png b/resources/copay/ios/splash/Default-Landscape@2x~ipad.png
deleted file mode 100644
index 884d65be6..000000000
Binary files a/resources/copay/ios/splash/Default-Landscape@2x~ipad.png and /dev/null differ
diff --git a/resources/copay/ios/splash/Default-Landscape~ipad.png b/resources/copay/ios/splash/Default-Landscape~ipad.png
deleted file mode 100644
index 017580c82..000000000
Binary files a/resources/copay/ios/splash/Default-Landscape~ipad.png and /dev/null differ
diff --git a/resources/copay/ios/splash/Default-Portrait@2x~ipad.png b/resources/copay/ios/splash/Default-Portrait@2x~ipad.png
deleted file mode 100644
index a389944ff..000000000
Binary files a/resources/copay/ios/splash/Default-Portrait@2x~ipad.png and /dev/null differ
diff --git a/resources/copay/ios/splash/Default-Portrait~ipad.png b/resources/copay/ios/splash/Default-Portrait~ipad.png
deleted file mode 100644
index 1fa78ca8a..000000000
Binary files a/resources/copay/ios/splash/Default-Portrait~ipad.png and /dev/null differ
diff --git a/resources/copay/ios/splash/Default@2x~iphone.png b/resources/copay/ios/splash/Default@2x~iphone.png
deleted file mode 100644
index a7f2bc6fc..000000000
Binary files a/resources/copay/ios/splash/Default@2x~iphone.png and /dev/null differ
diff --git a/resources/copay/ios/splash/Default@2x~universal~anyany.png b/resources/copay/ios/splash/Default@2x~universal~anyany.png
new file mode 100644
index 000000000..40a5513d0
Binary files /dev/null and b/resources/copay/ios/splash/Default@2x~universal~anyany.png differ
diff --git a/resources/copay/ios/splash/Default@2x~universal~comany.png b/resources/copay/ios/splash/Default@2x~universal~comany.png
new file mode 100644
index 000000000..097848df4
Binary files /dev/null and b/resources/copay/ios/splash/Default@2x~universal~comany.png differ
diff --git a/resources/copay/ios/splash/Default@2x~universal~comcom.png b/resources/copay/ios/splash/Default@2x~universal~comcom.png
new file mode 100644
index 000000000..a11ab6abe
Binary files /dev/null and b/resources/copay/ios/splash/Default@2x~universal~comcom.png differ
diff --git a/resources/copay/ios/splash/Default@3x~universal~anyany.png b/resources/copay/ios/splash/Default@3x~universal~anyany.png
new file mode 100644
index 000000000..19a60ed3b
Binary files /dev/null and b/resources/copay/ios/splash/Default@3x~universal~anyany.png differ
diff --git a/resources/copay/ios/splash/Default-Landscape-736h.png b/resources/copay/ios/splash/Default@3x~universal~anycom.png
similarity index 84%
rename from resources/copay/ios/splash/Default-Landscape-736h.png
rename to resources/copay/ios/splash/Default@3x~universal~anycom.png
index ec386d5d9..9eba4bc09 100644
Binary files a/resources/copay/ios/splash/Default-Landscape-736h.png and b/resources/copay/ios/splash/Default@3x~universal~anycom.png differ
diff --git a/resources/copay/ios/splash/Default-736h.png b/resources/copay/ios/splash/Default@3x~universal~comany.png
similarity index 68%
rename from resources/copay/ios/splash/Default-736h.png
rename to resources/copay/ios/splash/Default@3x~universal~comany.png
index deb0c387d..1ac3bfca8 100644
Binary files a/resources/copay/ios/splash/Default-736h.png and b/resources/copay/ios/splash/Default@3x~universal~comany.png differ
diff --git a/resources/copay/ios/splash/Default~iphone.png b/resources/copay/ios/splash/Default~iphone.png
deleted file mode 100644
index 6ab037baf..000000000
Binary files a/resources/copay/ios/splash/Default~iphone.png and /dev/null differ
diff --git a/src/providers/node-webkit/node-webkit.ts b/src/providers/node-webkit/node-webkit.ts
index 950c0fd8f..c1349dc2a 100644
--- a/src/providers/node-webkit/node-webkit.ts
+++ b/src/providers/node-webkit/node-webkit.ts
@@ -8,19 +8,25 @@ export class NodeWebkitProvider {
}
public readFromClipboard(): any {
+ /* DEPRECATED
let gui = require('nw.gui');
let clipboard = gui.Clipboard.get();
return clipboard.get();
+ */
};
public writeToClipboard(text): any {
+ /* DEPRECATED
let gui = require('nw.gui');
let clipboard = gui.Clipboard.get();
return clipboard.set(text);
+ */
};
public openExternalLink(url): any {
+ /* DEPRECATED
let gui = require('nw.gui');
return gui.Shell.openExternal(url);
+ */
};
}