diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 29f920f4f..000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "node", - "request": "launch", - "name": "Launch Program", - "program": "${workspaceFolder}/www/index.html" - } - ] -} \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 7968f2510..342cc85e7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,32 +8,26 @@ module.exports = function(grunt) { grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), exec: { + get_nwjs_for_pkg: { + command: 'if [ ! -d ./cache/0.19.5-pkg/osx64/nwjs.app ]; then cd ./cache; curl https://dl.nwjs.io/v0.19.5-mas-beta/nwjs-mas-v0.19.5-osx-x64.zip --output nwjs.zip; unzip nwjs.zip; mkdir -p ./0.19.5-pkg/osx64; cp -R ./nwjs-mas-v0.19.5-osx-x64/nwjs.app ./0.19.5-pkg/osx64/; fi' + }, + create_others_dist: { + command: 'sh webkitbuilds/create-others-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>" "<%= pkg.nameCaseNoSpace %>" "<%= pkg.title %>"' + }, + create_dmg_dist: { + command: 'sh webkitbuilds/create-dmg-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>" "<%= pkg.nameCaseNoSpace %>" "<%= pkg.title %>"' + }, + create_pkg_dist: { + command: 'sh webkitbuilds/create-pkg-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>" "<%= pkg.nameCaseNoSpace %>" "<%= pkg.title %>"' + }, + sign_desktop_dist: { + command: 'sh webkitbuilds/sign-desktop-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>"' + }, appConfig: { command: 'node ./util/buildAppConfig.js' }, - android_studio: { - command: ' open -a open -a /Applications/Android\\ Studio.app platforms/android', - }, - build_android_debug: { - command: 'cordova prepare android && cordova build android --debug', - }, - build_android_release: { - command: 'cordova prepare android && cordova build android --release', - }, - build_ios_debug: { - command: 'cordova prepare ios && cordova build ios --debug', - options: { - maxBuffer: 3200 * 1024 - } - }, - build_ios_release: { - command: 'cordova prepare ios && cordova build ios --release', - options: { - maxBuffer: 1600 * 1024 - } - }, - chrome: { - command: 'make -C chrome-app ' + externalServices: { + command: 'node ./util/buildExternalServices.js' }, clean: { command: 'rm -Rf bower_components node_modules' @@ -44,38 +38,8 @@ module.exports = function(grunt) { coveralls: { command: 'cat coverage/report-lcov/lcov.info |./node_modules/coveralls/bin/coveralls.js' }, - create_dmg_dist: { - command: 'sh webkitbuilds/create-dmg-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>" "<%= pkg.nameCaseNoSpace %>" "<%= pkg.title %>"' - }, - create_others_dist: { - command: 'sh webkitbuilds/create-others-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>" "<%= pkg.nameCaseNoSpace %>" "<%= pkg.title %>"' - }, - create_pkg_dist: { - command: 'sh webkitbuilds/create-pkg-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>" "<%= pkg.nameCaseNoSpace %>" "<%= pkg.title %>"' - }, - externalServices: { - command: 'node ./util/buildExternalServices.js' - }, - get_nwjs_for_pkg: { - command: 'if [ ! -d ./cache/0.19.5-pkg/osx64/nwjs.app ]; then cd ./cache; curl https://dl.nwjs.io/v0.19.5-mas-beta/nwjs-mas-v0.19.5-osx-x64.zip --output nwjs.zip; unzip nwjs.zip; mkdir -p ./0.19.5-pkg/osx64; cp -R ./nwjs-mas-v0.19.5-osx-x64/nwjs.app ./0.19.5-pkg/osx64/; fi' - }, - log_android: { - command: 'adb logcat | grep chromium', - }, - run_android: { - command: 'cordova run android --device', - }, - run_android_emulator: { - command: 'cordova run android --emulator', - }, - sign_android: { - // When the build log outputs "Built the following apk(s):", it seems to need the filename to start with "android-release". - // It looks like it simply lists all apk files starting with "android-release" - command: 'rm -f platforms/android/build/outputs/apk/android-release-signed-*.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk bitcoin-com && zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/bitcoin-com-wallet-<%= pkg.fullVersion %>-android-signed-aligned.apk', - stdin: true, - }, - sign_desktop_dist: { - command: 'sh webkitbuilds/sign-desktop-dist.sh "<%= pkg.name %>" "<%= pkg.fullVersion %>"' + chrome: { + command: 'make -C chrome-app ' }, wpinit: { command: 'make -C cordova wp-init', @@ -83,9 +47,40 @@ module.exports = function(grunt) { wpcopy: { command: 'make -C cordova wp-copy', }, + iosdebug: { + command: 'npm run build:ios', + }, + ios: { + command: 'npm run build:ios-release', + }, xcode: { - command: 'open platforms/ios/*.xcodeproj', - } + command: 'npm run open:ios', + }, + androiddebug: { + command: 'npm run build:android', + }, + android: { + command: 'npm run build:android-release', + }, + androidrun: { + command: 'npm run run:android && npm run log:android', + }, + androidbuild: { + command: 'cd cordova/project && cordova build android --release', + }, + androidsign: { + command: 'rm -f cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk bitcoin-com && ../android-sdk-macosx/build-tools/27.0.1/zipalign -v 4 cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk ', + stdin: true, + }, + desktopsign: { + cmd: 'gpg -u E0AE67E7 --output webkitbuilds/others/<%= pkg.title %>-linux.zip.sig --detach-sig webkitbuilds/others/<%= pkg.title %>-linux.zip ; gpg -u E0AE67E7 --output webkitbuilds/others/<%= pkg.title %>.exe.sig --detach-sig webkitbuilds/others/<%= pkg.title %>.exe' + }, + desktopverify: { + cmd: 'gpg --verify webkitbuilds/<%= pkg.title %>-linux.zip.sig webkitbuilds/<%= pkg.title %>-linux.zip; gpg --verify webkitbuilds/<%= pkg.title %>.exe.sig webkitbuilds/<%= pkg.title %>.exe' + }, + osxsign: { + cmd: 'gpg -u E0AE67E7 --output webkitbuilds/<%= pkg.title %>.dmg.sig --detach-sig webkitbuilds/<%= pkg.title %>.dmg' + }, }, watch: { options: { @@ -168,7 +163,7 @@ module.exports = function(grunt) { }, bitanalytics: { src: [ - 'bitanalytics/bitanalytics.js' + 'bitanalytics/bitanalytics-0.1.0.js' ], dest: 'www/lib/bitanalytics.js' }, @@ -301,10 +296,10 @@ module.exports = function(grunt) { }, pkg: { options: { - appName: '<%= pkg.title %>', + appName: '<%= pkg.nameCaseNoSpace %>', platforms: ['osx64'], buildDir: './webkitbuilds/pkg', - version: '0.19.4', + version: '0.19.5', macIcns: './resources/<%= pkg.name %>/mac/pkg/app.icns', exeIco: './www/img/app/logo.ico', macPlist: { @@ -353,49 +348,30 @@ 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', ['exec:ios']); + grunt.registerTask('ios-debug', ['exec:iosdebug']); + grunt.registerTask('ios-run', ['exec:xcode']); grunt.registerTask('cordovaclean', ['exec:cordovaclean']); - - // Build all - grunt.registerTask('build-app-release', ['build-mobile-release', 'build-desktop-release']); - - /** - * Mobile app - */ - - // Build mobile app - grunt.registerTask('build-mobile-release', ['build-ios-release', 'build-android-release']); - - // Build ios - grunt.registerTask('start-ios', ['default', 'exec:build_ios_debug', 'exec:xcode']); - grunt.registerTask('build-ios-debug', ['default', 'exec:build_ios_debug']); - grunt.registerTask('build-ios-release', ['prod', 'exec:build_ios_release']); - - // Build android - grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']); - grunt.registerTask('build-android-debug', ['default', 'exec:build_android_debug']); - grunt.registerTask('start-android-emulator', ['build-android-debug', 'exec:run_android_emulator']); - grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']); - grunt.registerTask('sign-android', ['exec:sign_android']); - - /** - * Desktop app - */ + grunt.registerTask('android-debug', ['exec:androiddebug', 'exec:androidrun']); + grunt.registerTask('android', ['exec:android']); + grunt.registerTask('android-release', ['prod', 'exec:android', 'exec:androidsign']); + grunt.registerTask('desktopsign', ['exec:desktopsign', 'exec:desktopverify']); // Build desktop - grunt.registerTask('build-desktop', ['build-desktop-others', 'build-desktop-osx-dmg', 'build-desktop-osx-pkg']); + grunt.registerTask('desktop-build', ['desktop-others', 'desktop-osx-dmg', 'desktop-osx-pkg']); // Build desktop win64 & linux64 - grunt.registerTask('build-desktop-others', ['prod', 'nwjs:others', 'copy:linux', 'exec:create_others_dist']); + grunt.registerTask('desktop-others', ['prod', 'nwjs:others', 'copy:linux', 'exec:create_others_dist']); // Build desktop osx pkg - grunt.registerTask('build-desktop-osx-pkg', ['prod', 'exec:get_nwjs_for_pkg', 'nwjs:pkg', 'exec:create_pkg_dist']); + grunt.registerTask('desktop-osx-pkg', ['prod', 'exec:get_nwjs_for_pkg', 'nwjs:pkg', 'exec:create_pkg_dist']); // Build desktop osx dmg - grunt.registerTask('build-desktop-osx-dmg', ['prod', 'nwjs:dmg', 'exec:create_dmg_dist']); + grunt.registerTask('desktop-osx-dmg', ['prod', 'nwjs:dmg', 'exec:create_dmg_dist']); // Sign desktop - grunt.registerTask('sign-desktop', ['exec:sign_desktop_dist']); + grunt.registerTask('desktop-sign', ['exec:sign_desktop_dist']); // Release desktop - grunt.registerTask('build-desktop-release', ['build-desktop', 'sign-desktop']); + grunt.registerTask('desktop-release', ['desktop-build', 'desktop-sign']); }; diff --git a/README.md b/README.md index ae2788217..56ae84eab 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,3 @@ -This is a fork of the Bitcoin.com wallet to add additional features. -Features included: - - - Zero fee transactions (only works for Bitcoin Cash). You will be asked for, if you want to send a transaction as zero fee on the confirmation page. - - ## Zero fee transactions: - Because most network nodes on the Bitcoin Cash network don't relay zero fee txs, you will experience some strange issues, but don't worry: for me personally the Bitcoin.com pool has included all my zero fee transactions, but please beware that the receiver probably won't see your tx before it has been confirmed and please do also keep in mind, that the transactions coming after it won't confirm or be seen before the zero fee one has been confirmed. - - If you do already have a Bitcoin.com wallet, you need to create a new one to use this feature or change the wallet URL to: https://bws.freepages.dk/bws/api - - ## Disclaimer - - Please beware this is my personal experimental project. You are more than welcome to play with it, but I don't take any responsibility of loss of funds due to errors in the code, so please make sure you made a backup before running this software. - - ## Builds - - You can build the software yourself using the instructions below or use prebuilt binaries which can be found here (currently Windows and Linux only): https://ipfs.io/ipfs/QmR1DaS3QsDS48SzAWKUWFfmtMfJc4tgMtkSk3JFmuzewe - - ## - - The Bitcoin.com wallet is a fork of the Copay Wallet (https://github.com/bitpay/copay). The Bitcoin.com wallet is a secure bitcoin wallet platform for both desktop and mobile devices. It uses [Bitcore Wallet Service](https://github.com/Bitcoin-com/bitcore-wallet-service) (our fork of the [Bitpay Bitcore Wallet Service](https://github.com/bitpay/bitcore-wallet-service)) (BWS) for peer synchronization and network interfacing. @@ -134,14 +113,14 @@ npm run start:desktop Before building the release version for a platform, run the `clean-all` command to delete any untracked files in your current working directory. (Be sure to stash any uncommited changes you've made.) This guarantees consistency across builds for the current state of this repository. -The `build:*-release` commands build the production version of the app, and bundle it with the release version of the platform being built. +The `final` commands build the production version of the app, and bundle it with the release version of the platform being built. ### Android ```sh npm run clean-all npm run apply:bitcoincom -npm run build:android-release +npm run final:android ``` ### iOS @@ -149,7 +128,7 @@ npm run build:android-release ```sh npm run clean-all npm run apply:bitcoincom -npm run build:ios-release +npm run final:ios ``` ### Desktop (Linux, macOS, and Windows) @@ -157,7 +136,7 @@ npm run build:ios-release ```sh npm run clean-all npm run apply:bitcoincom -npm run build:desktop-release +npm run final:desktop ``` ## About The Bitcoin.com Wallet diff --git a/app-template/bitcoincom/appConfig.json b/app-template/bitcoincom/appConfig.json index 2eab6232d..084a586ce 100644 --- a/app-template/bitcoincom/appConfig.json +++ b/app-template/bitcoincom/appConfig.json @@ -24,9 +24,9 @@ "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c", "pushSenderId": "1036948132229", "description": "A Secure Bitcoin Wallet", - "version": "5.1.3", - "fullVersion": "5.1-rc2", - "androidVersion": "501003", + "version": "4.13.2", + "fullVersion": "4.13-rc3", + "androidVersion": "413200", "_extraCSS": "", "_enabledExtensions": { "coinbase": false, diff --git a/app-template/bitcoincom/css/bitcoin.com.css b/app-template/bitcoincom/css/bitcoin.com.css index cb20ff48d..e9b316761 100644 --- a/app-template/bitcoincom/css/bitcoin.com.css +++ b/app-template/bitcoincom/css/bitcoin.com.css @@ -268,33 +268,5 @@ div.onboarding-topic { display: block; float: left; max-height: 100%; - max-width: 100%; -} - -.bitpay-banner { - background: #1A3A8B; - padding: 10px; - box-shadow: 0px 5px 10px 0px #cccccc; - height: 5em; -} - -.bitpay-logo { - display: block; - max-height: 100%; - width: 100%; - height: 4em; -} - -.egifter-banner { - background: #1A3A8B; - padding: 10px; - box-shadow: 0px 5px 10px 0px #cccccc; - height: 5em; - text-align: center; -} - -.egifter-logo { - max-height: 100%; - max-width: 100%; - height: 4em; + max-width: 100%; } diff --git a/app-template/config-template.xml b/app-template/config-template.xml index 8686b7b36..1c7f5a30a 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -72,7 +72,7 @@ - + @@ -85,12 +85,6 @@ - - - - - - @@ -108,7 +102,6 @@ - diff --git a/app-template/create-pkg-dist.sh b/app-template/create-pkg-dist.sh index 66fe589d0..c0b4d266d 100644 --- a/app-template/create-pkg-dist.sh +++ b/app-template/create-pkg-dist.sh @@ -24,9 +24,8 @@ ln -s ../resources/bitcoin.com/mac/pkg/build.cfg build.cfg rm build_mas.py ln -s ../resources/bitcoin.com/mac/pkg/build_mas.py build_mas.py -echo "Signing ${APP_FULLNAME}" -export CURRENT_PATH=`pwd` -export APP_PATH="pkg/${APP_FULLNAME}/osx64/${APP_FULLNAME}" +echo "Signing ${APP_NAME}" +export APP_PATH="pkg/${APP_NAME}/osx64/${APP_NAME}" export TMP_PATH="tmp" export DIST_PATH="dist" @@ -37,16 +36,10 @@ if [ ! -d $DIST_PATH ]; then mkdir $DIST_PATH fi -cd "${APP_PATH}.app/Contents/Versions" -ln -s "55.0.2883.87" "Current" - -cd $CURRENT_PATH -chmod -vR 777 "${APP_PATH}.app/Contents" - -python build_mas.py -C build.cfg -O "${TMP_PATH}/${APP_FULLNAME}.app" -I "${APP_PATH}.app" -P "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg" +python build_mas.py -C build.cfg -O "${TMP_PATH}/${APP_NAME}.app" -I "${APP_PATH}.app" -P "$DIST_PATH/${APP_PACKAGE}-wallet-${APP_VERSION}-osx.pkg" echo "Signing Done" echo "Done." -exit \ No newline at end of file +exit diff --git a/app-template/package-template.json b/app-template/package-template.json index 11b15bfcd..232ac7e1f 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -87,53 +87,46 @@ "bitcoincashjs-fork": "^1.0.3" }, "scripts": { - "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare && cd ../ && ./fix-asn1.sh", - - "build:app-release": "grunt build-app-release", - - "build:mobile-release": "grunt build-mobile-release", - "build:desktop-release": "grunt build-desktop-release", - - "build:android-debug": "grunt build-android-debug", - "build:android-release": "grunt build-android-release", - - "build:ios-debug": "grunt build-ios-debug", - "build:ios-release": "grunt build-ios-release", - - "build:desktop": "grunt build-desktop", - "build:osx-pkg": "grunt build-desktop-osx-pkg", - "build:osx-dmg": "grunt build-desktop-osx-dmg", - "build:others": "grunt build-desktop-others", - - "build:windows": "cordova prepare windows && cordova build windows -- --arch=\"ARM\"", - "build:windows-release": "cordova prepare windows && cordova build windows --release --arch=\"ARM\"", - "build:www": "grunt", - "build:www-release": "grunt prod", - - "clean": "trash platforms && trash plugins && cordova prepare", - "clean-all": "git clean -dfx", - - "log:android": "adb logcat | grep chromium", - - "open:android": "grunt exec:android_studio", - "open:ios": "grunt exec:xcode", - "postinstall": "bower install", - - "sign:android": "grunt sign-android", - "sign:desktop": "grunt sign-desktop", - "start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0", "start:chrome": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"", - "start:android": "grunt start-android", - "start:android-emulator": "grunt start-android", - "start:android-log": "grunt start-android && npm run log:android", - "start:ios": "grunt start-ios", + "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", + "start:android": "npm run build:www && npm run build:android && npm run run:android", "start:windows": "npm run build:www && npm run build:windows", - + "start:desktop": "npm start", + "watch": "grunt watch", + "build:www": "grunt", + "build:www-release": "grunt prod", + "build:ios": "cordova prepare ios && cordova build ios --debug", + "build:android": "cordova prepare android && cordova build android --debug", + "build:windows": "cordova prepare windows && cordova build windows -- --arch=\"ARM\"", + "build:ios-release": "cordova prepare ios && cordova build ios --release", + "build:android-release": "cordova prepare android && cordova build android --release", + "build:windows-release": "cordova prepare windows && cordova build windows --release --arch=\"ARM\"", + "build:desktop-release": "grunt desktop-release", + "build:desktop": "grunt desktop-build", + "build:osx-pkg": "grunt desktop-osx-pkg", + "build:osx-dmg": "grunt desktop-osx-dmg", + "build:others": "grunt desktop-others", + "sign:desktop": "grunt desktop-sign", + "open:ios": "open platforms/ios/*.xcodeproj", + "open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android", + "final:www": "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 sign:android && npm run run:android-release", + "final:windows": "npm run final:www && npm run build:windows-release", + "final:desktop": "npm run final:www && npm run build:desktop-release", + "run:android": "cordova run android --device", + "run:android-release": "cordova run android --device --release", + "log:android": "adb logcat | grep chromium", + "sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk bitcoin-com && $ANDROID_HOME/build-tools/27.0.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk", + "apply:copay": "npm i fs-extra && cd app-template && node apply.js copay && npm i && cordova prepare", + "apply:bitpay": "npm i fs-extra && cd app-template && node apply.js bitpay && npm i && cordova prepare", + "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare", "test": "karma start test/karma.conf.js --single-run", + "clean": "trash platforms && trash plugins && cordova prepare", "unstage-package": "git reset package.json", - "watch": "grunt watch" + "clean-all": "git clean -dfx" }, "devDependencies": { "cordova": "^6.3.1", @@ -148,4 +141,4 @@ "pre-commit": "^1.1.3" }, "pre-commit": "unstage-package" -} +} \ No newline at end of file diff --git a/bitanalytics/bitanalytics.js b/bitanalytics/bitanalytics-0.1.0.js similarity index 97% rename from bitanalytics/bitanalytics.js rename to bitanalytics/bitanalytics-0.1.0.js index d04b2a0bd..db149e481 100644 --- a/bitanalytics/bitanalytics.js +++ b/bitanalytics/bitanalytics-0.1.0.js @@ -6256,6 +6256,7 @@ var ClickAction = /** @class */ (function (_super) { // Add event listener to all the elements found for (var i = 0; i < elements.length; i++) { var element = elements[i]; + console.log('init ' + this.name); element.addEventListener('click', this.listener); } }; @@ -6275,7 +6276,7 @@ var ClickAction = /** @class */ (function (_super) { }(action_1.default)); exports.default = ClickAction; -},{"../action":4,"../log-event":16,"../log-event-handlers":15}],6:[function(require,module,exports){ +},{"../action":4,"../log-event":15,"../log-event-handlers":14}],6:[function(require,module,exports){ "use strict"; var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; @@ -6314,7 +6315,7 @@ var BitAnalytics = /** @class */ (function () { exports.default = BitAnalytics; BitAnalytics.main(); -},{"./action-factory":2,"./action-handlers":3,"./channels/adjust-channel":9,"./channels/mixpanel-channel":12,"./log-event":16,"./log-event-handlers":15}],7:[function(require,module,exports){ +},{"./action-factory":2,"./action-handlers":3,"./channels/adjust-channel":9,"./channels/mixpanel-channel":12,"./log-event":15,"./log-event-handlers":14}],7:[function(require,module,exports){ "use strict"; var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; @@ -6412,6 +6413,7 @@ var AdjustChannel = /** @class */ (function (_super) { _this.eventTypes = config.eventTypes; var os = _this.adjustedOs(config.os); _this.advertisingId = _this.getAdvertisingId(os); + console.log('Advertising ID for adjust: ' + _this.advertisingId); // TODO: Different initialisation for Cordova. var sessionParams = { app_version: config.appVersion, @@ -6558,10 +6560,11 @@ var FirebaseChannel = /** @class */ (function (_super) { var keys = Object.keys(params); var keysLength = keys.length; var sanitized = {}; - keys.map(function (key) { + for (var i = 0; i < keysLength; i++) { + var key = keys[i]; var cleanKey = key.replace('-', '_').replace(/[\W]+/g, ''); sanitized[cleanKey] = params[key]; - }); + } return sanitized; }; return FirebaseChannel; @@ -6585,12 +6588,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); var channel_1 = __importDefault(require("../channel")); -var ga_1 = __importDefault(require("../external-libs/ga")); var GoogleAnalyticsChannel = /** @class */ (function (_super) { __extends(GoogleAnalyticsChannel, _super); function GoogleAnalyticsChannel(name, config) { var _this = _super.call(this, name) || this; + _this.dataLayer = null; _this.gaInstance = null; + _this.trackingId = ''; _this.eventLabels = ['id']; if (!config.trackingId) { throw new Error('[BitAnalytics] Google Analytics config is missing tracking ID.'); @@ -6598,12 +6602,8 @@ var GoogleAnalyticsChannel = /** @class */ (function (_super) { if (config.eventLabels) { _this.eventLabels = config.eventLabels; } - _this.gaInstance = new ga_1.default({ - trackID: config.trackingId, - appVersion: config.appVersion, - appName: config.appName || 'App' - }); - _this.isReady = true; + _this.trackingId = config.trackingId; + _this.setUpGa(); return _this; } /** @@ -6612,26 +6612,49 @@ var GoogleAnalyticsChannel = /** @class */ (function (_super) { * */ GoogleAnalyticsChannel.prototype.postEvent = function (name, params) { + // Default Google Analytics Events + // https://developers.google.com/analytics/devguides/collection/gtagjs/events + // Useful to convert to these, or start with these? if (this.isReady) { - var category = name; - var action = name; - var label = name; - var value = params['value'] || ''; + params.event_category = name; for (var _i = 0, _a = this.eventLabels; _i < _a.length; _i++) { var eventLabel = _a[_i]; if (params[eventLabel]) { - label = params[eventLabel]; + params.event_label = params[eventLabel]; break; } } - this.gaInstance.event(category, action, label, value); + this.gtag('event', name, params); } }; + /** + * + * Private methods + * + */ + /** + * Mimics function in the tracking snippet + */ + GoogleAnalyticsChannel.prototype.gtag = function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + console.log(arguments); + window.dataLayer.push(arguments); + }; + GoogleAnalyticsChannel.prototype.setUpGa = function () { + // From what GA recommends to insert into page + window.dataLayer = window.dataLayer || []; + this.gtag('js', new Date()); + this.gtag('config', this.trackingId); + this.isReady = true; + }; return GoogleAnalyticsChannel; }(channel_1.default)); exports.default = GoogleAnalyticsChannel; -},{"../channel":8,"../external-libs/ga":14}],12:[function(require,module,exports){ +},{"../channel":8}],12:[function(require,module,exports){ "use strict"; var __extends = (this && this.__extends) || (function () { var extendStatics = Object.setPrototypeOf || @@ -6654,7 +6677,7 @@ var MixpanelChannel = /** @class */ (function (_super) { function MixpanelChannel(name, config) { var _this = _super.call(this, name) || this; if (!config.token) { - throw new Error('[BitAnalytics] Config incorrect.'); + throw new DOMException('[BitAnalytics] Config incorrect.'); } _this.mixpanelInstance = mixpanel; mixpanel.init(config.token, config.config); @@ -6723,207 +6746,6 @@ exports.default = MixpanelChannel; },{}],14:[function(require,module,exports){ "use strict"; -/* - * name: nwjs-analytics -Node-Webkit Google Analytics integration - * version: 1.0.2 - * github: https://github.com/Daaru00/nwjs-analytics - */ -function GA(opt) { - this.apiVersion = opt.apiVersion || '1'; - this.trackID = opt.trackID || 'UA-XXXXXXXX-X'; - this.clientID = opt.clientID || null; - this.userID = opt.userID || null; - this.appName = opt.appName || 'App'; - this.appVersion = opt.appVersion || '1.0.0'; - this.debug = opt.debug || false; - this.performanceTracking = opt.performanceTracking || true; - this.errorTracking = opt.errorTracking || true; - this.userLanguage = opt.userLanguage || "en"; - this.currency = opt.currency || "EUR"; - this.lastScreenName = opt.lastScreenName || ''; -} -GA.prototype.sendRequest = function (data, callback) { - var ga = this; - if (!this.clientID || this.clientID == null) - this.clientID = this.generateClientID(); - if (!this.userID || this.userID == null) - this.userID = this.generateClientID(); - var postData = "v=" + this.apiVersion - + "&an=" + this.appName - + "&av=" + this.appVersion - + "&tid=" + this.trackID - + "&cid=" + this.clientID - + "&sr=" + this.getScreenResolution() - + "&vp=" + this.getViewportSize(); - Object.keys(data).forEach(function (key) { - var val = data[key]; - if (typeof val != "undefined") - postData += "&" + key + "=" + val; - }); - var http = new XMLHttpRequest(); - var url = "https://www.google-analytics.com"; - if (!this.debug) - url += "/collect"; - else - url += "/debug/collect"; - http.open("GET", url + "?" + postData, true); - http.onreadystatechange = function () { - if (ga.debug) - console.log(http.response); - if (http.readyState == 4 && http.status == 200) { - if (callback) - callback(true); - } - else { - if (callback) - callback(false); - } - }; - http.send(); -}; -GA.prototype.generateClientID = function () { - var id = ""; - var possibilities = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - for (var i = 0; i < 5; i++) - id += possibilities.charAt(Math.floor(Math.random() * possibilities.length)); - return id; -}; -GA.prototype.getScreenResolution = function () { - return screen.width + "x" + screen.height; -}; -GA.prototype.getColorDept = function () { - return screen.colorDepth + "-bits"; -}; -GA.prototype.getUserAgent = function () { - return navigator.userAgent; -}; -GA.prototype.getViewportSize = function () { - return window.screen.availWidth + "x" + window.screen.availHeight; -}; -/* - * Measurement Protocol - * [https://developers.google.com/analytics/devguides/collection/protocol/v1/devguide] - */ -GA.prototype.screenView = function (screename) { - var data = { - 't': 'screenview', - 'cd': screename - }; - this.sendRequest(data); - this.lastScreenName = screename; -}; -GA.prototype.event = function (category, action, label, value) { - var data = { - 't': 'event', - 'ec': category, - 'ea': action, - }; - if (label) { - data['el'] = label; - } - if (value) { - data['ev'] = value; - } - if (this.lastScreenName) { - data['cd'] = this.lastScreenName; - } - this.sendRequest(data); -}; -GA.prototype.exception = function (msg, fatal) { - var data = { - 't': 'exception', - 'exd': msg, - 'exf': fatal || 0 - }; - this.sendRequest(data); -}; -GA.prototype.timing = function (category, variable, time, label) { - var data = { - 't': 'timing', - 'utc': category, - 'utv': variable, - 'utt': time, - 'utl': label, - }; - this.sendRequest(data); -}, - GA.prototype.ecommerce = { - transactionID: false, - generateTransactionID: function () { - var id = ""; - var possibilities = "0123456789"; - for (var i = 0; i < 5; i++) - id += possibilities.charAt(Math.floor(Math.random() * possibilities.length)); - return id; - }, - transaction: function (total, items) { - var t_id = ""; - if (!this.ecommerce.transactionID) - t_id = this.ecommerce.generateTransactionID(); - else - t_id = this.ecommerce.transactionID; - var data = { - 't': 'transaction', - 'ti': t_id, - 'tr': total, - 'cu': this.currency, - }; - this.sendRequest(data); - items.forEach(function (item) { - var data = { - 't': 'item', - 'ti': t_id, - 'in': item.name, - 'ip': item.price, - 'iq': item.qty, - 'ic': item.id, - 'cu': this.currency - }; - this.sendRequest(data); - }); - } - }, - GA.prototype.custom = function (data) { - this.sendRequest(data); - }; -module.exports = GA; -/* - * Performance Tracking - */ -/*window.addEventListener("load", function() { - - if(ga.performanceTracking) { - setTimeout(function() { - var timing = window.performance.timing; - var userTime = timing.loadEventEnd - timing.navigationStart; - ga.timing("performance", "pageload", userTime); - }, 0); - } - -}, false);*/ -/* - * Error Reporting - */ -/*window.onerror = function (msg, url, lineNo, columnNo, error) { - var message = [ - 'Message: ' + msg, - 'Line: ' + lineNo, - 'Column: ' + columnNo, - 'Error object: ' + JSON.stringify(error) - ].join(' - '); - - if(ga.errorTracking) - { - setTimeout(function() { - ga.exception(message.toString()); - }, 0); - } - - return false; -};*/ - -},{}],15:[function(require,module,exports){ -"use strict"; var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; @@ -7035,7 +6857,7 @@ var LogEventHandlers = /** @class */ (function () { _this.channels.push(channel); } catch (error) { - console.log(error.message); + console.log('[BitAnalytics] ' + error.name + ': ' + error.message); } }); }; @@ -7043,7 +6865,7 @@ var LogEventHandlers = /** @class */ (function () { }()); exports.default = LogEventHandlers; -},{"./channel-factory":7}],16:[function(require,module,exports){ +},{"./channel-factory":7}],15:[function(require,module,exports){ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var LogEvent = /** @class */ (function () { diff --git a/bower.json b/bower.json index d94800d24..08a82d9b8 100644 --- a/bower.json +++ b/bower.json @@ -24,6 +24,6 @@ }, "resolutions": { "angular": "1.5.3", - "ionic": "eefba1331b" + "ionic": "1b7414faba" } } diff --git a/fix-asn1.sh b/fix-asn1.sh deleted file mode 100755 index 1dbca6a67..000000000 --- a/fix-asn1.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -firstLine=`awk 'NR < 2 {print}' node_modules/asn1.js-rfc5280/index.js` - -if [ "$firstLine" = "try {" ]; then - echo "var asn1 = require('asn1.js');" > node_modules/asn1.js-rfc5280/index.new.js - awk 'NR > 6 {print}' node_modules/asn1.js-rfc5280/index.js >> node_modules/asn1.js-rfc5280/index.new.js - rm node_modules/asn1.js-rfc5280/index.js - mv node_modules/asn1.js-rfc5280/index.new.js node_modules/asn1.js-rfc5280/index.js - echo "node_modules/asn1.js-rfc5280/index.js fixed" -fi \ No newline at end of file diff --git a/i18n/po/ca/template-ca.po b/i18n/po/ca/template-ca.po index 0fa97d8ab..088cd870b 100644 --- a/i18n/po/ca/template-ca.po +++ b/i18n/po/ca/template-ca.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Catalan\n" "Language: ca\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:43\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "Número de compte" msgid "Instant transactions with low fees" msgstr "Transaccions instantànies amb comissions baixes" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Fons insuficients" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Canvia de moneda" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Fons disponibles" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Utilitza tots els fons disponibles" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Següent" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "Comptes" @@ -226,20 +206,6 @@ msgstr "Gairebé ja estem! Repassem-ho." msgid "Alternative Currency" msgstr "Moneda alternativa" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Visualització del preu" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Criptomoneda" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com no està disponible en aquest moment. Torneu-ho a provar més tard." @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "No es pot crear la cartera" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "No us podeu unir a la mateixa cartera més d'un cop" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "Copayer {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Copiat al porta-retalls" @@ -1316,7 +1281,6 @@ msgstr "Amb finalitats d'auditoria" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "Des de" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Rebeu notícies i actualitzacions de BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Comença" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Comença" @@ -2200,10 +2168,6 @@ msgstr "Pagament rebutjat" msgid "Payment Sent" msgstr "Pagament enviat" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Comparteix aquesta transacció" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Pagament acceptat, però encara no emès" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "Dades de pagament" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "Sol·licitud de pagament" #: www/views/mercadoLibreCards.html:22 @@ -2394,7 +2358,7 @@ msgstr "Rep" #: www/views/customAmount.html:44 msgid "Receive in" -msgstr "Rebre en" +msgstr "Rep a" #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Enganxa l'adreça" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Transferència entre carteres" +msgid "Wallet to Wallet Transfer" +msgstr "Transferència de cartera a cartera" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "Escaneja el codi QR" msgid "Send Bitcoin faster!" msgstr "Envia bitcoins més ràpid!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Envia bitcoins més ràpid!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Deseu adreces utilitzades freqüentment i envieu-los bitcoins d'un sol toc" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Podeu rebre bitcoins des de qualsevol cartera o servei." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Per començar, heu de crear una cartera bitcoin i obtenir uns quants bitcoins." @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "Escombratge" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Escombra la cartera de paper" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "Escombra la cartera de paper" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "Aquesta aplicació emmagatzema els vostres bitcoins amb una seguretat de msgid "This bitcoin payment request has expired." msgstr "Aquesta sol·licitud de pagament bitcoin ha caducat." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "El pagament venç:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "La sol·licitud de pagament ha vençut" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "Per a" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Per començar, compreu bitcoins o compartiu la vostra adreça. Podeu rebre bitcoins de qualsevol cartera o servei." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Per començar, heu de crear una cartera bitcoin i obtenir uns quants bitcoins." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "Per {{reason}} ja heu d'haver afegit el vostre compte BitPay - {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Recàrrega en curs..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Recàrrega de {{amountStr}} a la targeta de dèbit ({{cardLastNumber}})" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Inicia ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Canvieu de BTC a BCH en minuts." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Per iniciar el procés heu d'afegir fons a la cartera." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "El procés és ràpid i rebreu l'import canviat a la vostra cartera." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Aquest servei el presta un tercer, ShapeShift, que cobrarà una petita comissió pel servei. Veureu la comissió abans d'iniciar la transacció." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Explora Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Jocs de Bitcoin Cash" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Comparteix l'aplicació de la cartera" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Notícies" @@ -3825,119 +3758,3 @@ msgstr "Bitcoin Cash gratis" msgid "Your Bitcoin Wallets are ready!" msgstr "Les vostres carteres bitcoin ja estan a punt!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "L'adreça no conté informació sobre la moneda. Comproveu que envieu la moneda correcta." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Reviseu la transacció" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Esteu enviant" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Esteu canviant" - -#: www/views/review.html:36 -msgid "To:" -msgstr "Per a:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Afegiu nota personal" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Suggerida pel comerciant:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Introduïu el text aquí" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Nota personal:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Menys d'1 cèntim" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Aquesta factura ja no accepta pagaments" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Envia la quantitat màxima" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Error desconegut." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "No hi ha cap cartera de Bitcoin Cash per transferir els fons trobats." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "No s'ha trobat cap Bitcoin Cash." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "S'ha trobat Bitcoin Core:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "No hi ha cap cartera de Bitcoin Core per transferir els fons trobats." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "No s'ha trobat cap Bitcoin Core." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "L'escaneig ha fallat" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "No s'han reconegut les dades." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "No compatible" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet no és compatible." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Obre a l'explorador web" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Adreça no vàlida" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "No s'ha definit l'import" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "L'import és inferior al mínim" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "L'import supera el límit" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Resposta no vàlida de Shapeshift" - diff --git a/i18n/po/cs/template-cs.po b/i18n/po/cs/template-cs.po index 970b81daf..5a3702736 100644 --- a/i18n/po/cs/template-cs.po +++ b/i18n/po/cs/template-cs.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Czech\n" "Language: cs\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:43\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -79,27 +79,7 @@ msgstr "Číslo účtu" #: www/views/tab-home.html:61 msgid "Instant transactions with low fees" -msgstr "Okamžité transakce s nízkými poplatky" - -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Nedostatek prostředků" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Změnit měnu" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Dostupné prostředky" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Použít všechny dostupné prostředky" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Další" +msgstr "Okamžité transakce s nízkou platbou" #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" @@ -226,20 +206,6 @@ msgstr "Téměř hotovo! Podívejme se." msgid "Alternative Currency" msgstr "Alternativní měna" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Zobrazení cen" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Nucený oběh" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Kryptoměna" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com není v této chvíli k dispozici. Zkuste to prosím později." @@ -520,8 +486,8 @@ msgid "Cannot Create Wallet" msgstr "Není možné vytvořit peněženku" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" -msgstr "Nelze se připojit vícekrát ke stejné peněžence" +msgid "Cannot join the same wallet more that once" +msgstr "Není možné několikrát sloučit stejnou peněženku" #: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" @@ -696,7 +662,6 @@ msgstr "Spoluplátce {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Zkopírováno do schránky" @@ -938,7 +903,7 @@ msgstr "Mazání peněženky..." #: src/js/services/onGoingProcess.js:28 msgid "Deleting payment proposal" -msgstr "Mazání návrhu platby" +msgstr "Mázání návrhu platby" #: www/views/join.html:141 #: www/views/tab-create-personal.html:111 @@ -992,7 +957,7 @@ msgstr "Duplikování peněženky..." #: www/views/addresses.html:19 msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment." -msgstr "Každá Bitcoin peněženka může z 12-ti slov zálohovací fráze vygenerovat miliardy adres. Vždy, když přijímáte platbu, je automaticky vygenerována nová adresa." +msgstr "Každá Bitcoin peněženka může z 12-ti slov zálohovací fráze vygenerovat miliardy adres. Vždy, když přijímáté platbu, je automaticky vygenerována nová adresa." #: src/js/services/feeService.js:13 msgid "Economy" @@ -1297,7 +1262,7 @@ msgstr "Nastavení filtru" #: src/js/services/fingerprintService.js:43 #: src/js/services/fingerprintService.js:48 msgid "Finger Scan Failed" -msgstr "Sken otisku prstu se nezdařil" +msgstr "Scan otisku prstu se nezdařil" #: src/js/controllers/feedback/send.js:34 #: www/views/feedback/complete.html:7 @@ -1316,7 +1281,6 @@ msgstr "Pro účely auditu" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "Od" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Získávejte novinky a aktualizace z BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Začněte" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Začněte" @@ -1547,7 +1515,7 @@ msgstr "Je-li povoleno, budou chráněny veškeré citlivé informace (privátn #: www/views/advancedSettings.html:23 msgid "If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab." -msgstr "Je-li povoleno, zobrazí se na kartě Domů karta Nedávné transakce - seznam posledních transakcí napříč všemi peněženkami." +msgstr "Je-li povoleno, zobrazí se na kartě Domů karta Nadávné transakce - seznam posledních transakcí napříč všemi peněženkami." #: www/views/advancedSettings.html:14 msgid "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays." @@ -1667,7 +1635,7 @@ msgstr "Neplatná odvozovací cesta" #: src/js/controllers/copayers.js:90 msgid "Invitation to share a {{appName}} Wallet" -msgstr "Pozvánka ke sdílení {{appName}} peněženky" +msgstr "Pozvání ke sdílení {{appName}} peněženky" #: www/views/mercadoLibreCards.html:20 #: www/views/modals/mercadolibre-card-details.html:48 @@ -1692,7 +1660,7 @@ msgstr "Je vhodné vyvarovat se opakovanému použití adres - chrání to jak V #: src/js/controllers/backup.js:76 msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again." -msgstr "Je důležité si správně napsat zálohovací frázi. Stane-li se něco Vaší peněžence, budete tuto zálohu potřebovat ke zpřístupnění peněz. Zkontrolujte prosím Vaši zálohu a zkuste to znovu." +msgstr "Je důležité si správně napsat zálohovací frázi. Stane-li se něco Vaší peněžence, budete tuto zálohu potřebovat ke znovuzprístupnění peněz. Zkontrolujte prosím Vaši zálohu a zkuste to znovu." #: www/views/join.html:151 msgid "Join" @@ -1960,7 +1928,7 @@ msgstr "Žádné peněženky k příjmu peněz" #: www/views/cashScan.html:15 msgid "No wallets eligible for Bitcoin Cash support" -msgstr "Žádné peněženky podporující Bitcoin Cash" +msgstr "Žádné peněženky poporující Bitcoin Cash" #: src/js/controllers/cashScan.js:58 msgid "Non BIP44 wallet" @@ -1968,7 +1936,7 @@ msgstr "Jiná než BIP44 peněženka" #: www/views/cashScan.html:46 msgid "Non eligible BTC wallets" -msgstr "Peněženky nezpůsobilé pro BTC" +msgstr "Peněženky nezpůsobilé k BTC" #: src/js/services/feeService.js:12 msgid "Normal" @@ -2200,10 +2168,6 @@ msgstr "Platba odmítnuta" msgid "Payment Sent" msgstr "Platba odeslána" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Sdílet tuto transakci" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Platba přijata, ale zatím nerozeslána" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "Detaily platby" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "Žádost o platbu" #: www/views/mercadoLibreCards.html:22 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Vložit adresu" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Přenos mezi peněženkami" +msgid "Wallet to Wallet Transfer" +msgstr "Převod mezi peněženkami" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "Skenovat QR kód" msgid "Send Bitcoin faster!" msgstr "Odesílejte Bitcoin rychleji!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Odesílejte Bitcoin rychleji!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Uložte si často používané adresy a posílejte jim Bitcoin jedním kliknutím" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Můžete přijímat Bitcoin z jakékoliv peněženky nebo služby." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Chcete-li začít, budete muset vytvořit Bitcoin peněženku a Bitcoin získat." @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "Sweep" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Sweep papírové peněženky" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "Sweep papírové peněženky" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "Tato aplikace k držení Vašich Bitcoinů používá nejmodernější z msgid "This bitcoin payment request has expired." msgstr "Tato platba vypršela." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Platba vyprší:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "Platnost žádosti o platbu vypršela" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "Na" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Chcete-li začít, nakupte Bitcoin nebo sdílejte svou adresu. Můžete přijímat Bitcoin z jakékoliv jiné peněženky nebo služby." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Chcete-li začít, budete potřebovat vytvořit Bitcoin peněženku a získat Bitcoin." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "Pro {{reason}} musíte nejprve přidat Váš účet BitPay - {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Navyšování v průběhu..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Navýšit debetní kartu ({{cardLastNumber}}) o {{amountStr}}" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Spustit ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Vyměňte BTC za BCH za několik minut." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Ke spuštění procesu musíte do peněženky přidat prostředky." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "Tento proces je rychlý a vyměněnou částku dostanete do peněženky." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Tuto službu poskytuje nezávislý poskytovatel ShapeShift, který za službu účtuje malý poplatek. Poplatek se zobrazí před spuštěním transakce." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3365,7 +3302,7 @@ msgstr "Upozornění: Soukromý klíč této peněženky není k dispozici. Expo #: www/views/modals/paypro.html:42 msgid "WARNING: UNTRUSTED CERTIFICATE" -msgstr "Upozornění: Nedůvěryhodný certifikát" +msgstr "Upozornění: Nedůveryhodný certifikát" #: src/js/services/onGoingProcess.js:15 msgid "Waiting for Ledger..." @@ -3613,7 +3550,7 @@ msgstr "Zálohu můžete vytvořit později v nastavení peněženky." #: src/js/controllers/preferencesLanguage.js:12 msgid "You can make contributions by signing up on our Crowdin community translation website. We’re looking forward to hearing from you!" -msgstr "Můžete přispívat přihlášením k webovým stránkám Crowdin komunity pro překlady. Těšíme se na Vaše příspěvky!" +msgstr "Můžete přispívat příhlášením k webovým stránkám Crowdin komunity pro překlady. Těšíme se na Váše příspěvky!" #: www/views/tab-scan.html:16 msgid "You can scan bitcoin addresses, payment requests, paper wallets, and more." @@ -3797,10 +3734,6 @@ msgstr "Prohlédnout Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Bitcoin Cash hry" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Sdílet aplikaci peněženky" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Novinky" @@ -3825,119 +3758,3 @@ msgstr "Bitcoin Cash zdarma" msgid "Your Bitcoin Wallets are ready!" msgstr "Vaše Bitcoin peněženka je připravena!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "Adresa neobsahuje žádné údaje o měně. Zkontrolujte, zda posíláte správnou měnu." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Zkontrolovat transakci" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Posíláte" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Vyměňujete" - -#: www/views/review.html:36 -msgid "To:" -msgstr "Příjemce:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Přidat osobní poznámku" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Doporučeno obchodníkem:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Sem zadejte text" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Osobní poznámka:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Méně než 1 koruna" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Tato faktura již nepřijímá platby" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Odeslat maximální částku" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Neznámá chyba." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "Žádná Bitcoin Cash peněženka pro transfer nalezených prostředků." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Žádný Bitcoin Cash nenalezen." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Nalezen Bitcoin Core:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "Žádná Bitcoin Core peněženka pro transfer nalezených prostředků." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Žádný Bitcoin Core nenalezen." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Sken selhal" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Data nebyla rozpoznána." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "Nepodporováno" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet není podporován." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Otevřít ve webovém prohlížeči" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Neplatná adresa" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Částka nedefinována" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Nižší než minimální částka" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Nadlimitní částka" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Neplatná odpověď z Shapeshift" - diff --git a/i18n/po/de/template-de.po b/i18n/po/de/template-de.po index d2ea6cc62..18d8ca0f4 100644 --- a/i18n/po/de/template-de.po +++ b/i18n/po/de/template-de.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: German\n" "Language: de\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "Kontonummer" msgid "Instant transactions with low fees" msgstr "Sofortige Transaktionen mit niedrigen Gebühren" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Unzureichende Geldmittel" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Währung ändern" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Verfügbare Mittel" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Alle zur Verfügung stehenden Mittel verwenden" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Weiter" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "Konten" @@ -226,20 +206,6 @@ msgstr "Fast fertig! Fassen wir zusammen." msgid "Alternative Currency" msgstr "Alternative Währung" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Preisanzeige" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Kryptowährung" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com ist zurzeit nicht verfügbar. Bitte versuchen Sie es später nochmal." @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "Wallet kann nicht erstellt werden" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "An einem Wallet kann nicht mehrfach teilgenommen werden" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "Copayer {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "In die Zwischenablage kopiert" @@ -1316,7 +1281,6 @@ msgstr "Zur Kontrolle" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "Von" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Erhalten Sie Neuigkeiten und Aktualisierungen von BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Loslegen" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Los geht’s" @@ -1629,7 +1597,7 @@ msgstr "Unzureichende bestätigte Mittel" #: src/js/controllers/topup.js:177 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" -msgstr "Unzureichendes Guthaben für die Gebühr" +msgstr "Nicht ausreichendes Guthaben für die Gebühr" #: www/views/tab-settings.html:123 msgid "Integrations" @@ -2200,10 +2168,6 @@ msgstr "Zahlung abgelehnt" msgid "Payment Sent" msgstr "Zahlung gesendet" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Diese Transaktion teilen" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Zahlung akzeptiert, aber noch nicht übermittelt" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "Zahlungsdetails" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "Zahlungsanforderung" #: www/views/mercadoLibreCards.html:22 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Adresse einfügen" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Transfer zwischen Wallets" +msgid "Wallet to Wallet Transfer" +msgstr "Wallet-zu-Wallet-Überweisung" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "QR-Code scannen" msgid "Send Bitcoin faster!" msgstr "Versenden Sie Bitcoin schneller!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Versenden Sie Bitcoin schneller!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Speichern Sie häufig verwendete Adressen und senden Sie ihnen Bitcoin mit nur einem Tippen" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Sie können Bitcoin von jeder Wallet oder jedem Dienst erhalten." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Um loszulegen müssen Sie eine Bitcoin-Wallet erstellen und einige Bitcoins erhalten." @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "Leeren" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Paperwallet löschen" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "Paperwallet löschen" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "Diese App speichert Ihre Bitcoins mit modernster Sicherheit." msgid "This bitcoin payment request has expired." msgstr "Diese Bitcoin Zahlungsaufforderung ist abgelaufen." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Zahlung läuft ab:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "Zahlungsaufforderung ist abgelaufen" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "An" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Um loszulegen kaufe Bitcoins oder teilen Sie ihre Adresse. Sie können Bitcoins von jeder beliebigen Wallet oder von einem Dienstleister/Broker empfangen." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Um loszulegen müssen Sie eine Bitcoin-Wallet erstellen und einige Bitcoins erhalten." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "Zum {{reason}} müssen Sie erst Ihr BitPay-Konto hinzufügen - {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Aufladung in Bearbeitung..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Laden sie {{amountStr}} auf die Debitkarte ({{cardLastNumber}}) auf" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "ShapeShift starten" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Tauschen Sie ihre BTC in Minuten zu BCH um." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Sie müssen Mittel in Ihre Wallet hinzufügen, um den Vorgang zu starten." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "Der Vorgang ist kurz und Sie werden den getauschten Betrag in Ihre Wallet erhalten." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Diese Dienstleistung wird von dem Drittanbieter Shapeshift angeboten, welcher eine kleine Dienstgebühr berechnet. Diese Gebühr wird angezeigt, bevor Sie die Transaktion starten." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Erkunden Sie Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Bitcoin Cash Spiele" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Die Wallet-App teilen" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Neuigkeiten" @@ -3825,119 +3758,3 @@ msgstr "Kostenloses Bitcoin Cash" msgid "Your Bitcoin Wallets are ready!" msgstr "Ihre Bitcoin-Wallet ist fertig!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "Die Adresse enthält keine Währungsinformationen, stellen Sie bitte sicher, dass Sie die richtige Währung senden." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Transaktion überprüfen" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Sie senden" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Sie tauschen" - -#: www/views/review.html:36 -msgid "To:" -msgstr "An:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Persönliche Anmerkung hinzufügen" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Vom Händler vorgeschlagen:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Hier Text eingeben" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Persönliche Anmerkung:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Weniger als 1 Cent" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Diese Rechnung akzeptiert keine Zahlungen mehr" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Maximalen Betrag senden" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Unbekannter Fehler." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "Keine Bitcoin Cash Wallet, zu welchem Geld verschickt werden kann, gefunden." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Kein Bitcoin Cash gefunden." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Bitcoin Core gefunden:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "Keine Bitcoin Core Wallet, zu welchem Geld verschickt werden kann, gefunden." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Kein Bitcoin Core gefunden." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Scan ist fehlgeschlagen" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Daten nicht erkannt." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "Nicht unterstützt" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet wird nicht unterstützt." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Im Webbrowser öffnen" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Ungültige Adresse" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Betrag ist nicht definiert" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Menge liegt unter dem Minimum" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Betrag ist über dem Grenzwert" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Ungültige Antwort von Shapeshift" - diff --git a/i18n/po/es-ES/template-es-ES.po b/i18n/po/es-ES/template-es-ES.po index 2a22d3593..9338825d0 100644 --- a/i18n/po/es-ES/template-es-ES.po +++ b/i18n/po/es-ES/template-es-ES.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Spanish\n" "Language: es\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "Número de cuenta" msgid "Instant transactions with low fees" msgstr "Transacciones instantáneas con comisiones bajas" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Sin fondos suficientes" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Cambiar moneda" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Fondos disponibles" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Usar todos los fondos" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Siguiente" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "Cuentas" @@ -226,20 +206,6 @@ msgstr "¡Casi listo! Vamos a revisar." msgid "Alternative Currency" msgstr "Moneda Alternativa" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Muestra de precio" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Criptomoneda" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com no está disponible en este momento. Inténtalo de nuevo más tarde." @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "No se pudo crear la billetera" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "No puede unirse a la misma billetera más de una vez" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "Co-pagador {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Copiado al portapapeles" @@ -1316,7 +1281,6 @@ msgstr "Para propósitos de auditoría" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "Desde" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Recibir noticias y actualizaciones de BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Comenzar" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Empezar" @@ -2200,10 +2168,6 @@ msgstr "Pago Rechazado" msgid "Payment Sent" msgstr "Pago Enviado" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Comparte esta transacción" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Pago aceptado, pero aún no fue enviado" @@ -2221,8 +2185,8 @@ msgid "Payment details" msgstr "Detalles del pago" #: www/views/modals/paypro.html:6 -msgid "Payment Request" -msgstr "Solicitar pago" +msgid "Payment request" +msgstr "Solicitud de pago" #: www/views/mercadoLibreCards.html:22 #: www/views/modals/mercadolibre-card-details.html:39 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Pegar dirección" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Transferir entre billeteras" +msgid "Wallet to Wallet Transfer" +msgstr "Billetera a billetera" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,13 +2632,17 @@ msgstr "Escanear código QR" msgid "Send Bitcoin faster!" msgstr "¡Envía Bitcoin más rápido!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "¡Envía Bitcoin más rápido!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Guardar las direcciones que usas frecuentemente y envía Bitcoin en un click" #: www/views/tab-send.html:55 msgid "Add your first contact" -msgstr "Añade tu primer contacto" +msgstr "Añadie tu primer contacto" #: www/views/tab-send.html:65 msgid "Your Bitcoin wallet is empty" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Puedes recibir bitcoin desde cualquier billetera o servicio." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Para empezar, necesitarás crear una billetera y obtener bitcoins." @@ -2925,14 +2891,9 @@ msgid "Sweep" msgstr "Importar" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Importar billetera de papel" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" -msgstr "Importar billetera de papel" +msgid "Sweep paper wallet" +msgstr "Importar billetera en papel" #: src/js/services/onGoingProcess.js:33 msgid "Sweeping Wallet..." @@ -3100,14 +3061,6 @@ msgstr "Esta aplicación almacena tus bitcoins con seguridad avanzada." msgid "This bitcoin payment request has expired." msgstr "Esta solicitud de pago ha caducado." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "El pago expira en:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "El pago ha expirado" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "Para" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Para empezar, compra bitcoin o comparte tu dirección. Puedes recibir bitcoin desde cualquier billetera o servicio." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Para empezar, necesitarás crear una billetera y obtener Bitcoins." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "Para {{reason}} primero debes agregar tu cuenta de BitPay - {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Recarda en progreso..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Recargar {{amountStr}} a la tarjeta de débito ({{cardLastNumber}})" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Empezar ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Intercambia tus BTC a BCH en minutos." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Para iniciar el cambio necesitas añadir fondos a tu billetera." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "El proceso es rápido y recibirás la cantidad intercambiada en tu cartera." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Este servicio es proporcionado por el tercero ShapeShift, quien cobrará una pequeña tarifa por el servicio. La tarifa se mostrará antes de empezar la transacción." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Explora Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Juegos de Bitcoin Cash" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Comparte esta app" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Noticias" @@ -3825,119 +3758,3 @@ msgstr "Bitcoin Cash gratis" msgid "Your Bitcoin Wallets are ready!" msgstr "¡Tus billeteras Bitcoin están listas!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "La dirección no contiene información sobre la criptomoneda. Por favor asegúrese de estar enviando la criptomoneda correcta." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Revisar transacción" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Estás enviando" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Estás cambiando" - -#: www/views/review.html:36 -msgid "To:" -msgstr "Para:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Añadir nota personal" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Sugerido por el comerciante:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Introduce el texto aquí" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Nota personal:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Menos de 1 centavo" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Esta factura ya no está aceptando pagos" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Enviar cantidad máxima" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Error desconocido." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "No se encontró billetera BCH para transferir estos fondos." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "No se encontró Bitcoin Cash." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Bitcoin Core encontrado:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "No se encontró billetera BTC para transferir estos fondos." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "No se encontró Bitcoin Core." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Falló el escaneado" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Datos no reconocidos." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "No compatible" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet no es compatible." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Abrir en navegador web" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Dirección inválida" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Cantidad no definida" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Cantidad por debajo del mínimo" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Cantidad por encima del límite" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Respuesta inválida de Shapeshift" - diff --git a/i18n/po/fa/template-fa.po b/i18n/po/fa/template-fa.po index d2b460320..148ac9147 100644 --- a/i18n/po/fa/template-fa.po +++ b/i18n/po/fa/template-fa.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Persian\n" "Language: fa\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "شماره حساب" msgid "Instant transactions with low fees" msgstr "معاملات فوری با پرداخت کم" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "موجودی ناکافی" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "تغییر ارز" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "موجودی قابل استفاده" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "استفاده از تمام موجودی در دسترس" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "بعدی" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "حساب ها" @@ -226,20 +206,6 @@ msgstr "تقریبا به پایان رسیدیم! بیا مروری کنیم." msgid "Alternative Currency" msgstr "ارز دوم" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "نمایش قیمت" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "پول اعتباری" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "ارز رمزنگاری شده" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com در حال حاضر در دسترس نمی باشد، خواهشمند است در زمان دیگری امتحان کنید." @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "قادر به ایجاد کیف پول نیست" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "امکان بیش از یک بار پیوستن به یک کیف پول نیست" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "Copayer {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "در کلیپ بورد کپی شد" @@ -1316,7 +1281,6 @@ msgstr "برای اهداف حسابرسی" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "از" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "دریافت اخبار و به روز رسانی از BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "شروع کنید" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "شروع کنید" @@ -2200,10 +2168,6 @@ msgstr "پرداخت رد شد" msgid "Payment Sent" msgstr "پرداخت ارسال شد" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "به اشتراک گذاشتن این معامله" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "پرداخت پذیرفته شده اما هنوز پخش نشده" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "جزئیات پرداخت" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "درخواست پرداخت" #: www/views/mercadoLibreCards.html:22 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "جای گذاری آدرس" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "انتقال بین کیف پول ها" +msgid "Wallet to Wallet Transfer" +msgstr "انتقال پول از کیف پول به کیف پول" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "اسکن کد QR" msgid "Send Bitcoin faster!" msgstr "ارسال سریع تر بیت کوین!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "ارسال سریع تر بیت کوین!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "ذخیره آدرس های اغلب استفاده شده و ارسال بیت کوین به آنها تنها با یک ضربه" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "شما می توانید از هر کیف پول و یا خدمات بیت کوین دریافت کنید." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "برای شروع، شما نیاز دارید که یک کیف پول ایجاد کنید و مقداری بیتکوین تهیه کنید." @@ -2925,14 +2891,9 @@ msgid "Sweep" msgstr "وارد کردن و تغییر آدرس به جدید(sweep)" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "جاروب کردن کیف پول کاغذی" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" -msgstr "جاروب کردن کیف پول کاغذی" +msgid "Sweep paper wallet" +msgstr "وارد کردن والت کاغذی و تغییر آدرس به جدید(sweep)" #: src/js/services/onGoingProcess.js:33 msgid "Sweeping Wallet..." @@ -3100,14 +3061,6 @@ msgstr "این نرم افزار بیتکوین های شما را با بالا msgid "This bitcoin payment request has expired." msgstr "این درخواست پرداخت بیتکوین منقضی شده است." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "زمان انقضای پرداخت:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "درخواست پرداخت منقضی شده است" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "به" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "برای شروع، بیتکوین بخرید و یا آدرس خود را به اشتراک بگذارید. شما می توانید از هر کیف پول یا سرویسی بیتکوین دریافت کنید." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "برای شروع، شما نیاز دارید که یک کیف پول بیت کوین ایجاد کرده و مقداری بیت کوین تهیه کنید." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "برای انجام {{reason}} شما ابتدا باید حساب - {{email}} BitPay خود را اضافه کنید" @@ -3161,26 +3118,6 @@ msgstr "در حال پردازش انتقال به صورت Top Up..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "در حال انتقال {{amountStr}} به صورت Top Up به کارت اعتباری {{cardLastNumber}}" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "راه اندازی ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "تبدیل BTC به BCH خود طرف چند دقیقه." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "برای شروع فرایند باید به موجودی کیف پول خود اضافه کنید." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "فرایند سریع است و شما مقدار ارز تبدیل شده را در کیف پول خود دریافت خواهید کرد." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "این سرویس توسط همکار ما ShapeShift به عنوان یک طرف سوم انجام می شود و هزینه ای اندک برای آن دریافت می کند. قبل از شروع تراکنش هزینه نشان داده می شود." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "کاوش Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Bitcoin Cash Games" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "اشتراک گذاری نرم افزار کیف پول" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "اخبار" @@ -3825,119 +3758,3 @@ msgstr "رایگان Bitcoin Cash" msgid "Your Bitcoin Wallets are ready!" msgstr "کیف پول بیت کوین شما آماده است!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "آدرس شامل اطلاعات ارز نیست. از ارسال ارز صحیح اطمینان حاصل کنید." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "بررسی تراکنش" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "مبلغ ارسالی به وسیله شما" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "مبلغ تبدیل شده" - -#: www/views/review.html:36 -msgid "To:" -msgstr "به:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "اضافه کردن یادداشت شخصی" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "پیشنهاد شده توسط تاجر:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "متن را اینجا وارد کنید" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "یادداشت شخصی:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "کمتر از 1 سنت" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "این صورت حساب دیگر پرداخت ها را نمی پذیرد" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "ارسال حداکثر مقدار" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "خطای ناشناخته." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "هیچ کیف پولی از نوع Bitcoin Cash برای انتقال وجه یافت نشد." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Bitcoin Cash یافت نشد." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Bitcoin Core یافت شده:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "هیچ کیف پولی از نوع Bitcoin Core برای انتقال وجه یافت نشد." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Bitcoin Core یافت نشد." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "اسکن انجام نشد" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "داده ها شناسایی نشد." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "پشتیبانی نشده" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet پشتیبانی نمی شود." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "آدرس" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "باز کردن در مرورگر" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "آدرس نامعتبر" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "مبلغ تعریف نشده است" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "مقدار زیر مقدار حداقل است" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "مقدار بالاتر از حد است" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "پاسخ نامعتبر از Shapeshift" - diff --git a/i18n/po/fr/template-fr.po b/i18n/po/fr/template-fr.po index ba3d98244..d87845d47 100644 --- a/i18n/po/fr/template-fr.po +++ b/i18n/po/fr/template-fr.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: French\n" "Language: fr\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "Numéro de compte" msgid "Instant transactions with low fees" msgstr "Instant transactions with low fees" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Fonds insuffisants" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Changer de devise" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Fonds disponibles" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Utiliser tous les fonds disponibles" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Suivant" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "Comptes" @@ -226,20 +206,6 @@ msgstr "C'est presque terminé ! Vérifions." msgid "Alternative Currency" msgstr "Devise alternative" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Affichage des prix" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Cryptocurrency" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com n’est pas disponible pour le moment. Veuillez réessayer plus tard." @@ -520,8 +486,8 @@ msgid "Cannot Create Wallet" msgstr "Impossible de créer le portefeuille" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" -msgstr "Impossible de joindre le même portefeuille plus d'une fois" +msgid "Cannot join the same wallet more that once" +msgstr "Impossible de rejoindre le même portefeuille plus d'une fois" #: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" @@ -696,7 +662,6 @@ msgstr "Copayeur {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Copié(e) dans le presse-papier" @@ -1316,7 +1281,6 @@ msgstr "À des fins de vérification" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "De" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Obtenir les actualités et mises à jour de BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Commencer" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Commencez" @@ -2200,10 +2168,6 @@ msgstr "Paiement rejeté" msgid "Payment Sent" msgstr "Paiement envoyé" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Partager cette transaction" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Paiement accepté, mais pas encore diffusé" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "Détails du paiement" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "Demande de paiement" #: www/views/mercadoLibreCards.html:22 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Coller l'adresse" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Transfert entre les portefeuilles" +msgid "Wallet to Wallet Transfer" +msgstr "Transfert de portefeuille à portefeuille" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "Numérisez le code QR" msgid "Send Bitcoin faster!" msgstr "Envoyez des Bitcoin plus vite !" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Envoyez des Bitcoin plus vite !" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Enregistrez les adresses fréquemment utilisées et envoyez-leurs des Bitcoins en un seul geste" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Vous pouvez recevoir des Bitcoins de n'importe quel portefeuille ou service." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Pour commencer, vous aurez besoin de créer un portefeuille bitcoin et d'obtenir quelques bitcoins." @@ -2925,14 +2891,9 @@ msgid "Sweep" msgstr "Balayer" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Balayer un portefeuille papier" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" -msgstr "Balayer un portefeuille papier" +msgid "Sweep paper wallet" +msgstr "Balayer un portefeuille de papier" #: src/js/services/onGoingProcess.js:33 msgid "Sweeping Wallet..." @@ -3100,14 +3061,6 @@ msgstr "Cette appli conserve vos bitcoins avec une sécurité de pointe." msgid "This bitcoin payment request has expired." msgstr "Cette demande de paiement bitcoin a expiré." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Expiration du paiement:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "La demande de paiement a expiré" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "À" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Pour commencer, achetez des bitcoins ou partagez votre adresse. Vous pouvez recevoir des bitcoins de n'importe quel portefeuille ou service." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Pour commencer, vous aurez besoin de créer un portefeuille Bitcoin et d'obtenir quelques bitcoins." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "Pour {{reason}} vous devez d'abord ajouter votre compte BitPay - {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Rechargement en cours..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Rechargement de {{amountStr}} vers la carte de débit ({{cardLastNumber}})" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Démarrer ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Changez vos BTC en BCH en quelques minutes." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Pour démarrer, vous devez ajouter des fonds à votre portefeuille." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "Le processus est rapide et vous recevrez le montant changé dans votre portefeuille." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Ce service est fourni par le tiers ShapeShift, qui facturera une somme modique pour le service. Le montant sera affiché avant de démarrer la transaction." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Explorez Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Jeux Bitcoin Cash" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Partager l’application Wallet" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Nouvelles" @@ -3825,119 +3758,3 @@ msgstr "Bitcoin Cash Gratuit" msgid "Your Bitcoin Wallets are ready!" msgstr "Vos portefeuilles bitcoin sont prêts !" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "L'adresse ne contient pas d’informations de devise, assurez-vous que vous envoyez la bonne devise." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Vérifier la transaction" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Vous envoyez" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Vous changez" - -#: www/views/review.html:36 -msgid "To:" -msgstr "À :" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Ajouter une note personnelle" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Suggéré par le marchand :" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Entrez le texte ici" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Note personnelle :" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Moins de 1 centime" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Cette facture n’accepte plus les paiements" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Envoi du montant maximal" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Erreur inconnue." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "Aucun portefeuille Bitcoin Cash auquel transférer des fonds trouvé." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Pas de Bitcoin Cash trouvé." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Bitcoin Core trouvé :" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "Aucun portefeuille Bitcoin Core auquel transférer des fonds trouvé." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Pas de Bitcoin Core trouvé." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Échec de l'analyse" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Données non reconnues." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "Non pris en charge" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet n’est pas pris en charge." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Ouvrir dans le navigateur web" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Adresse invalide" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Le montant n’est pas défini" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Le montant est inférieur au minimum" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Le montant est supérieur à la limite" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Réponse de Shapeshift invalide" - diff --git a/i18n/po/it/template-it.po b/i18n/po/it/template-it.po index 0ea7daa0a..62738bf84 100644 --- a/i18n/po/it/template-it.po +++ b/i18n/po/it/template-it.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Italian\n" "Language: it\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "Numero del Conto" msgid "Instant transactions with low fees" msgstr "Transazioni istantanee con commissioni basse" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Fondi insufficienti" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Cambia valuta" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Fondi disponibili" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Usa tutti i fondi disponibili" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Avanti" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "Account" @@ -226,20 +206,6 @@ msgstr "Quasi finito! Ripassiamo." msgid "Alternative Currency" msgstr "Valuta alternativa" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Visualizzazione prezzi" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Criptovaluta" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Ia tabella dei guadagni di Amazon.com non è disponibile al momento. Per favore riprova piu tardi." @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "Impossibile creare portafoglio" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "Non è possibile aggiungere un portafoglio più di una volta" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "Pagatore {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Copiato negli appunti" @@ -1316,7 +1281,6 @@ msgstr "Per finalità di controllo" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "Da" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Ricevi notizie e aggiornamenti da BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Per iniziare" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Inizia" @@ -2200,10 +2168,6 @@ msgstr "Pagamento Rifiutato" msgid "Payment Sent" msgstr "Pagamento Inviato" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Condividi questa transazione" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Pagamento accettato, ma non ancora inviata alla rete" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "Dettagli pagamento" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "Richiesta di pagamento" #: www/views/mercadoLibreCards.html:22 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Incolla indirizzo" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Trasferisci tra portafogli" +msgid "Wallet to Wallet Transfer" +msgstr "Trasferimento da portafoglio a portafoglio" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "Scansiona codice QR" msgid "Send Bitcoin faster!" msgstr "Invia Bitcoin più velocemente!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Invia Bitcoin più velocemente!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Salva gli indirizzi più utilizzati e invia Bitcoin con un solo tocco" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Puoi ricevere Bitcoin da qualsiasi portafoglio o servizio." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Per iniziare, è necessario che tu crei un portafoglio bitcoin e ottenerne qualcuno." @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "Spazzola" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Spazzare il portafoglio di carta" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "Spazzare il portafoglio di carta" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "Questa app memorizza i tuoi bitcoin con sicurezza all'avanguardia." msgid "This bitcoin payment request has expired." msgstr "Questa richiesta di pagamento in bitcoin è scaduta." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Scadenza del pagamento:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "La richiesta di pagamento è scaduta" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "A" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Per iniziare, acquista bitcoin o condividi il tuo indirizzo. È possibile ricevere bitcoin da qualsiasi servizio o portafoglio." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Per iniziare, devi creare un portafoglio bitcoin e ottenere qualche bitcoin." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "Per {{reason}} è necessario innanzitutto aggiungere il tuo account BitPay - {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Ricarica in corso..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Ricaricare di {{amountStr}} sulla carta di debito ({{cardLastNumber}})" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Avvia ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Cambia i tuoi BTC in BCH in pochi minuti." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Per avviare il processo devi aggiungere fondi al tuo portafoglio." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "Il processo è veloce e riceverai l'importo cambiato nel tuo portafoglio." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Questo servizio è fornito dalla terza parte ShapeShift, che addebiterà una piccola commissione per lo stesso. La commissione sarà mostrata prima di iniziare la transazione." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Esplora Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Giochi Bitcoin Cash" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Condividere l'app Portafoglio" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "News" @@ -3825,119 +3758,3 @@ msgstr "Bitcoin Cash gratis" msgid "Your Bitcoin Wallets are ready!" msgstr "I tuoi portafogli Bitcoin sono pronti!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "L'indirizzo non contiene informazioni sulla valuta. Verifica di inviare la valuta corretta." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Rivedi transazione" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Stai inviando" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Stai spostando" - -#: www/views/review.html:36 -msgid "To:" -msgstr "A:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Aggiungi nota personale" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Suggerito dal commerciante:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Inserisci il testo qui" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Nota personale:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Meno di 1 centesimo" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Questa fattura non accetta più pagamenti" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Inviare importo massimo" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Errore sconosciuto." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "Nessun portafoglio Bitcoin Cash trovato per il trasferimento di fondi." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Nessun Bitcoin Cash trovato." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Bitcoin Core trovato:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "Nessun portafoglio Bitcoin Core trovato per il trasferimento di fondi." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Nessun Bitcoin Core trovato." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Scansione non riuscita" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Dati non riconosciuti." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "Non supportato" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet non supportato." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Aprire nel browser web" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Indirizzo non valido" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Importo non definito" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Importo inferiore al minimo" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Importo sopra il limite" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Risposta non valida da Shapeshift" - diff --git a/i18n/po/ja/template-ja.po b/i18n/po/ja/template-ja.po index 896e8b06c..30668ce9d 100644 --- a/i18n/po/ja/template-ja.po +++ b/i18n/po/ja/template-ja.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Japanese\n" "Language: ja\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "ポケット番号" msgid "Instant transactions with low fees" msgstr "僅かな手数料で即時決済" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "残高不足" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "通貨を変更" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "利用可能な残高" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "利用可能な資金をすべて使用" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "次" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "アカウント一覧" @@ -226,20 +206,6 @@ msgstr "ほぼ完了!確認してみましょう。" msgid "Alternative Currency" msgstr "表示通貨" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "価格表示" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "法定通貨" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "仮想通貨" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com は現在ご利用できません、また後でお試しください" @@ -522,8 +488,8 @@ msgid "Cannot Create Wallet" msgstr "ウォレットを作成できません。" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" -msgstr "同じ端末で同じウォレットに複数回参加することはできません。" +msgid "Cannot join the same wallet more that once" +msgstr "同じ端末で同じウォレットに複数回参加することができません。" #: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" @@ -698,7 +664,6 @@ msgstr "ウォレット参加者 {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "クリップボードにコピーしました" @@ -1318,7 +1283,6 @@ msgstr "監査用機能" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "送信者" @@ -1379,6 +1343,10 @@ msgid "Get news and updates from BitPay" msgstr "BitPay からのニュースや更新情報を受け取ります。" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "始めよう" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "始めよう" @@ -2202,10 +2170,6 @@ msgstr "送金が却下されました" msgid "Payment Sent" msgstr "送金が完了しました" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "このトランザクションを共有" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "取引が承認されましたが、まだ送信していません。" @@ -2223,8 +2187,8 @@ msgid "Payment details" msgstr "支払いの詳細" #: www/views/modals/paypro.html:6 -msgid "Payment Request" -msgstr "支払いを要求する" +msgid "Payment request" +msgstr "支払い請求" #: www/views/mercadoLibreCards.html:22 #: www/views/modals/mercadolibre-card-details.html:39 @@ -2659,7 +2623,7 @@ msgid "Paste Address" msgstr "アドレスをペースト" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" +msgid "Wallet to Wallet Transfer" msgstr "ウォレット間送金" #: www/views/tab-send.html:35 @@ -2670,6 +2634,10 @@ msgstr "QRコードを読み取る" msgid "Send Bitcoin faster!" msgstr "ビットコイン送金をより高速に！" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "ビットコイン送金をより高速に！" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "よく使うアドレスを保存すればワンタップでビットコインを送金できます" @@ -2691,8 +2659,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "どのウォレットやサービスからでもビットコインを受け取ることができます。" #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "はじめに、ビットコインウォレットを作成し、ビットコインを入手する必要があります。" @@ -2929,13 +2895,8 @@ msgid "Sweep" msgstr "全残高インポート" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "ペーパーウォレットの全残高インポート" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "ペーパーウォレットの全残高インポート" #: src/js/services/onGoingProcess.js:33 @@ -3106,14 +3067,6 @@ msgstr "このアプリは、最先端のセキュリティであなたのビッ msgid "This bitcoin payment request has expired." msgstr "ビットコインペイメントの請求期限が切れています。" -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "支払い請求の有効期限:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "支払い要求の期限が切れています" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3155,6 +3108,10 @@ msgstr "宛先" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "はじめるには、ビットコインを購入したり、アドレスを他の人に共有したりしましょう。どのビットコインウォレットやサービスから受け取れます。" +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "はじめに、ビットコインウォレットを作成し、ビットコインを入手する必要があります。" + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "{{reason}}：その前にBitPayアカウントを追加する必要があります - {{email}}" @@ -3167,26 +3124,6 @@ msgstr "残高補充処理中..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "デビットカード ({{cardLastNumber}}) に {{amountStr}} の入金を行う" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "ShapeShiftを開始" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "数分でBTCをBCHに変換できます。" - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "処理を開始するには、資金をウォレットに追加する必要があります。" - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "処理は高速で、交換した金額がウォレットに届きます。" - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "このサービスは、少額のサービス手数料を請求する第三者組織である ShapeShift によって提供されています。手数料は取引を開始する前に表示されます。" - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3803,10 +3740,6 @@ msgstr "Bitcoin.com を参照" msgid "Bitcoin Cash Games" msgstr "Bitcoin Cash ゲーム" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "ウォレットアプリを共有" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "ニュース" @@ -3831,119 +3764,3 @@ msgstr "無料 Bitcoin Cash" msgid "Your Bitcoin Wallets are ready!" msgstr "ビットコインウォレットが完成しました！" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "アドレスに通貨情報が含まれていません。正しい通貨を送金していることを確認してください。" - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "トランザクションの確認" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "送金中: " - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "取引中: " - -#: www/views/review.html:36 -msgid "To:" -msgstr "宛先:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "個人用メモを追加" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "お店からのおすすめ:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "ここにテキストを入力してください" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "個人用メモ:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "１セント以下" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "この請求書はもう支払を受け付けていません" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "全残高を送金" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "不明なエラーです。" - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "資金を送金できるビットコインキャッシュウォレットが見つかりません。" - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "ビットコインキャッシュが見つかりません。" - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "ビットコインが見つかりました:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "資金を送金できるビットコインウォレットが見つかりません。" - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "ビットコインが見つかりません。" - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "スキャンできませんでした" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "データが認識されていません。" - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "未対応" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet には対応していません。" - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "ウェブブラウザで開く" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "無効なアドレス" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "金額が定義されていません" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "金額が最少額を下回っています" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "金額が上限を超えています" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Shapeshift から無効な応答がありました" - diff --git a/i18n/po/ko/template-ko.po b/i18n/po/ko/template-ko.po index 490acef30..6285496ae 100644 --- a/i18n/po/ko/template-ko.po +++ b/i18n/po/ko/template-ko.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Korean\n" "Language: ko\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "계정 번호" msgid "Instant transactions with low fees" msgstr "낮은 수수료로 빠른 송금을" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "펀드 부족" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "통화 변경" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "보유 펀드" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "전체 펀드 사용" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "다음" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "계정들" @@ -226,20 +206,6 @@ msgstr "거의 끝났습니다! 복습해보도록 하겠습니다." msgid "Alternative Currency" msgstr "알트 코인" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "가격 표시" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "법정 화폐" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "가상 화폐" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "아마존에 접속할 수 없습니다. 다시 시도해주세요." @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "지갑을 생성할 수 없습니다" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "같은 지갑에 한 번 이상 접속할 수 없습니다" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "공동지불인 {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "클립보드에 복사 완료" @@ -1316,7 +1281,6 @@ msgstr "계좌 검토 용도" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "출처" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "BitPay에서 최신 소식을 받아보세요" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "시작하기" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "시작하기" @@ -2200,10 +2168,6 @@ msgstr "송금 거부" msgid "Payment Sent" msgstr "송금 완료" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "거래 공유" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "송금을 수락했으나 아직 브로드캐스트되지 않았습니다" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "결제 디테일" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "결제 요구" #: www/views/mercadoLibreCards.html:22 @@ -2657,7 +2621,7 @@ msgid "Paste Address" msgstr "주소 붙여넣기" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" +msgid "Wallet to Wallet Transfer" msgstr "지갑 간 전송" #: www/views/tab-send.html:35 @@ -2668,6 +2632,10 @@ msgstr "QR 코드 스캔" msgid "Send Bitcoin faster!" msgstr "비트코인 속성 전송!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "비트코인 속성 전송!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "자주 사용하는 주소를 저장하고 한 번의 탭으로 저장된 주소에 비트코인 전송" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "지갑 또는 서비스에서 비트코인을 받을 수 있습니다." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "시작하시기 위해선 비트코인 지갑을 생성하시거나 비트코인을 구매하세요." @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "스윕하기" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "종이 지갑 스윕하기" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "종이 지갑 스윕하기" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "이 앱은 귀하의 비트코인을 최첨단 보안 서비스로 보 msgid "This bitcoin payment request has expired." msgstr "비트코인 결제 요구가 만료되었습니다." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "송금 만료:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "결제 요청 만료" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "보내는 대상" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "시작하시려면 비트코인을 구매하시거나 주소를 등록해주세요. 어디에서든 비트코인을 받을 수 있습니다." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "시작하려면 비트코인 지갑을 만들고 비트코인을 구매하십시오." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "{{reason}}하기 위해선 BitPay 계정 - {{email}}을 먼저 추가하셔야 합니다." @@ -3161,26 +3118,6 @@ msgstr "추가 지불(Top up) 진행 중..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "체크 카드 ({{cardLastNumber}})에 {{amountStr}} 추가 지불(Top up)하기" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "ShapeShift 시작" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "BTC를 몇 분 내에 BCH로 교환" - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "과정을 시작하려면 월릿에 펀드를 적립해야 합니다." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "과정은 빠르며 월릿에 교환 금액이 전송됩니다." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "제3자 회사 Shapeshift는 소액의 수수료를 받고 서비스를 제공합니다. 수수료 금액은 거래 시작 전에 표시됩니다." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Bitcoin.com 탐색" msgid "Bitcoin Cash Games" msgstr "BCH 게임" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "지갑 응용 프로그램 공유" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "소식" @@ -3825,119 +3758,3 @@ msgstr "무료 BCH" msgid "Your Bitcoin Wallets are ready!" msgstr "비트코인 지갑이 완료되었습니다!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "주소는 통화 정보를 포함하지 않으므로, 전송 금액을 확인해야 합니다." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "거래 확인" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "전송" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "전환" - -#: www/views/review.html:36 -msgid "To:" -msgstr "대상:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "개인 메모 작성" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "회사/업소 제안:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "텍스트 입력" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "개인 메모:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "1센트 미만" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "이 청구서는 더 이상 결제를 수락하지 않습니다" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "최대 수량 보내는 중" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "알 수 없는 오류가 발생 했습니다." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "자금 찾을 없습니다 Bitcoin Cash 현금 지갑." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "찾을 수 없습니다 Bitcoin Cash 현금." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Bitcoin Core 코어 발견:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "자금 찾을 없습니다 Bitcoin Core 현금 지갑." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "찾을 수 없습니다 Bitcoin Core 현금." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "검색 실패" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "데이터 인식 되지입니다." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "지원 되지 않는" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet는 지원 되지 않습니다." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "웹 브라우저에서 열기" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "주소 오류" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "금액은 정의 되지 않은" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Minimun 아래 금액은" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "제한 위에 금액은" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "변신에서 잘못 된 응답" - diff --git a/i18n/po/nl/template-nl.po b/i18n/po/nl/template-nl.po index a42a1b370..b66d0b892 100644 --- a/i18n/po/nl/template-nl.po +++ b/i18n/po/nl/template-nl.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Dutch\n" "Language: nl\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -79,27 +79,7 @@ msgstr "Account Nummer" #: www/views/tab-home.html:61 msgid "Instant transactions with low fees" -msgstr "Onmiddellijke transacties met lage kosten" - -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Onvoldoende saldo" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Verander valuta" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Beschikbaar saldo" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Alle beschikbare saldo gebruiken" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Volgende" +msgstr "Directe transacties tegen lage kosten" #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" @@ -179,7 +159,7 @@ msgstr "Adresboek" #: www/views/preferencesInformation.html:41 msgid "Address Type" -msgstr "Adrestype" +msgstr "Adres Type" #: www/views/addresses.html:64 msgid "Addresses With Balance" @@ -203,11 +183,11 @@ msgstr "Alle Adressen" #: www/views/modals/wallet-balance.html:18 msgid "All of your bitcoin wallet balance may not be available for immediate spending." -msgstr "Mogelijk is niet het volledige saldo van je Bitcoin portemonnee direct beschikbaar voor uitgaven." +msgstr "Mogelijk is niet het volledige saldo van uw bitcoin portemonnee direct beschikbaar voor uitgaven." #: www/views/tab-receive.html:25 msgid "All signing devices must be added to this multisig wallet before bitcoin addresses can be created." -msgstr "Alle ondertekenende apparaten moeten worden toegevoegd aan deze portemonnee met meervoudige ondertekening, alvorens Bitcoin adressen kunnen worden aangemaakt." +msgstr "Alle ondertekenende apparaten moeten worden toegevoegd aan deze meervoudige-ondertekening portemonnee voordat bitcoin adressen kunnen worden aangemaakt." #: www/views/tab-scan.html:21 msgid "Allow Camera Access" @@ -219,30 +199,16 @@ msgstr "Meldingen toestaan" #: www/views/onboarding/disclaimer.html:14 msgid "Almost done! Let's review." -msgstr "Bijna klaar! Kijk alles nog eens na." +msgstr "Bijna klaar! Nog eens nakijken." #: www/views/preferencesAltCurrency.html:4 #: www/views/tab-settings.html:79 msgid "Alternative Currency" msgstr "Alternatieve Valuta" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Prijsaanduiding" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Cryptovaluta" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." -msgstr "Amazon.com is op dit moment niet beschikbaar. Probeer het later nog eens." +msgstr "Amazon.com is niet beschikbaar op dit moment. Probeer het later nog eens." #: www/views/amount.html:44 #: www/views/customAmount.html:34 @@ -264,15 +230,15 @@ msgstr "Bedrag te laag om te besteden" #: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." -msgstr "Er is een update voor deze app beschikbaar. Update naar de nieuwste versie voor je eigen veiligheid." +msgstr "Er is een update voor deze app beschikbaar. Update a.u.b. naar de nieuwste versie voor uw veiligheid." #: www/views/backupWarning.html:14 msgid "Anyone with your backup phrase can access or spend your bitcoin." -msgstr "Iedereen die je herstelzin weet, heeft toegang tot je Bitcoin en kan deze uitgeven." +msgstr "Iemand die uw herstel zin weet heeft toegang tot uw bitcoin en kan deze uitgeven." #: www/views/addresses.html:94 msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" -msgstr "Geschatte transactiekosten van het Bitcoin netwerk, voor het overmaken van het saldo van je portemonnee. (met normale prioriteit)" +msgstr "Geschatte Bitcoin netwerk transactiekosten voor overdracht van volledige saldo van portemonnee (met normale prioriteit)" #: www/views/backupWarning.html:10 msgid "Are you being watched?" @@ -280,40 +246,40 @@ msgstr "Kijkt er iemand mee?" #: src/js/controllers/preferencesExternal.js:15 msgid "Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin." -msgstr "Kijkt er iemand mee? Iedereen die je herstelzin weet, heeft toegang tot je Bitcoin en kan deze uitgeven." +msgstr "Kijkt er iemand mee? Iedereen die uw herstel zin weet heeft toegang tot uw bitcoin en kan het uitgeven." #: src/js/controllers/copayers.js:56 msgid "Are you sure you want to cancel and delete this wallet?" -msgstr "Weet je zeker dat je wilt annuleren en deze portemonnee verwijderen?" +msgstr "Weet u zeker dat u wilt annuleren en deze portemonnee verwijderen?" #: src/js/controllers/addressbookView.js:37 msgid "Are you sure you want to delete this contact?" -msgstr "Weet je zeker dat je deze contactpersoon wilt verwijderen?" +msgstr "Weet u zeker dat u deze contactpersoon wilt verwijderen?" #: src/js/controllers/preferencesDelete.js:25 msgid "Are you sure you want to delete this wallet?" -msgstr "Weet je zeker dat je deze portemonnee wilt verwijderen?" +msgstr "Weet u zeker dat u deze portemonnee wilt verwijderen?" #: src/js/controllers/modals/txpDetails.js:154 msgid "Are you sure you want to reject this transaction?" -msgstr "Weet je zeker dat je deze transactie wilt afwijzen?" +msgstr "Weet u zeker dat u deze transactie wilt afwijzen?" #: src/js/controllers/modals/txpDetails.js:171 msgid "Are you sure you want to remove this transaction?" -msgstr "Weet je zeker dat je deze transactie wil verwijderen?" +msgstr "Weet u zeker dat u deze transactie wilt verwijderen?" #: src/js/controllers/onboarding/backupRequest.js:23 msgid "Are you sure you want to skip it?" -msgstr "Weet je zeker dat je dit wil overslaan?" +msgstr "Weet u zeker dat u dit wilt overslaan?" #: www/views/modals/bitpay-card-confirmation.html:4 msgid "Are you sure you would like to log out of your BitPay Card account?" -msgstr "Weet je zeker dat je wilt uitloggen uit je BitPay Kaart account?" +msgstr "Weet u zeker dat u wilt uitloggen uit uw BitPay Kaart account?" #: src/js/controllers/preferencesBitpayCard.js:7 #: src/js/controllers/preferencesBitpayServices.js:20 msgid "Are you sure you would like to remove your BitPay Card ({{lastFourDigits}}) from this device?" -msgstr "Weet je zeker dat je de BitPay Kaart ({{lastFourDigits}}) van dit apparaat wilt verwijderen?" +msgstr "Weet u zeker dat u de BitPay Kaart ({{lastFourDigits}}) van dit apparaat wilt verwijderen?" #: www/views/includes/walletInfo.html:10 msgid "Auditable" @@ -349,11 +315,11 @@ msgstr "Back-up" #: www/views/includes/backupNeededPopup.html:7 msgid "Backup Needed" -msgstr "Back-up Nodig" +msgstr "Backup Nodig" #: src/js/controllers/lockSetup.js:87 msgid "Backup all livenet wallets before using this function" -msgstr "Maak een back-up van alle livenet portemonnees voordat je deze functie gebruikt" +msgstr "Maak een backup van alle livenet portemonnees voordat u deze functie gebruikt" #: src/js/controllers/cashScan.js:64 #: www/views/includes/walletListSettings.html:12 @@ -363,16 +329,16 @@ msgstr "Backup nodig" #: www/views/includes/backupNeededPopup.html:9 msgid "Backup now" -msgstr "Back-up maken" +msgstr "Backup maken" #: www/views/onboarding/backupRequest.html:11 #: www/views/tab-export-file.html:89 msgid "Backup wallet" -msgstr "Back-up van portemonnee maken" +msgstr "Backup van portemonnee maken" #: src/js/controllers/lockSetup.js:84 msgid "Backup your wallet before using this function" -msgstr "Maak een back-up van je portemonnee alvorens je deze functie gebruikt" +msgstr "Maak een backup van uw portemonnee voordat u deze functie gebruikt" #: src/js/services/profileService.js:446 msgid "Bad wallet invitation" @@ -384,7 +350,7 @@ msgstr "Saldo Per Adres" #: www/views/includes/confirmBackupPopup.html:7 msgid "Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recovered without it." -msgstr "Zorg dat je de herstelzin op een veilige plek bewaard. Als je deze app verwijderd, kan je saldo niet meer hersteld worden zonder deze herstelzin." +msgstr "Zorg dat u de herstel zin op een veilige plek bewaard. Als deze app verwijderd is, kan uw saldo niet meer worden hersteld zonder de herstel zin." #: www/views/preferencesBitpayServices.html:9 msgid "BitPay Visa® Cards" @@ -520,8 +486,8 @@ msgid "Cannot Create Wallet" msgstr "Kan Portemonnee Niet Aanmaken" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" -msgstr "Je kan niet meerdere keren tegelijk aan een portemonnee deelnemen" +msgid "Cannot join the same wallet more that once" +msgstr "Kan niet meerdere keren tegelijk deelnemen aan een portemonnee" #: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" @@ -537,11 +503,11 @@ msgstr "Controleer de installatie en probeer het opnieuw." #: www/views/tab-import-file.html:4 msgid "Choose a backup file from your computer" -msgstr "Kies een backup bestand op je computer" +msgstr "Kies een backup bestand op uw computer" #: www/views/modals/wallets.html:9 msgid "Choose your destination wallet" -msgstr "Kies je bestemming portemonnee" +msgstr "Kies uw doel portemonnee" #: www/views/modals/wallets.html:10 msgid "Choose your source wallet" @@ -623,11 +589,11 @@ msgstr "Bevestig aankoop" #: www/views/modals/pin.html:10 msgid "Confirm your PIN" -msgstr "Bevestig je PIN" +msgstr "Bevestig uw PIN" #: src/js/services/walletService.js:1033 msgid "Confirm your new spending password" -msgstr "Bevestig je nieuwe wachtwoord om te spenderen" +msgstr "Bevestig uw nieuwe bestedingswachtwoord" #: www/views/tx-details.html:98 msgid "Confirmations" @@ -660,7 +626,7 @@ msgstr "Contactpersonen" #: www/views/tab-send.html:86 msgid "Saved frequently used addresses" -msgstr "Veelgebruikte adressen" +msgstr "Opgeslagen veelgebruikte adressen" #: www/views/onboarding/notifications.html:9 msgid "Continue" @@ -696,7 +662,6 @@ msgstr "Copayer {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Gekopieerd naar klembord" @@ -769,7 +734,7 @@ msgstr "Kon niet worden gemaakt: Ongeldige portemonnee herstel zin" #: src/js/controllers/import.js:114 msgid "Could not decrypt file, check your password" -msgstr "Het bestand kon niet worden ontsleutelt, controleer je wachtwoord" +msgstr "Kon bestand niet ontsleutelen, check uw wachtwoord" #: src/js/controllers/modals/txpDetails.js:181 msgid "Could not delete payment proposal" @@ -975,7 +940,7 @@ msgstr "Privé sleutel niet bijvoegen" #: www/views/preferencesLanguage.html:21 msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." -msgstr "Zie je je eigen taal niet op Crowdin? Neem contact op met de Eigenaar op Crowdin! We willen graag jouw taal ondersteunen." +msgstr "Ziet u uw taal niet op Crowdin? Neem contact op met de Eigenaar op Crowdin! We willen graag uw taal ondersteunen." #: www/views/tab-export-file.html:59 #: www/views/tab-home.html:22 @@ -992,7 +957,7 @@ msgstr "Portemonnee dupliceren..." #: www/views/addresses.html:19 msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment." -msgstr "Elke Bitcoin portemonnee kan miljarden adressen genereren vanuit je back-up bestaande uit 12 woorden. Elke keer dat je een betaling ontvangt wordt automatisch een nieuw adres gegenereerd en getoond." +msgstr "Elke bitcoin portemonnee kan miljarden adressen genereren vanuit uw backup bestaand uit 12 woorden. Elke keer dat u een betaling ontvangt wordt automatisch een nieuw adres gegenereerd en getoond." #: src/js/services/feeService.js:13 msgid "Economy" @@ -1021,7 +986,7 @@ msgstr "Aanmaken en gebruiken van Bitcoin Cash portemonnees inschakelen binnen d #: www/views/tab-scan.html:19 msgid "Enable camera access in your device settings to get started." -msgstr "Schakel camera toegang in vanuit je apparaatinstellingen om aan de slag te gaan." +msgstr "Schakel camera toegang in vanuit uw apparaat instellingen om aan de slag te gaan." #: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" @@ -1072,11 +1037,11 @@ msgstr "Vul de herstel zin in (BIP39)" #: www/views/onboarding/collectEmail.html:13 msgid "Enter your email" -msgstr "Vul je e-mailadres in" +msgstr "Vul uw email in" #: www/views/backup.html:69 msgid "Enter your password" -msgstr "Voer je wachtwoord in" +msgstr "Voer uw wachtwoord in" #. Trying to import a malformed wallet export QR code #: src/js/controllers/activity.js:45 @@ -1316,7 +1281,6 @@ msgstr "Voor audit doeleinden" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "Van" @@ -1377,13 +1341,17 @@ msgid "Get news and updates from BitPay" msgstr "Ontvang nieuws en updates van BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Aan de slag" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Aan de slag" #: www/views/addressbook.html:20 msgid "Get started by adding your first one." -msgstr "Ga aan de slag door je eerste contact toe te voegen." +msgstr "Ga aan de slag door uw eerste toe te voegen." #: src/js/services/onGoingProcess.js:23 msgid "Getting fee levels..." @@ -1492,7 +1460,7 @@ msgstr "Start" #: src/js/controllers/feedback/send.js:65 #: src/js/controllers/feedback/send.js:69 msgid "How could we improve your experience?" -msgstr "Hoe zouden wij jouw ervaring kunnen verbeteren?" +msgstr "Hoe zouden wij uw ervaring kunnen verbeteren?" #: www/views/feedback/rateCard.html:3 msgid "How do you like {{appName}}?" @@ -1555,7 +1523,7 @@ msgstr "Indien ingeschakeld, zullen portemonnees ook onbevestigd saldo proberen #: src/js/controllers/onboarding/backupRequest.js:18 msgid "If this device is replaced or this app is deleted, neither you nor BitPay can recover your funds without a backup." -msgstr "Als dit apparaat wordt vervangen of deze app wordt verwijderd, kunnen jij of BitPay je saldo niet herstellen zonder back-up." +msgstr "Als dit apparaat wordt vervangen of deze app wordt verwijderd, kunnen u noch BitPay uw saldo herstellen zonder backup." #: www/views/feedback/complete.html:23 msgid "If you have additional feedback, please let us know by tapping the \"Send feedback\" option in the Settings tab." @@ -1563,7 +1531,7 @@ msgstr "Als u meer feedback heeft, laat het ons dan weten via de \"Geef feedback #: www/views/includes/screenshotWarningModal.html:8 msgid "If you take a screenshot, your backup may be viewed by other apps. You can make a safe backup with physical paper and a pen." -msgstr "Als je een screenshot neemt kunnen andere apps jouw back-up zien. Je kunt het beste een veilige back-up maken op pen en papier." +msgstr "Als u een screenshot neemt kunnen andere apps uw backup zien. U kunt een veilige backup maken met fysieke pen en papier." #: www/views/tab-import-hardware.html:42 #: www/views/tab-import-phrase.html:80 @@ -1588,7 +1556,7 @@ msgstr "Portemonnee importeren..." #: www/views/backup.html:72 msgid "In order to verify your wallet backup, please type your password." -msgstr "Vul je wachtwoord in om de back-up van je portemonnee te verifiëren." +msgstr "Vul uw wachtwoord in om de backup van uw portemonnee te verifiëren." #: www/views/mercadoLibreCards.html:24 #: www/views/modals/mercadolibre-card-details.html:29 @@ -1692,7 +1660,7 @@ msgstr "Het is aan te raden adressen niet te hergebruiken - dit beschermt uw pri #: src/js/controllers/backup.js:76 msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again." -msgstr "Het is van belang je back-up zin correct op te schrijven. Als er iets gebeurt met je portemonnee, heeft u deze back-up zin nodig om toegang tot uw geld te herstellen. Controleer je back-up zin en probeer het nogmaals." +msgstr "Het is van belang uw backup zin correct op te schrijven. Als er iets gebeurt met uw portemonnee, heeft u deze backup nodig om toegang tot uw geld te herstellen. Controleer uw backup en probeer het nogmaals." #: www/views/join.html:151 msgid "Join" @@ -1700,7 +1668,7 @@ msgstr "Deelnemen" #: src/js/controllers/copayers.js:85 msgid "Join my {{appName}} Wallet. Here is the invitation code: {{secret}} You can download {{appName}} for your phone or desktop at {{appUrl}}" -msgstr "Neem deel aan mijn {{appName}} Portemonnee. Hier is de uitnodigingscode: {{secret}} Je kunt {{appName}} voor je telefoon of desktop hier downloaden {{appUrl}}" +msgstr "Neem deel aan mijn {{appName}} Portemonnee. Hier is de uitnodigingscode: {{secret}} U kunt {{appName}} voor uw telefoon of desktop hier downloaden {{appUrl}}" #: www/views/add.html:30 #: www/views/join.html:5 @@ -1737,7 +1705,7 @@ msgstr "Meer informatie" #: www/views/backup.html:43 msgid "Let's verify your backup phrase." -msgstr "Laten we uw back-up zin verifiëren." +msgstr "Laten we de backup zin verifiëren." #: www/views/addresses.html:45 #: www/views/allAddresses.html:14 @@ -2026,11 +1994,11 @@ msgstr "Geef mij een melding wanneer transacties zijn bevestigd" #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." -msgstr "Dit is een goed moment om een back-up van de portemonnee te maken. Als dit apparaat kwijt raakt is het onmogelijk om toegang tot je saldo te krijgen zonder een back-up." +msgstr "Dit is een goed moment om een backup van de portemonnee te maken. Als dit apparaat kwijt raakt is het onmogelijk om toegang tot uw saldo te krijgen zonder een backup." #: www/views/backupWarning.html:11 msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" -msgstr "Dit is het juiste moment om je omgeving te bekijken. Ramen in de buurt? Verborgen camera's? Kijkt er iemand met je mee over je schouder?" +msgstr "Dit is het juiste moment om uw omgeving te bekijken. Ramen in de buurt? Verborgen camera's? Kijkt er iemand mee over uw schouder?" #: src/js/controllers/buyAmazon.js:312 #: src/js/controllers/topup.js:286 @@ -2064,7 +2032,7 @@ msgstr "OK" #: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." -msgstr "Op dit scherm zie je al je portemonnees, accounts en eigendommen." +msgstr "Op dit scherm ziet u al uw portemonnees, accounts en eigendommen." #: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/cashScan.js:19 @@ -2137,7 +2105,7 @@ msgstr "Wachtwoord" #: src/js/controllers/import.js:98 msgid "Password required. Make sure to enter your password in advanced options" -msgstr "Wachtwoord vereist. Vul je wachtwoord in bij de geavanceerde opties" +msgstr "Wachtwoord vereist. Vul uw wachtwoord in bij de geavanceerde opties" #: www/views/join.html:33 msgid "Paste invitation here" @@ -2200,10 +2168,6 @@ msgstr "Betaling Afgewezen" msgid "Payment Sent" msgstr "Betaling Verzonden" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Deel deze transactie" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Betaling geaccepteerd, maar nog niet verzonden" @@ -2221,8 +2185,8 @@ msgid "Payment details" msgstr "Details Betaling" #: www/views/modals/paypro.html:6 -msgid "Payment Request" -msgstr "Betaalverzoek" +msgid "Payment request" +msgstr "Betalingsverzoek" #: www/views/mercadoLibreCards.html:22 #: www/views/modals/mercadolibre-card-details.html:39 @@ -2260,7 +2224,7 @@ msgstr "Vul de herstel zin van de portemonnee in" #: www/views/modals/pin.html:9 msgid "Please enter your PIN" -msgstr "Vul je PIN in" +msgstr "Vul uw PIN in" #: www/views/backup.html:53 msgid "Please tap each word in the correct order." @@ -2277,7 +2241,7 @@ msgstr "Een moment geduld a.u.b." #: src/js/controllers/import.js:238 msgid "Please, select your backup file" -msgstr "Selecteer je back-upbestand" +msgstr "Selecteer uw backup bestand" #: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" @@ -2473,7 +2437,7 @@ msgstr "BitPay Kaart verwijderen?" #: src/js/controllers/preferencesBitpayServices.js:8 msgid "Removing your BitPay account will remove all associated BitPay account data from this device. Are you sure you would like to remove your BitPay Account ({{email}}) from this device?" -msgstr "Het verwijderen van je BitPay account zal alle geassocieerde BitPay accountgegevens van dit apparaat verwijderen. Weet je zeker dat u de BitPay Account ({{email}}) van dit apparaat wil verwijderen?" +msgstr "Het verwijderen van uw BitPay account zal alle geassocieerde BitPay accountgegevens van dit apparaat verwijderen. Weet u zeker dat u de BitPay Account ({{email}}) van dit apparaat wilt verwijderen?" #: www/views/join.html:116 #: www/views/join.html:124 @@ -2548,11 +2512,11 @@ msgstr "Scan nogmaals" #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" -msgstr "Scan je vingerafdruk a.u.b." +msgstr "Scan uw vingerafdruk" #: www/views/preferencesCash.html:23 msgid "Scan your wallets for Bitcoin Cash" -msgstr "Scan je portemonnees voor Bitcoin Cash" +msgstr "Scannen naar Bitcoin Cash in uw portemonnees" #: src/js/services/onGoingProcess.js:30 msgid "Scanning Wallet funds..." @@ -2580,7 +2544,7 @@ msgstr "Klembord" #: src/js/controllers/tab-send.js:29 msgid "Your Clipboard is empty" -msgstr "Je klembord is leeg" +msgstr "Uw klembord is leeg" #: www/views/modals/search.html:16 msgid "Search transactions" @@ -2588,7 +2552,7 @@ msgstr "Doorzoek transacties" #: www/views/preferencesAltCurrency.html:14 msgid "Search your currency" -msgstr "Zoek je valuta" +msgstr "Zoek uw valuta" #: www/views/preferences.html:30 msgid "Security" @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Adres plakken" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Overdracht tussen portemonnees" +msgid "Wallet to Wallet Transfer" +msgstr "Portemonnee overdracht" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,17 +2632,21 @@ msgstr "Scan QR-code" msgid "Send Bitcoin faster!" msgstr "Stuur Bitcoin sneller!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Stuur Bitcoin sneller!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Sla veelgebruikte adressen op en verstuur ze Bitcoin met een druk op de knop" #: www/views/tab-send.html:55 msgid "Add your first contact" -msgstr "Je eerste contact toevoegen" +msgstr "Uw eerste contact toevoegen" #: www/views/tab-send.html:65 msgid "Your Bitcoin wallet is empty" -msgstr "Je Bitcoin portemonnee is leeg" +msgstr "Uw Bitcoin portemonnee is leeg" #: www/views/tab-send.html:69 msgid "To get started, buy Bitcoin Cash (BCH) or Bitcoin Core (BTC), or share your address." @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "U kunt Bitcoin ontvangen van elke portemonnee of dienst." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Om aan de slag te gaan zult u een bitcoin portemonnee moeten aanmaken en wat bitcoin moeten verkrijgen." @@ -2739,7 +2705,7 @@ msgstr "Transactie verzenden" #: src/js/controllers/confirm.js:545 msgid "Sending {{amountStr}} from your {{name}} wallet" -msgstr "Verzenden van {{amountStr}} vanuit je portemonnee '{{name}}'" +msgstr "Verzenden van {{amountStr}} vanuit uw {{name}} portemonnee" #: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 @@ -2779,7 +2745,7 @@ msgstr "Stel wachtwoord in" #: src/js/controllers/preferencesFee.js:85 msgid "Set your own fee in satoshis/byte" -msgstr "Kies je eigen transactiekosten in satoshi/byte" +msgstr "Kies uw eigen transactiekosten in satoshi/byte" #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 @@ -2925,14 +2891,9 @@ msgid "Sweep" msgstr "Saldo opnemen" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Paper wallet leeghalen" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" -msgstr "Paper wallet leeghalen" +msgid "Sweep paper wallet" +msgstr "Saldo papieren portemonnee opnemen" #: src/js/services/onGoingProcess.js:33 msgid "Sweeping Wallet..." @@ -2944,7 +2905,7 @@ msgstr "DEZE ACTIE IS ONOMKEERBAAR" #: www/views/onboarding/welcome.html:5 msgid "Take control of your money,
get started with bitcoin." -msgstr "Neem de controle over je geld,
aan de slag met Bitcoin." +msgstr "Neem controle over uw geld,
aan de slag met bitcoin." #: www/views/walletDetails.html:132 #: www/views/walletDetails.html:52 @@ -2992,7 +2953,7 @@ msgstr "Bedankt!" #: src/js/controllers/feedback/send.js:73 msgid "That's exciting to hear. We'd love to earn that fifth star from you – how could we improve your experience?" -msgstr "Dat is goed om te horen. Wij zouden graag die vijfde ster verdienen - hoe kunnen wij jouw ervaring verbeteren?" +msgstr "Dat is goed om te horen. Wij zouden graag die vijfde ster verdienen - hoe kunnen wij uw ervaring verbeteren?" #: src/js/services/ledger.js:152 msgid "The Ledger Chrome application is not installed" @@ -3004,7 +2965,7 @@ msgstr "De hoeveelheid bitcoin die direct te besteden is vanuit deze portemonnee #: www/views/modals/wallet-balance.html:93 msgid "The amount of bitcoin stored in this wallet that is allocated as inputs to your pending transaction proposals. The amount is determined using unspent transaction outputs associated with this wallet and may be more than the actual amounts associated with your pending transaction proposals." -msgstr "De hoeveelheid Bitcoin opgeslagen in deze portemonnee, die is toegewezen als invoer voor uw wachtende betalingsvoorstellen. De hoeveelheid is bepaald, door te kijken naar ongebruikte transactie uitvoer geassocieerd met deze portemonnee en kan meer zijn dan de daadwerkelijke hoeveelheid geassocieerd met de wachtende betalingsvoorstellen." +msgstr "De hoeveelheid bitcoin opgeslagen in deze portemonnee die is toegewezen als invoer voor uw wachtende betalingsvoorstellen. De hoeveelheid is bepaald door te kijken naar ongebruikte transactie uitvoer geassocieerd met deze portemonnee en kan meer zijn dan de daadwerkelijke hoeveelheid geassocieerd met de wachtende betalingsvoorstellen." #: www/views/modals/wallet-balance.html:74 msgid "The amount of bitcoin stored in this wallet with less than 1 blockchain confirmation." @@ -3024,7 +2985,7 @@ msgstr "Des te hoger de betaalde transactiekosten, des te meer reden een miner h #: www/views/addresses.html:51 msgid "The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab." -msgstr "Het maximum aantal opeenvolgende ongebruikte adressen (20) is bereikt. Wanneer een van je ongebruikte adressen een betaling ontvangt zal een nieuw adres gegenereerd en weergegeven worden in het tabblad Ontvangen." +msgstr "Het maximum aantal opeenvolgende ongebruikte adressen (20) is bereikt. Wanneer een van uw ongebruikte adressen een betaling ontvangt zal een nieuw adres worden gegenereerd en worden getoond in het tabblad Ontvangen." #: src/js/controllers/onboarding/terms.js:21 msgid "The official English Terms of Service are available on the BitPay website." @@ -3094,25 +3055,17 @@ msgstr "Deze app is fantastisch!" #: www/views/onboarding/tour.html:47 msgid "This app stores your bitcoin with cutting-edge security." -msgstr "Deze app bewaart uw Bitcoin met de nieuwste beveiliging." +msgstr "Deze app bewaart uw bitcoin met de nieuwste beveiliging." #: src/js/controllers/confirm.js:523 msgid "This bitcoin payment request has expired." msgstr "Dit bitcoin betalingsverzoek is verlopen." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Betaling verloopt:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "Betalingsverzoek is verlopen" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds." -msgstr "Dit wachtwoord kan niet worden achterhaald. Als het wachtwoord verloren gaat, dan is er geen mogelijkheid om toegang tot jouw saldo te herstellen." +msgstr "Dit wachtwoord kan niet worden achterhaald. Als het wachtwoord verloren gaat is er geen mogelijkheid om toegang tot uw saldo te herstellen." #: www/views/backup.html:31 msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." @@ -3147,11 +3100,15 @@ msgstr "Naar" #: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." -msgstr "Om aan de slag te gaan, koop je Bitcoin of deel je je adres. Je kunt Bitcoin ontvangen van elke portemonnee of dienst." +msgstr "Om aan de slag te gaan, koop bitcoin of deel uw adres. U kunt bitcoin ontvangen van elke portemonnee of dienst." + +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Om aan de slag te gaan, zult u een Bitcoin-portemonnee aan moeten maken en wat Bitcoin moeten verkrijgen." #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" -msgstr "Om {{reason}} zult je eerst uw BitPay account moeten toevoegen - {{email}}" +msgstr "Om {{reason}} zult u eerst uw BitPay account moeten toevoegen - {{email}}" #: src/js/services/onGoingProcess.js:48 msgid "Top up in progress..." @@ -3161,26 +3118,6 @@ msgstr "Bezig met opladen..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Vul debet kaart ({{cardLastNumber}}) aan met {{amountStr}}" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "ShapeShift starten" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Binnen enkele minuten je BTC omwisselen naar BCH." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Om het proces te starten moet je eerst bitcoin in je portemonnee hebben staan." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "Het proces is snel en je ontvangt het uitgewisselde bedrag direct in je portemonnee." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Deze dienst wordt aangeboden door de partij ShapeShift, die zal een kleine vergoeding voor de service rekenen. Deze vergoeding wordt getoond voordat je de transactie start." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3315,7 +3252,7 @@ msgstr "Herstel zin valideren..." #: www/views/modals/fingerprintCheck.html:4 msgid "Verify your identity" -msgstr "Verifieër je identiteit" +msgstr "Verifieer uw identiteit" #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 @@ -3512,7 +3449,7 @@ msgstr "Portemonnee niet geregistreerd" #: src/js/services/bwcError.js:29 msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase" -msgstr "Portemonnee niet geregistreerd bij de wallet service. Maak deze opnieuw aan vanuit \"Portemonnee Aanmaken\" en maak gebruik van \"Geavanceerde Opties\" om je herstelzin in te voeren" +msgstr "Portemonnee niet geregistreerd bij de wallet service. Maak deze opnieuw aan vanuit \"Portemonnee Aanmaken\" en maak gebruik van \"Geavanceerde Opties\" om uw herstel zin in te voeren" #: www/views/backup.html:12 msgid "Wallet recovery phrase not available" @@ -3557,7 +3494,7 @@ msgstr "Wij zoeken altijd naar manieren om {{appName}} te verbeteren." #: src/js/controllers/feedback/send.js:83 msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" -msgstr "Wij zoeken altijd naar manieren om {{appName}} te verbeteren. Hoe kunnen wij jouw ervaring verbeteren?" +msgstr "Wij zoeken altijd naar manieren om {{appName}} te verbeteren. Hoe kunnen wij uw ervaring verbeteren?" #: www/views/includes/incomingDataMenu.html:6 msgid "Website" @@ -3609,7 +3546,7 @@ msgstr "Ja, overslaan" #: src/js/controllers/onboarding/backupRequest.js:24 msgid "You can create a backup later from your wallet settings." -msgstr "Je kunt later een back-up maken vanuit uw portemonnee instellingen." +msgstr "U kunt later een backup maken vanuit uw portemonnee instellingen." #: src/js/controllers/preferencesLanguage.js:12 msgid "You can make contributions by signing up on our Crowdin community translation website. We’re looking forward to hearing from you!" @@ -3637,7 +3574,7 @@ msgstr "U kunt het inwisselen voor valuta's zoals de Amerikaanse Dollar, de Euro #: www/views/onboarding/tour.html:46 msgid "You control your bitcoin." -msgstr "Jij hebt de controle over jouw Bitcoin." +msgstr "U heeft de controle over uw bitcoin." #: www/views/modals/chooseFeeLevel.html:64 msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." @@ -3645,65 +3582,65 @@ msgstr "Het is af te raden transactiekosten te kiezen hoger dan {{maxFeeRecommen #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." -msgstr "Je zult opnieuw moeten inloggen om je BitPay Kaart op te laden." +msgstr "U zult opnieuw moeten inloggen om uw BitPay Kaart op te laden." #: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." -msgstr "U zult e-mail meldingen ontvangen over verzonden en ontvangen betalingen van jouw portemonnee." +msgstr "U zult email meldingen ontvangen over verzonden en ontvangen betalingen van uw portemonnee." #: www/views/bitpayCard.html:50 msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." -msgstr "Je BitPay Kaart is gereed. Voeg saldo toe aan je kaart om deze te kunnen gebruiken in winkels en pinautomaten over de hele wereld." +msgstr "Uw BitPay Kaart is gereed. Voeg saldo toe aan uw kaart om deze te kunnen gebruiken in winkels en pinautomaten over de hele wereld." #: www/views/mercadoLibre.html:57 #: www/views/mercadoLibreCards.html:6 msgid "Your Gift Cards" -msgstr "Je Cadeaubonnen" +msgstr "Uw Cadeaubonnen" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" -msgstr "Er is een backup gemaakt van je Bitcoin portemonnee!" +msgstr "Er is een backup gemaakt van uw bitcoin portemonnee!" #: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" -msgstr "Je Bitcoin portemonnee is gereed!" +msgstr "Uw bitcoin portemonnee is gereed!" #: www/views/modals/chooseFeeLevel.html:61 msgid "Your fee is lower than recommended." -msgstr "Je gekozen transactiekosten zijn lager dan aangeraden." +msgstr "Uw gekozen transactiekosten zijn lager dan aangeraden." #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" -msgstr "Je ideeën, feedback of opmerkingen" +msgstr "Uw ideeën, feedback of opmerkingen" #: www/views/tab-create-shared.html:22 msgid "Your name" -msgstr "Je naam" +msgstr "Uw naam" #: www/views/join.html:16 msgid "Your nickname" -msgstr "Je bijnaam" +msgstr "Uw bijnaam" #: www/views/tab-export-file.html:11 #: www/views/tab-import-file.html:20 msgid "Your password" -msgstr "Je wachtwoord" +msgstr "Uw wachtwoord" #: www/views/buyAmazon.html:102 msgid "Your purchase could not be completed" -msgstr "Je aankoop kon niet worden voltooid" +msgstr "Uw aankoop kon niet worden voltooid" #: www/views/buyAmazon.html:105 msgid "Your purchase was added to the list of pending" -msgstr "Je aankoop is op de in-behandeling lijst gezet" +msgstr "Uw aankoop is op de in-behandeling lijst gezet" #: www/views/onboarding/backupRequest.html:10 msgid "Your wallet is never saved to cloud storage or standard device backups." -msgstr "Je portemonnee wordt nooit opgeslagen in de cloud of in standaard apparaat back-ups." +msgstr "Uw portemonnee wordt nooit opgeslagen in de cloud of in standaard apparaat backups." #: src/js/services/walletService.js:1030 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." -msgstr "Je privésleutel wordt versleuteld. Het wachtwoord voor besteden kan niet worden achterhaald, schrijf deze zorgvuldig op." +msgstr "Uw privé sleutel wordt versleuteld. Het Bestedingswachtwoord kan niet worden achterhaald, schrijf deze zorgvuldig op." #: www/views/includes/walletList.html:13 #: www/views/includes/walletSelector.html:21 @@ -3721,7 +3658,7 @@ msgstr "[Saldo Scannen]" #: src/js/controllers/bitpayCardIntro.js:11 msgid "add your BitPay Visa card(s)" -msgstr "voeg je BitPay Visa kaart(en) toe" +msgstr "voeg uw BitPay Visa kaart(en) toe" #: www/views/includes/available-balance.html:8 msgid "locked by pending payments" @@ -3779,7 +3716,7 @@ msgstr "Shapeshift" #: www/views/includes/community.html:3 msgid "Community" -msgstr "Gemeenschap" +msgstr "Community" #: src/js/services/communityService.js:40 msgid "Bitcoin Cash Reddit" @@ -3797,10 +3734,6 @@ msgstr "Bitcoin.com verkennen" msgid "Bitcoin Cash Games" msgstr "Bitcoin Cash spellen" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Wallet app delen" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Nieuws" @@ -3823,121 +3756,5 @@ msgstr "Gratis Bitcoin Cash" #: www/views/tab-home.html:30 msgid "Your Bitcoin Wallets are ready!" -msgstr "Je Bitcoin portemonnee is gereed!" - -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "Adres bevat geen valutagegevens, zorg ervoor dat je de correcte valuta verzendt." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Controleer transactie" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Je verzendt" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Je shift" - -#: www/views/review.html:36 -msgid "To:" -msgstr "Naar:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Persoonlijke opmerking toevoegen" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Voorgesteld door derde partij:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Voer hier tekst in" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Persoonlijke opmerking:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Minder dan 1 cent" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Deze factuur accepteert geen betalingen meer" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Alles versturen" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Onbekende fout." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "Geen Bitcoin Cash portemonnee gevonden om bedrag naartoe over te maken." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Geen Bitcoin Cash gevonden." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Bitcoin Core gevonden:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "Geen Bitcoin Core portemonnee gevonden om waarde naartoe te versturen." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Geen Bitcoin Core gevonden." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Scannen mislukt" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Gegevens niet herkend." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "Niet ondersteund" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet wordt niet ondersteund." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Open in webbrowser" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Ongeldig adres" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Bedrag is niet gespecificeerd" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Bedrag lager is dan het minimum" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Bedrag is boven het limiet" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Ongeldig respons van Shapeshift" +msgstr "Uw bitcoin portemonnee is gereed!" diff --git a/i18n/po/pl/template-pl.po b/i18n/po/pl/template-pl.po index 63e8e47ee..ef9888ca5 100644 --- a/i18n/po/pl/template-pl.po +++ b/i18n/po/pl/template-pl.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Polish\n" "Language: pl\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "Numer konta" msgid "Instant transactions with low fees" msgstr "Natychmiastowe transakcje z niskimi prowizjami" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Niewystarczające środki" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Zmień walutę" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Dostępne środki" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Użyj wszystkich dostępnych środków" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Dalej" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "Konta" @@ -226,20 +206,6 @@ msgstr "Prawie gotowe! Dokonajmy przeglądu." msgid "Alternative Currency" msgstr "Alternatywna waluta" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Wyświetlanie ceny" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Kryptowaluta" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com jest aktualnie niedostępny. Spróbuj później." @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "Nie można utworzyć portfela" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "Nie można dołączyć tego samego portfela więcej niż raz" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "Współwłaściciele {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Skopiowano do schowka" @@ -1316,7 +1281,6 @@ msgstr "Do celów audytu" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "Z" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Otrzymywanie wiadomości i aktualizacji z BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Pierwsze kroki" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Zacznij" @@ -2200,10 +2168,6 @@ msgstr "Wypłata odrzucona" msgid "Payment Sent" msgstr "Płatność wysłana" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Udostępnij tę transakcję" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Wypłata zaakceptowana, ale jeszcze nie nadana" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "Szczegóły wypłaty" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "Wniosek o płatność" #: www/views/mercadoLibreCards.html:22 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Wklej adres" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Transfer między portfelami" +msgid "Wallet to Wallet Transfer" +msgstr "Transfer z portfela do portfela" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "Zeskanuj kod QR" msgid "Send Bitcoin faster!" msgstr "Przesyłaj Bitcoiny szybciej!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Przesyłaj Bitcoiny szybciej!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Zapisz często używane adresy i wyślij im Bitcoin za pomocą jednego dotknięcia" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Bitcoiny można odbierać z dowolnego portfela lub usługi." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Aby rozpocząć należy utworzyć portfel i dostać trochę bitcoinów." @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "Opróżnij" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Wyczyść papierowy portfel" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "Wyczyść papierowy portfel" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "Ta aplikacja przechowuje Twoje bitcoiny z zaawansowanymi zabezpieczeniam msgid "This bitcoin payment request has expired." msgstr "Ten wniosek płatności wygasł." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Płatność wygasa:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "Wniosek o płatność wygasł" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "Do" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Aby zacząć, kup bitcoiny lub udostępnij swój adres. Możesz otrzymać bitcoiny z dowolnego portfela lub usługi." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Aby rozpocząć należy utworzyć portfel i dostać trochę bitcoinów." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "Aby móc wykonać czynność {{reason}}, musisz przedtem dodać swoje konto BitPay – {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Doładowanie w trakcie..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Doładuj o {{amountStr}} kartę debetową ({{cardLastNumber}})" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Rozpocznij ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Wymień BTC na BCH w ciągu paru chwil." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Aby zacząć, dodaj środki do portfela." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "Proces jest szybki, a użytkownik otrzyma wymienione środki do portfela." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Ta usługa jest świadczona przez podmiot zewnętrzny ShapeShift, który naliczy za nią niewielką opłatę. Będzie ona widoczna przed rozpoczęciem transakcji." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Poznaj Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Gry Bitcoin Cash" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Udostępnij aplikację Portfel" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Aktualności" @@ -3825,119 +3758,3 @@ msgstr "Darmowa Bitcoin Cash" msgid "Your Bitcoin Wallets are ready!" msgstr "Twoje portfele Bitcoin są gotowe!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "Adres nie zawiera informacji o walucie; upewnij się, że przesyłasz odpowiednią walutę." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Potwierdzenie transakcji" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Przesyłasz" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Przelewasz" - -#: www/views/review.html:36 -msgid "To:" -msgstr "Do:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Dodaj notatkę osobistą" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Sugestia handlowca:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Wprowadź tekst tutaj" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Notatka osobista:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Mniej niż 1 cent" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Nie można już opłacić tej faktury" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Wyślij maksymalną kwotę" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Nieznany błąd." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "Nie znaleziono portfela Bitcoin Cash do przekazania środków." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Nie znaleziono Bitcoin Cash." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Znaleziono Bitcoin Core:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "Nie znaleziono portfela Bitcoin Core do przekazania środków." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Nie znaleziono Bitcoin Core." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Skanowanie nie powiodło się" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Nie rozpoznano danych." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "Nieobsługiwane" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Sieć testowa nie jest obsługiwana." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "Adres URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Otwórz w przeglądarce internetowej" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Nieprawidłowy adres" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Kwota nie jest określona" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Kwota niższa od minimalnej" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Kwota przekracza limit" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Nieprawidłowa odpowiedź z Shapeshift" - diff --git a/i18n/po/pt-BR/template-pt-BR.po b/i18n/po/pt-BR/template-pt-BR.po index 7d15602e7..6879b52c4 100644 --- a/i18n/po/pt-BR/template-pt-BR.po +++ b/i18n/po/pt-BR/template-pt-BR.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "Número de conta" msgid "Instant transactions with low fees" msgstr "Transações instantâneas com taxas baixas" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Fundos insuficientes" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Alterar moeda" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Fundos disponíveis" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Usar todos os fundos disponíveis" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Próximo" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "Contas" @@ -226,20 +206,6 @@ msgstr "Quase pronto! Vamos rever." msgid "Alternative Currency" msgstr "Moeda Alternativa" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Exibição de preço" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Criptomoeda" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com não está disponível neste momento. Por favor, tente mais tarde." @@ -520,8 +486,8 @@ msgid "Cannot Create Wallet" msgstr "Não é possível criar a carteira" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" -msgstr "Não pode juntar-se à mesma carteira mais que uma vez" +msgid "Cannot join the same wallet more that once" +msgstr "Não pode juntar-se a mesma carteira mais que uma vez" #: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" @@ -696,7 +662,6 @@ msgstr "Copayer {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Copiado para a área de transferência" @@ -1316,7 +1281,6 @@ msgstr "Para fins de auditoria" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "De" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Receba notícias e atualizações da BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Começar" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Começar" @@ -1623,7 +1591,7 @@ msgstr "Endereço de rede incorreto" #: src/js/controllers/confirm.js:306 #: src/js/services/bwcError.js:44 msgid "Insufficient confirmed funds" -msgstr "Insuficiência de fundos confirmada" +msgstr "Insuficiência de fundos confirmados" #: src/js/controllers/topup.js:165 #: src/js/controllers/topup.js:177 @@ -2090,7 +2058,7 @@ msgstr "Abrir Projeto no GitHub" #: src/js/controllers/bitpayCard.js:123 #: src/js/controllers/tx-details.js:192 msgid "Open Explorer" -msgstr "Abrir o Explorer" +msgstr "Abra o Explorer" #: www/views/tab-scan.html:22 msgid "Open Settings" @@ -2200,10 +2168,6 @@ msgstr "Pagamento Rejeitado" msgid "Payment Sent" msgstr "Pagamento Enviado" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Compartilhar esta transação" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Pagamento aceito, mas ainda não publicado" @@ -2221,8 +2185,8 @@ msgid "Payment details" msgstr "Detalhes do pagamento" #: www/views/modals/paypro.html:6 -msgid "Payment Request" -msgstr "Solicitação de pagamento" +msgid "Payment request" +msgstr "Pedido de pagamento" #: www/views/mercadoLibreCards.html:22 #: www/views/modals/mercadolibre-card-details.html:39 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Colar endereço" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Transferência entre carteiras" +msgid "Wallet to Wallet Transfer" +msgstr "Transferência de carteira para carteira" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "Digitalizar o código QR" msgid "Send Bitcoin faster!" msgstr "Envie Bitcoin mais rápido!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Envie Bitcoin mais rápido!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Salvar endereços usados com frequência e enviar Bitcoin com apenas um toque" @@ -2689,14 +2657,12 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Você pode receber bitcoin de qualquer carteira ou serviço." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Para começar, você precisa criar uma carteira de bitcoins e obter alguns bitcoins." #: www/views/tab-send.html:74 msgid "Buy Bitcoin now" -msgstr "Comprar Bitcoin agora" +msgstr "Compre Bitcoin agora" #: www/views/tab-send.html:76 msgid "Show my address" @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "Limpar" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Varrer a carteira de papel" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "Varrer a carteira de papel" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "Este aplicativo armazena seu bitcoin com segurança de ponta." msgid "This bitcoin payment request has expired." msgstr "Este bitcoin pagamento pedido expirou." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Pagamento expira em:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "Pedido de pagamento expirou" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "Para" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Para começar, compre bitcoins ou compartilhe seu endereço. Você pode receber bitcoins de qualquer carteira ou serviço." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Para começar, você precisará criar uma carteira e obter algum bitcoin." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "Para {{reason}} você deve primeiro adicionar sua conta BitPay - {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Recarga em andamento..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Recarga de {{amountStr}} para cartão de débito ({{cardLastNumber}})" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Iniciar ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Troque seu BTC para BCH em minutos." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Para iniciar o processo, você precisa adicionar fundos à sua carteira." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "O processo é rápido e você receberá a quantia convertida na sua carteira." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Este serviço é fornecido pela terceira ShapeShift, que cobrará uma pequena taxa pelo serviço. A taxa será exibida antes de você iniciar a transação." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Explore Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Jogos Bitcoin Cash" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Compartilhar o app de carteira" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Notícias" @@ -3825,119 +3758,3 @@ msgstr "Bitcoin Cash grátis" msgid "Your Bitcoin Wallets are ready!" msgstr "As suas carteiras de Bitcoin estão prontas!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "O endereço não contém informações de moeda. Certifique-se de que está enviando a moeda correta." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Revisar transação" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Você está enviando" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Você está trocando" - -#: www/views/review.html:36 -msgid "To:" -msgstr "Para:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Adicionar nota pessoal" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Sugerido pelo comerciante:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Insira o texto aqui" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Nota pessoal:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Menos de 1 centavo" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "Essa fatura não aceita mais pagamentos" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Enviar montante máximo" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Erro desconhecido." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "Nenhuma carteira de Bitcoin Cash para transferir fundos encontrada." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Bitcoin Cash não encontrado." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Bitcoin Core encontrado:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "Nenhuma carteira de Bitcoin Core para transferir fundos encontrada." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Nenhum Bitcoin Core encontrado." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Falha de verificação" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Dados não reconhecidos." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "Não suportado" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet não suportado." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Abrir no navegador da Web" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Endereço inválido" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Montante não definido" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Montante abaixo do mínimo" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Montante acima do limite" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Resposta inválida do Shapeshift" - diff --git a/i18n/po/ru/template-ru.po b/i18n/po/ru/template-ru.po index cb4ec3a36..a9d5d2970 100644 --- a/i18n/po/ru/template-ru.po +++ b/i18n/po/ru/template-ru.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Russian\n" "Language: ru\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "Номер учётной записи" msgid "Instant transactions with low fees" msgstr "Мгновенные транзакции с низкой комиссией" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Недостаточно средств" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Изменить валюту" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Доступные средства" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Использовать все доступные средства" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Далее" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "Аккаунты" @@ -226,20 +206,6 @@ msgstr "Почти готово! Давайте проверим." msgid "Alternative Currency" msgstr "Альтернативная валюта" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Отображение цен" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Фиатная валюта" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Криптовалюта" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Сайт Amazon.com сейчас недоступен. Попробуйте позже." @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "Не удаётся создать кошелёк" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "Нельзя присоединиться к одному и тому же кошельку более одного раза" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "Совладелец {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "Скопировано в буфер обмена" @@ -1316,7 +1281,6 @@ msgstr "Для целей ревизии" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "От" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "Получать письма с новостями от BitPay" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "Начать" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "Начать" @@ -2200,10 +2168,6 @@ msgstr "Платёж отклонён" msgid "Payment Sent" msgstr "Платёж отправлен" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Поделиться транзакцией" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "Платёж принят, но пока не отправлен" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "Детали платежа" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "Запрос платежа" #: www/views/mercadoLibreCards.html:22 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "Вставить адрес" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Перевод между кошельками" +msgid "Wallet to Wallet Transfer" +msgstr "Перевод с кошелька на кошелек" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "Сканировать QR код" msgid "Send Bitcoin faster!" msgstr "Отправляйте биткойны еще быстрее!" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "Отправляйте биткойны еще быстрее!" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "Сохраняйте часто используемые адреса кошельков и отправляйте на них биткойны одним нажатием" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "Вы можете получать биткойны с любого кошелька или сервиса." #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "Чтобы начать работу, вам нужно создать кошелёк и получить биткойн." @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "Считать" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "Пополнить с бумажного кошелька" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "Пополнить с бумажного кошелька" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "Это приложение хранит биткойны с высоч msgid "This bitcoin payment request has expired." msgstr "Срок этого запроса платежа истёк." -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Срок платежа:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "Срок запроса на платеж истёк" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "Кому" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "Чтобы начать работу, купите биткойн или поделитесь вашим адресом. Вы можете получать биткойны из любого кошелька или сервиса." +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "Чтобы начать работу, вам нужно создать кошелёк и получить биткойн." + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "{{reason}}: сначала нужно добавить учетную запись BitPay — {{email}}" @@ -3161,26 +3118,6 @@ msgstr "Выполняется пополнение..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "Пополнить дебетовую карту ({{cardLastNumber}}) на {{amountStr}}" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Начать обмен ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Обмен BTC на BCH за пару минут." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "Для начала нужно добавить средства в кошелёк." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "Обмен происходит быстро. Итоговая сумма поступит вам в кошелёк." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "Услуга предоставляется сторонней компанией ShapeShift, которая взимает небольшую комиссию. Комиссия будет показана перед началом транзакции." - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "Обзор Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Игры Bitcoin Cash" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "Поделиться программой «Кошелёк»" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "Новости" @@ -3825,119 +3758,3 @@ msgstr "Bitcoin Cash бесплатно" msgid "Your Bitcoin Wallets are ready!" msgstr "Ваши кошельки готовы!" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "Адрес не содержит сведений о валюте. Проверьте, правильную ли валюту вы отправляете." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Проверка транзакции" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "Вы отправляете" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "Вы меняете" - -#: www/views/review.html:36 -msgid "To:" -msgstr "Куда:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Добавить личное сообщение" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Предложено продавцом:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Вводите текст сюда" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Личное сообщение:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "менее 1 копейки" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "По этому инвойсу платежи больше не принимаются" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "Отправить максимальную сумму" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "Неизвестная ошибка." - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "Не найден кошелек Bitcoin Cash для перевода средств." - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "Не найден Bitcoin Cash." - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "Найден Bitcoin Core:" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "Не найден кошелек Bitcoin Core для перевода средств." - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "Не найден Bitcoin Core." - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "Ошибка сканирования" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "Данные не распознаны." - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "Не поддерживается" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "Testnet не поддерживается." - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "URL-адрес" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "Открыть в веб-браузере" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "Неверный адрес" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "Сумма не задана" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "Сумма ниже минимума" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "Сумма больше ограничения" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Неправильный ответ от Shapeshift" - diff --git a/i18n/po/sv-SE/template-sv-SE.po b/i18n/po/sv-SE/template-sv-SE.po index b80fca04b..7ffdda946 100644 --- a/i18n/po/sv-SE/template-sv-SE.po +++ b/i18n/po/sv-SE/template-sv-SE.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Swedish\n" "Language: sv\n" -"PO-Revision-Date: 2018-09-06 16:45\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -41,7 +41,7 @@ msgstr "Fem stjärnor hjälper oss att göra {{appName}} bättre och mer åtkoml #: www/views/mercadoLibre.html:18 #: www/views/mercadoLibre.html:40 msgid "Only redeemable on Mercado Livre (Brazil)" -msgstr "Only redeemable on Mercado Livre (Brazil)" +msgstr "" #: src/js/controllers/feedback/send.js:27 #: www/views/feedback/complete.html:21 @@ -79,27 +79,7 @@ msgstr "Kontonummer" #: www/views/tab-home.html:61 msgid "Instant transactions with low fees" -msgstr "Direkta transaktioner med låga avgifter" - -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Otillräckliga medel" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Ändra valuta" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Tillgängliga medel" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Använd alla tillgängliga medel" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Nästa" +msgstr "" #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" @@ -219,27 +199,13 @@ msgstr "Tillåt notificationer" #: www/views/onboarding/disclaimer.html:14 msgid "Almost done! Let's review." -msgstr "Nästan klart! Låt oss granska." +msgstr "" #: www/views/preferencesAltCurrency.html:4 #: www/views/tab-settings.html:79 msgid "Alternative Currency" msgstr "Alternativ Valuta" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Kryptovaluta" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "Amazon.com är inte tillgängligt för tillfället. Försök igen senare." @@ -393,7 +359,7 @@ msgstr "" #: www/views/addressbook.add.html:38 #: www/views/includes/incomingDataMenu.html:29 msgid "Bitcoin Address" -msgstr "Bitcoin-adress" +msgstr "" #: www/views/cashScan.html:4 msgid "Bitcoin Cash (BCH) Balances" @@ -426,7 +392,7 @@ msgstr "" #: www/views/onboarding/tour.html:31 msgid "Bitcoin is a currency." -msgstr "Bitcoin är en valuta." +msgstr "" #: www/views/onboarding/disclaimer.html:15 msgid "Bitcoin is different – it cannot be safely held with a bank or web service." @@ -446,7 +412,7 @@ msgstr "" #: www/views/modals/txp-details.html:36 msgid "Broadcast Payment" -msgstr "Sänd betalning" +msgstr "" #: src/js/controllers/modals/txpDetails.js:64 #: src/js/controllers/tx-details.js:81 @@ -455,16 +421,16 @@ msgstr "" #: src/js/services/onGoingProcess.js:11 msgid "Broadcasting transaction" -msgstr "Sänder transaktion" +msgstr "" #: www/views/unsupported.html:6 msgid "Browser unsupported" -msgstr "Webbläsaren stöds inte" +msgstr "" #: www/views/buyAmazon.html:5 #: www/views/buyMercadoLibre.html:6 msgid "Buy" -msgstr "Köp" +msgstr "" #: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" @@ -473,16 +439,16 @@ msgstr "" #: www/views/tab-send.html:35 #: src/js/services/buyAndSellService.js:26 msgid "Buy Bitcoin" -msgstr "Köp Bitcoin" +msgstr "" #: www/views/mercadoLibre.html:22 #: www/views/mercadoLibre.html:50 msgid "Buy a Gift Card" -msgstr "Köp ett presentkort" +msgstr "" #: src/js/controllers/buyAmazon.js:334 msgid "Buy from" -msgstr "Köp från" +msgstr "" #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." @@ -490,7 +456,7 @@ msgstr "" #: src/js/services/onGoingProcess.js:12 msgid "Calculating fee" -msgstr "Beräknar avgift" +msgstr "" #: src/js/controllers/buyAmazon.js:313 #: src/js/controllers/buyMercadoLibre.js:307 @@ -509,35 +475,35 @@ msgstr "Beräknar avgift" #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" -msgstr "Avbryt" +msgstr "" #: www/views/copayers.html:36 msgid "Cancel invitation" -msgstr "Avbryt inbjudan" +msgstr "" #: src/js/controllers/onboarding/tour.js:52 msgid "Cannot Create Wallet" -msgstr "Kan inte skapa plånbok" +msgstr "" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "" #: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" -msgstr "Kort" +msgstr "" #: www/views/modals/paypro.html:30 msgid "Certified by" -msgstr "Certifierad av" +msgstr "" #: www/views/preferencesExternal.html:19 msgid "Check installation and retry." -msgstr "Kontrollera installationen och försök igen." +msgstr "" #: www/views/tab-import-file.html:4 msgid "Choose a backup file from your computer" -msgstr "Välj en backup-fil från din dator" +msgstr "" #: www/views/modals/wallets.html:9 msgid "Choose your destination wallet" @@ -696,7 +662,6 @@ msgstr "" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "" @@ -1316,7 +1281,6 @@ msgstr "" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "" @@ -2200,10 +2168,6 @@ msgstr "" msgid "Payment Sent" msgstr "" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "" @@ -2221,7 +2185,7 @@ msgid "Payment details" msgstr "" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "" #: www/views/mercadoLibreCards.html:22 @@ -2657,7 +2621,7 @@ msgid "Paste Address" msgstr "" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" +msgid "Wallet to Wallet Transfer" msgstr "" #: www/views/tab-send.html:35 @@ -2668,6 +2632,10 @@ msgstr "" msgid "Send Bitcoin faster!" msgstr "" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "" #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "" @@ -2925,13 +2891,8 @@ msgid "Sweep" msgstr "" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "" #: src/js/services/onGoingProcess.js:33 @@ -3100,14 +3061,6 @@ msgstr "" msgid "This bitcoin payment request has expired." msgstr "" -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "" +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "" + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "" @@ -3161,26 +3118,6 @@ msgstr "" msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "" - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "" - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "" - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "" - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "" msgid "Bitcoin Cash Games" msgstr "" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "" @@ -3825,119 +3758,3 @@ msgstr "" msgid "Your Bitcoin Wallets are ready!" msgstr "" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "" - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "" - -#: www/views/review.html:36 -msgid "To:" -msgstr "" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "" - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "" - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "" - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "" - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "" - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "" - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "" - diff --git a/i18n/po/template.pot b/i18n/po/template.pot index 2b1068ad4..a23e5dbae 100644 --- a/i18n/po/template.pot +++ b/i18n/po/template.pot @@ -72,26 +72,6 @@ msgstr "" msgid "Instant transactions with low fees" msgstr "" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "" @@ -217,20 +197,6 @@ msgstr "" msgid "Alternative Currency" msgstr "" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "" @@ -462,7 +428,6 @@ msgid "Buy & Sell Bitcoin" msgstr "" #: www/views/tab-send.html:35 -#: src/js/services/buyAndSellService.js:26 msgid "Buy Bitcoin" msgstr "" @@ -511,7 +476,7 @@ msgid "Cannot Create Wallet" msgstr "" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "" #: www/views/includes/bitpayCardsCard.html:2 @@ -687,7 +652,6 @@ msgstr "" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "" @@ -1307,7 +1271,6 @@ msgstr "" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "" @@ -1368,6 +1331,10 @@ msgid "Get news and updates from BitPay" msgstr "" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "" @@ -2191,10 +2158,6 @@ msgstr "" msgid "Payment Sent" msgstr "" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "" @@ -2212,7 +2175,7 @@ msgid "Payment details" msgstr "" #: www/views/modals/paypro.html:6 -msgid "Payment Request" +msgid "Payment request" msgstr "" #: www/views/mercadoLibreCards.html:22 @@ -2648,7 +2611,7 @@ msgid "Paste Address" msgstr "" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" +msgid "Wallet to Wallet Transfer" msgstr "" #: www/views/tab-send.html:35 @@ -2659,6 +2622,10 @@ msgstr "" msgid "Send Bitcoin faster!" msgstr "" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "" @@ -2680,8 +2647,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "" #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "" @@ -2916,13 +2881,8 @@ msgid "Sweep" msgstr "" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" +msgid "Sweep paper wallet" msgstr "" #: src/js/services/onGoingProcess.js:33 @@ -3091,14 +3051,6 @@ msgstr "" msgid "This bitcoin payment request has expired." msgstr "" -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3140,6 +3092,10 @@ msgstr "" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "" +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "" + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "" @@ -3152,26 +3108,6 @@ msgstr "" msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "" - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "" - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "" - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "" - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3763,171 +3699,3 @@ msgstr "" #: www/views/includes/walletInfo.html:18 msgid "{{wallet.m}}-of-{{wallet.n}}" msgstr "" - -#: src/js/services/shapeshiftService.js:8 -msgid "Shapeshift" -msgstr "" - -#: www/views/includes/community.html:3 -msgid "Community" -msgstr "" - -#: src/js/services/communityService.js:40 -msgid "Bitcoin Cash Reddit" -msgstr "" - -#: src/js/services/communityService.js:47 -msgid "Bitcoin.com Twitter" -msgstr "" - -#: www/views/includes/nextSteps.html:3 -msgid "Explore Bitcoin.com" -msgstr "" - -#: src/js/services/bitcoincomService.js:21 -msgid "Bitcoin Cash Games" -msgstr "" - -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "" - -#: src/js/services/bitcoincomService.js:28 -msgid "News" -msgstr "" - -#: src/js/services/bitcoincomService.js:35 -msgid "Mining Pool" -msgstr "" - -#: src/js/services/bitcoincomService.js:42 -msgid "Tools" -msgstr "" - -#: src/js/services/bitcoincomService.js:49 -msgid "Bitcoin Price Charts" -msgstr "" - -#: src/js/services/bitcoincomService.js:56 -msgid "Free Bitcoin Cash" -msgstr "" - -#: www/views/tab-home.html:30 -msgid "Your Bitcoin Wallets are ready!" -msgstr "" - -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "" - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "" - -#: www/views/review.html:36 -msgid "To:" -msgstr "" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "" - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "" - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "" - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "" - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "" - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "" - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "" \ No newline at end of file diff --git a/i18n/po/vi/template-vi.po b/i18n/po/vi/template-vi.po index 29e62e498..ef9db2029 100644 --- a/i18n/po/vi/template-vi.po +++ b/i18n/po/vi/template-vi.po @@ -11,11 +11,11 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Vietnamese\n" "Language: vi\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:44\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" -msgstr "(Đáng tin cậy)" +msgstr "(Tin cậy)" #: www/views/includes/txp.html:23 #: www/views/includes/walletHistory.html:64 @@ -36,7 +36,7 @@ msgstr "{{tx.feeRateStr}} của giao dịch" #: www/views/feedback/rateApp.html:7 msgid "5-star ratings help us get {{appName}} into more hands, and more users means more resources can be committed to the app!" -msgstr "{{appName}} 5-star ratings help us get {{appName}} into more hands, and more users means more resources can be committed to the app!" +msgstr "Xếp hạng 5 sao giúp chúng tôi để {{appName}} đến tay nhiều người dùng hơn và đồng nghĩa với việc nhiều nguồn tài nguyên hơn có thể được cung cấp trong ứng dụng!" #: www/views/mercadoLibre.html:18 #: www/views/mercadoLibre.html:40 @@ -56,8 +56,8 @@ msgstr "A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size all #: src/js/controllers/confirm.js:395 msgid "A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided." -msgstr "{{amountBelowFeeStr}} Tổng cộng {{amountBelowFeeStr}} đã bị loại trừ. Số tiền này đến từ UTXOs nhỏ hơn chi phí mạng cung cấp.#\n" -"1." +msgstr "Tổng cộng {{amountBelowFeeStr}} đã bị loại trừ. Số tiền này đến từ UTXOs nhỏ hơn chi phí mạng cung cấp.#\n" +"1" #: src/js/controllers/preferencesAbout.js:6 #: www/views/tab-settings.html:156 @@ -67,7 +67,7 @@ msgstr "About" #: src/js/controllers/modals/txpDetails.js:62 #: src/js/controllers/tx-details.js:79 msgid "Accepted" -msgstr "Chấp nhận" +msgstr "Accepted" #: www/views/preferencesInformation.html:72 msgid "Account" @@ -78,31 +78,11 @@ msgstr "Account" #: www/views/tab-create-shared.html:74 #: www/views/tab-import-hardware.html:19 msgid "Account Number" -msgstr "Account Number0941162662" +msgstr "Account Number" #: www/views/tab-home.html:61 msgid "Instant transactions with low fees" -msgstr "Instant transactions with low fees" - -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "Not enough money" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "Change Currency" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "Available Fund" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "Use All Available Funds" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "Tiếp theo" +msgstr "2" #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" @@ -147,7 +127,7 @@ msgstr "Add account" #: www/views/tab-create-personal.html:62 #: www/views/tab-create-shared.html:91 msgid "Add an optional password to secure the recovery phrase" -msgstr "Add an optional password to secure the recovery phrase" +msgstr "Add a password option to allow a secure cluster" #: www/views/includes/incomingDataMenu.html:41 msgid "Add as a contact" @@ -155,7 +135,7 @@ msgstr "Thêm như một liên hệ" #: src/js/controllers/confirm.js:424 msgid "Add description" -msgstr "Add description" +msgstr "Thêm mô tả" #: www/views/topup.html:6 msgid "Add funds" @@ -163,7 +143,7 @@ msgstr "Nạp tiền" #: src/js/services/bitpayAccountService.js:78 msgid "Add this BitPay account ({{email}})?" -msgstr "Add this BitPay account ({{email}})?" +msgstr "Thêm BitPay ({{email}}) tài khoản này?" #: www/views/add.html:3 msgid "Add wallet" @@ -173,7 +153,7 @@ msgstr "Thêm ví" #: www/views/customAmount.html:28 #: www/views/modals/paypro.html:24 msgid "Address" -msgstr "Address" +msgstr "Địa chỉ" #: www/views/addressbook.html:6 #: www/views/tab-settings.html:13 @@ -182,11 +162,11 @@ msgstr "Sổ địa chỉ" #: www/views/preferencesInformation.html:41 msgid "Address Type" -msgstr "Address Type" +msgstr "Loại địa chỉ" #: www/views/addresses.html:64 msgid "Addresses With Balance" -msgstr "Addresses With Balance" +msgstr "Địa chỉ với số dư" #: www/views/tab-settings.html:149 msgid "Advanced" @@ -194,7 +174,7 @@ msgstr "Nâng cao" #: www/views/advancedSettings.html:3 msgid "Advanced Settings" -msgstr "Advanced Settings" +msgstr "Cài đặt nâng cao" #: www/views/bitpayCard.html:62 msgid "All" @@ -202,7 +182,7 @@ msgstr "Tất cả" #: www/views/allAddresses.html:3 msgid "All Addresses" -msgstr "All Addresses" +msgstr "Tất cả địa chỉ" #: www/views/modals/wallet-balance.html:18 msgid "All of your bitcoin wallet balance may not be available for immediate spending." @@ -210,11 +190,11 @@ msgstr "Tất cả số dư ví bitcoin của bạn có thể không có sẵn c #: www/views/tab-receive.html:25 msgid "All signing devices must be added to this multisig wallet before bitcoin addresses can be created." -msgstr "All signing devices must be added to this multisig wallet before bitcoin addresses can be created." +msgstr "All contract device will be added to this multisig before the bitcoin address has been created." #: www/views/tab-scan.html:21 msgid "Allow Camera Access" -msgstr "Allow Camera Access" +msgstr "Allow camera access" #: www/views/onboarding/notifications.html:7 msgid "Allow notifications" @@ -222,76 +202,62 @@ msgstr "Allow notification" #: www/views/onboarding/disclaimer.html:14 msgid "Almost done! Let's review." -msgstr "Almost done! Let's review." +msgstr "Most as completed! We see review." #: www/views/preferencesAltCurrency.html:4 #: www/views/tab-settings.html:79 msgid "Alternative Currency" -msgstr "Alternative Currency" - -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "Price Display" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "Fiat" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "Cryptocurrencyg" +msgstr "Money Currency instead" #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." -msgstr "Amazon.com is not available at this moment. Please try back later." +msgstr "Amazon.com is not available at this time. Please try again again." #: www/views/amount.html:44 #: www/views/customAmount.html:34 #: www/views/includes/output.html:7 msgid "Amount" -msgstr "Amount" +msgstr "Quantity" #: src/js/services/bwcError.js:110 msgid "Amount below minimum allowed" -msgstr "Amount below minimum allowed" +msgstr "Maximum amount of the minimum amount" #: src/js/controllers/confirm.js:216 msgid "Amount too big" -msgstr "Amount too big" +msgstr "Amount too large" #: www/views/includes/walletHistory.html:31 msgid "Amount too low to spend" -msgstr "Amount too low to spend" +msgstr "Amount too low for standard" #: src/js/controllers/tab-home.js:147 msgid "An update to this app is available. For your security, please update to the latest version." -msgstr "An update to this app is available. For your security, please update to the latest version." +msgstr "Hotel have a Update for this application. To preserve your password, please please update the latest version." #: www/views/backupWarning.html:14 msgid "Anyone with your backup phrase can access or spend your bitcoin." -msgstr "Anyone with your backup phrase can access or spend your bitcoin." +msgstr "Każdy, kto ma Twoją kluczową là một trong những điều tuyệt vời nhất." #: www/views/addresses.html:94 msgid "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" -msgstr "Approximate Bitcoin network fee to transfer wallet's balance (with normal priority)" +msgstr "La taxa approssimativa della rete Bitcoin cho mỗi lần gửi tiền theo yêu cầu của bạn" #: www/views/backupWarning.html:10 msgid "Are you being watched?" -msgstr "Are you being watched?" +msgstr "Chúng tôi vigilen?" #: src/js/controllers/preferencesExternal.js:15 msgid "Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin." -msgstr "Are you being watched? Anyone with your recovery phrase can access or spend your bitcoin." +msgstr "You are tracking? Bất cứ ai có thể phục hồi từ bạn, bạn có thể truy cập hoặc bitcoin chi tiêu của bạn." #: src/js/controllers/copayers.js:56 msgid "Are you sure you want to cancel and delete this wallet?" -msgstr "Are you sure you want to cancel and delete this wallet?" +msgstr "Are you sure you want to cancel and remove this video?" #: src/js/controllers/addressbookView.js:37 msgid "Are you sure you want to delete this contact?" -msgstr "Are you sure you want to delete this contact?" +msgstr "Bạn có chắc chắn muốn xóa địa chỉ liên hệ này không?" #: src/js/controllers/preferencesDelete.js:25 msgid "Are you sure you want to delete this wallet?" @@ -311,7 +277,7 @@ msgstr "Are you sure you want to skip it?" #: www/views/modals/bitpay-card-confirmation.html:4 msgid "Are you sure you would like to log out of your BitPay Card account?" -msgstr "Are you sure you would like to log out of your BitPay Card account?" +msgstr "Bạn có chắc chắn muốn đăng xuất khỏi tài khoản Thẻ BitPay của mình không?" #: src/js/controllers/preferencesBitpayCard.js:7 #: src/js/controllers/preferencesBitpayServices.js:20 @@ -340,11 +306,11 @@ msgstr "Average confirmation time" #: www/views/tab-create-shared.html:142 #: www/views/tab-import-phrase.html:51 msgid "BIP32 path for address derivation" -msgstr "BIP32 path for address derivation" +msgstr "Đường dẫn BIP32 cho dẫn xuất địa chỉ" #: www/views/cashScan.html:25 msgid "BTC wallets" -msgstr "BTC wallets" +msgstr "Ví BTC" #: www/views/preferences.html:34 msgid "Backup" @@ -362,11 +328,11 @@ msgstr "Backup all livenet wallets before using this function" #: www/views/includes/walletListSettings.html:12 #: www/views/preferences.html:36 msgid "Backup needed" -msgstr "Backup needed" +msgstr "Cần sao lưu" #: www/views/includes/backupNeededPopup.html:9 msgid "Backup now" -msgstr "Backup now" +msgstr "Sao lưu ngay" #: www/views/onboarding/backupRequest.html:11 #: www/views/tab-export-file.html:89 @@ -387,7 +353,7 @@ msgstr "Balance By Address" #: www/views/includes/confirmBackupPopup.html:7 msgid "Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recovered without it." -msgstr "Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recovered without it." +msgstr "Hãy chắc chắn lưu trữ cụm từ khôi phục của bạn ở một nơi an toàn. Nếu ứng dụng này bị xóa, tiền của bạn không thể được phục hồi mà không có nó." #: www/views/preferencesBitpayServices.html:9 msgid "BitPay Visa® Cards" @@ -433,11 +399,11 @@ msgstr "Bitcoin is a currency." #: www/views/onboarding/disclaimer.html:15 msgid "Bitcoin is different – it cannot be safely held with a bank or web service." -msgstr "Bitcoin is different – it cannot be safely held with a bank or web service." +msgstr "–." #: www/views/onboarding/tour.html:18 msgid "Bitcoin is secure,
digital money." -msgstr "Bitcoin is secure,
digital money." +msgstr "Bitcoin là an toàn,
tiền kỹ thuật số." #: www/views/preferencesFee.html:11 msgid "Bitcoin transactions include a fee collected by miners on the network." @@ -467,7 +433,7 @@ msgstr "Browser unsupported" #: www/views/buyAmazon.html:5 #: www/views/buyMercadoLibre.html:6 msgid "Buy" -msgstr "Browser unsupported" +msgstr "Buy" #: www/views/includes/buyAndSellCard.html:3 msgid "Buy & Sell Bitcoin" @@ -489,11 +455,11 @@ msgstr "Buy from" #: src/js/services/onGoingProcess.js:40 msgid "Buying Bitcoin..." -msgstr "Buying Bitcoin..." +msgstr "Mua Bitcoin..." #: src/js/services/onGoingProcess.js:12 msgid "Calculating fee" -msgstr "Calculating fee" +msgstr "Phí tính toán" #: src/js/controllers/buyAmazon.js:313 #: src/js/controllers/buyMercadoLibre.js:307 @@ -512,19 +478,19 @@ msgstr "Calculating fee" #: www/views/modals/bitpay-card-confirmation.html:8 #: www/views/modals/confirmation.html:13 msgid "Cancel" -msgstr "Cancel" +msgstr "Hủy bỏ" #: www/views/copayers.html:36 msgid "Cancel invitation" -msgstr "Cancel invitation" +msgstr "Hủy lời mời" #: src/js/controllers/onboarding/tour.js:52 msgid "Cannot Create Wallet" -msgstr "Cannot Create Wallet" +msgstr "Không thể tạo Wallet" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" -msgstr "" +msgid "Cannot join the same wallet more that once" +msgstr "Cannot join the same wallet more that once" #: www/views/includes/bitpayCardsCard.html:2 msgid "Cards" @@ -540,7 +506,7 @@ msgstr "Check installation and retry." #: www/views/tab-import-file.html:4 msgid "Choose a backup file from your computer" -msgstr "Choose a backup file from your computer" +msgstr "Chọn tệp sao lưu từ máy tính của bạn" #: www/views/modals/wallets.html:9 msgid "Choose your destination wallet" @@ -548,7 +514,7 @@ msgstr "Choose your destination wallet" #: www/views/modals/wallets.html:10 msgid "Choose your source wallet" -msgstr "Choose your source wallet" +msgstr "Chọn ví nguồn của bạn" #: www/views/backup.html:61 msgid "Clear" @@ -589,7 +555,7 @@ msgstr "Coin" #: www/views/preferences.html:22 msgid "Color" -msgstr "Color" +msgstr "Màu" #: www/views/preferencesAbout.html:21 msgid "Commit hash" @@ -639,11 +605,11 @@ msgstr "Confirmations" #: www/views/bitpayCard.html:68 #: www/views/modals/wallet-balance.html:61 msgid "Confirming" -msgstr "Confirming" +msgstr "Xác nhận" #: www/views/bitpayCardIntro.html:37 msgid "Connect my BitPay Card" -msgstr "Connect my BitPay Card" +msgstr "Kết nối thẻ BitPay của tôi" #: src/js/services/onGoingProcess.js:13 msgid "Connecting to Coinbase..." @@ -651,11 +617,11 @@ msgstr "Connecting to Coinbase..." #: src/js/services/onGoingProcess.js:14 msgid "Connecting to Glidera..." -msgstr "Connecting to Glidera..." +msgstr "Đang kết nối với Glidera ..." #: src/js/services/bwcError.js:53 msgid "Connection reset by peer" -msgstr "Connection reset by peer" +msgstr "Đặt lại kết nối theo ngang hàng" #: www/views/tab-send.html:85 msgid "Contacts" @@ -663,7 +629,7 @@ msgstr "Contacts" #: www/views/tab-send.html:86 msgid "Saved frequently used addresses" -msgstr "Saved frequently used addresses" +msgstr "Save the regular usage" #: www/views/onboarding/notifications.html:9 msgid "Continue" @@ -675,7 +641,7 @@ msgstr "Contribute Translations" #: src/js/controllers/confirm.js:130 msgid "Copay only supports Bitcoin Cash using new version numbers addresses" -msgstr "Copay only supports Bitcoin Cash using new version numbers addresses" +msgstr "Copay chỉ hỗ trợ Bitcoin Cash bằng cách sử dụng số phiên bản mới" #: src/js/services/bwcError.js:62 msgid "Copayer already in this wallet" @@ -683,11 +649,11 @@ msgstr "Copayer already in this wallet" #: src/js/services/bwcError.js:77 msgid "Copayer already voted on this spend proposal" -msgstr "Copayer already voted on this spend proposal" +msgstr "Coper is this option" #: src/js/services/bwcError.js:107 msgid "Copayer data mismatch" -msgstr "Copayer data mismatch" +msgstr "Dữ liệu Copayer không khớp" #: www/views/includes/walletActivity.html:2 msgid "Copayer joined" @@ -699,10 +665,9 @@ msgstr "Copayer {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" -msgstr "Copied to clipboard" +msgstr "Sao chép vào clipboard" #: www/views/tab-export-file.html:94 msgid "Copy this text as it is to a safe place (notepad or email)" @@ -714,7 +679,7 @@ msgstr "Copy this text as it is to a safe place (notepad or email)" #: www/views/includes/logOptions.html:9 #: www/views/tab-export-file.html:78 msgid "Copy to clipboard" -msgstr "Copy to clipboard" +msgstr "Sao chép vào clipboard" #: src/js/controllers/buyMercadoLibre.js:102 msgid "Could not access Gift Card Service" @@ -742,344 +707,344 @@ msgstr "Could not broadcast payment" #: src/js/services/bwcError.js:41 msgid "Could not build transaction" -msgstr "Could not build transaction" +msgstr "Cannot build transaction" #: src/js/services/walletService.js:854 msgid "Could not create address" -msgstr "Could not create address" +msgstr "" #: src/js/controllers/topup.js:92 msgid "Could not create the invoice" -msgstr "Could not create the invoice" +msgstr "" #: src/js/controllers/buyAmazon.js:164 #: src/js/controllers/buyMercadoLibre.js:164 #: src/js/controllers/topup.js:142 msgid "Could not create transaction" -msgstr "Could not create transaction" +msgstr "" #: src/js/services/profileService.js:350 msgid "Could not create using the specified extended private key" -msgstr "Could not create using the specified extended private key" +msgstr "" #: src/js/services/profileService.js:362 msgid "Could not create using the specified extended public key" -msgstr "Could not create using the specified extended public key" +msgstr "" #: src/js/services/profileService.js:338 msgid "Could not create: Invalid wallet recovery phrase" -msgstr "Could not create: Invalid wallet recovery phrase" +msgstr "" #: src/js/controllers/import.js:114 msgid "Could not decrypt file, check your password" -msgstr "Could not decrypt file, check your password" +msgstr "" #: src/js/controllers/modals/txpDetails.js:181 msgid "Could not delete payment proposal" -msgstr "Could not delete payment proposal" +msgstr "" #: src/js/controllers/cashScan.js:117 msgid "Could not duplicate" -msgstr "Could not duplicate" +msgstr "" #: src/js/services/feeService.js:73 msgid "Could not get dynamic fee" -msgstr "Could not get dynamic fee" +msgstr "" #: src/js/services/feeService.js:43 msgid "Could not get dynamic fee for level: {{feeLevel}}" -msgstr "Could not get dynamic fee for level: {{feeLevel}}" +msgstr "" #: src/js/controllers/modals/feeLevels.js:112 msgid "Could not get fee levels" -msgstr "Could not get fee levels" +msgstr "" #: src/js/controllers/buyAmazon.js:122 #: src/js/controllers/buyMercadoLibre.js:122 #: src/js/controllers/topup.js:100 msgid "Could not get the invoice" -msgstr "Could not get invoice" +msgstr "" #: src/js/controllers/bitpayCard.js:66 msgid "Could not get transactions" -msgstr "Could not get transactions" +msgstr "" #: src/js/services/profileService.js:615 #: src/js/services/profileService.js:650 #: src/js/services/profileService.js:674 msgid "Could not import" -msgstr "Could not import" +msgstr "" #: src/js/services/profileService.js:584 msgid "Could not import. Check input file and spending password" -msgstr "Could not import. Check input file and spending password" +msgstr "" #: src/js/services/profileService.js:457 msgid "Could not join wallet" -msgstr "Could not join wallet" +msgstr "" #: src/js/controllers/modals/txpDetails.js:161 msgid "Could not reject payment" -msgstr "Could not reject payment" +msgstr "" #: src/js/controllers/preferencesBitpayServices.js:33 msgid "Could not remove account" -msgstr "Could not remove account" +msgstr "" #: src/js/controllers/preferencesBitpayCard.js:20 #: src/js/controllers/preferencesBitpayServices.js:50 msgid "Could not remove card" -msgstr "Could not remove card" +msgstr "" #: src/js/services/walletService.js:776 msgid "Could not save preferences on the server" -msgstr "Could not save preferences on the server" +msgstr "" #: src/js/controllers/modals/txpDetails.js:147 msgid "Could not send payment" -msgstr "Could not send payment" +msgstr "" #: src/js/controllers/buyAmazon.js:325 #: src/js/controllers/buyMercadoLibre.js:318 #: src/js/controllers/topup.js:299 msgid "Could not send transaction" -msgstr "Could not send transaction" +msgstr "" #: www/views/walletDetails.html:210 msgid "Could not update transaction history" -msgstr "Could not update transaction history" +msgstr "" #: src/js/controllers/addresses.js:29 #: src/js/controllers/addresses.js:37 #: src/js/controllers/copayers.js:30 #: src/js/controllers/walletDetails.js:78 msgid "Could not update wallet" -msgstr "Could not update wallet" +msgstr "" #: www/views/tab-create-personal.html:3 msgid "Create Personal Wallet" -msgstr "Create Personal Wallet" +msgstr "" #: www/views/tab-create-shared.html:3 msgid "Create Shared Wallet" -msgstr "Generate Wallet" +msgstr "" #: www/views/onboarding/tour.html:51 #: www/views/tab-home.html:75 #: www/views/tab-send.html:75 msgid "Create bitcoin wallet" -msgstr "Create bitcoin wallet" +msgstr "" #: www/views/tab-create-personal.html:131 msgid "Create new wallet" -msgstr "Create new wallet" +msgstr "" #: www/views/add.html:22 msgid "Create shared wallet" -msgstr "Create shared wallet" +msgstr "" #: www/views/tab-create-shared.html:160 msgid "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet" -msgstr "Create {{formData.requiredCopayers}}-of-{{formData.totalCopayers}} wallet" +msgstr "" #: www/views/modals/txp-details.html:81 #: www/views/tx-details.html:60 msgid "Created by" -msgstr "Created by" +msgstr "" #: src/js/services/onGoingProcess.js:18 msgid "Creating Wallet..." -msgstr "Creating Wallet..." +msgstr "" #: src/js/services/onGoingProcess.js:17 msgid "Creating transaction" -msgstr "Creating transaction" +msgstr "" #: www/views/modals/chooseFeeLevel.html:34 #: www/views/preferencesFee.html:20 msgid "Current fee rate for this policy" -msgstr "Current fee rate for this policy" +msgstr "" #: src/js/services/feeService.js:15 msgid "Custom" -msgstr "Custom" +msgstr "" #: www/views/customAmount.html:9 msgid "Custom Amount" -msgstr "Custom" +msgstr "" #: src/js/controllers/preferencesFee.js:85 msgid "Custom Fee" -msgstr "Custom Fee" +msgstr "" #: www/views/modals/mercadolibre-card-details.html:56 #: www/views/modals/txp-details.html:87 #: www/views/tx-details.html:66 msgid "Date" -msgstr "Date" +msgstr "" #: www/views/preferencesDeleteWallet.html:21 msgid "Delete" -msgstr "Delete" +msgstr "" #: www/views/modals/txp-details.html:164 msgid "Delete Payment Proposal" -msgstr "Delete Payment Proposal" +msgstr "" #: www/views/preferencesAdvanced.html:33 #: www/views/preferencesDeleteWallet.html:3 msgid "Delete Wallet" -msgstr "Delete Wallet" +msgstr "" #: www/views/copayers.html:59 msgid "Delete it and create a new one" -msgstr "Delete it and create a new one" +msgstr "" #: src/js/services/onGoingProcess.js:19 msgid "Deleting Wallet..." -msgstr "Deleting Wallet..." +msgstr "" #: src/js/services/onGoingProcess.js:28 msgid "Deleting payment proposal" -msgstr "Deleting payment proposal" +msgstr "" #: www/views/join.html:141 #: www/views/tab-create-personal.html:111 #: www/views/tab-create-shared.html:140 #: www/views/tab-import-phrase.html:49 msgid "Derivation Path" -msgstr "Derivation Path" +msgstr "" #: www/views/preferencesInformation.html:47 msgid "Derivation Strategy" -msgstr "Derivation Strategy" +msgstr "" #: www/views/buyAmazon.html:39 #: www/views/buyMercadoLibre.html:38 #: www/views/modals/mercadolibre-card-details.html:6 #: www/views/topup.html:45 msgid "Details" -msgstr "Details" +msgstr "Chi tiết" #: src/js/controllers/lockSetup.js:9 #: src/js/controllers/tab-settings.js:65 #: www/views/tab-settings.html:50 msgid "Disabled" -msgstr "Disabled" +msgstr "" #: www/views/includes/backupNeededPopup.html:10 #: www/views/onboarding/backupRequest.html:12 msgid "Do it later" -msgstr "Do it later" +msgstr "" #: www/views/tab-export-file.html:29 msgid "Do not include private key" -msgstr "Do not include private key" +msgstr "" #: www/views/preferencesLanguage.html:21 msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." -msgstr "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language." +msgstr "" #: www/views/tab-export-file.html:59 #: www/views/tab-home.html:22 msgid "Download" -msgstr "Download" +msgstr "" #: www/views/cashScan.html:37 msgid "Duplicate for BCH" -msgstr "Duplicate for BCH" +msgstr "" #: src/js/services/onGoingProcess.js:49 msgid "Duplicating wallet..." -msgstr "Duplicating wallet..." +msgstr "" #: www/views/addresses.html:19 msgid "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment." -msgstr "Each bitcoin wallet can generate billions of addresses from your 12-word backup. A new address is automatically generated and shown each time you receive a payment." +msgstr "" #: src/js/services/feeService.js:13 msgid "Economy" -msgstr "Economy" +msgstr "" #: www/views/onboarding/collectEmail.html:27 msgid "Edit" -msgstr "Edit" +msgstr "" #: www/views/addressbook.add.html:29 #: www/views/addressbook.view.html:22 msgid "Email" -msgstr "Email" +msgstr "" #: www/views/preferencesNotifications.html:42 msgid "Email Address" -msgstr "Email Address" +msgstr "" #: src/js/services/bwcError.js:122 msgid "Empty addresses limit reached. New addresses cannot be generated." -msgstr "Empty addresses limit reached. New addresses cannot be generated." +msgstr "" #: www/views/preferencesCash.html:17 msgid "Enable Bitcoin Cash wallet creation and operation within the App." -msgstr "Enable Bitcoin Cash wallet creation and operation within the App." +msgstr "" #: www/views/tab-scan.html:19 msgid "Enable camera access in your device settings to get started." -msgstr "Enable camera access in your device settings to get started." +msgstr "" #: www/views/preferencesNotifications.html:29 msgid "Enable email notifications" -msgstr "Enable email notifications" +msgstr "" #: www/views/preferencesNotifications.html:12 msgid "Enable push notifications" -msgstr "Enable push notifications" +msgstr "" #: www/views/preferencesNotifications.html:33 msgid "Enable sound" -msgstr "Enable sound" +msgstr "" #: www/views/tab-scan.html:18 msgid "Enable the camera to get started." -msgstr "Enable the camera to get started." +msgstr "" #: www/views/tab-settings.html:49 msgid "Enabled" -msgstr "Enabled" +msgstr "" #: src/js/services/walletService.js:1047 #: src/js/services/walletService.js:1062 msgid "Enter Spending Password" -msgstr "Enter Spending Password" +msgstr "" #: src/js/services/bitpayAccountService.js:110 msgid "Enter Two Factor for your BitPay account" -msgstr "Enter Two Factor for your BitPay account" +msgstr "" #: www/views/amount.html:4 msgid "Enter amount" -msgstr "Enter amount" +msgstr "" #: www/views/modals/chooseFeeLevel.html:41 msgid "Enter custom fee" -msgstr "Enter custom fee" +msgstr "" #: src/js/services/walletService.js:1029 msgid "Enter new spending password" -msgstr "Enter new spending password" +msgstr "" #: www/views/join.html:79 #: www/views/tab-create-personal.html:51 #: www/views/tab-create-shared.html:80 msgid "Enter the recovery phrase (BIP39)" -msgstr "Enter the recovery phrase (BIP39)" +msgstr "" #: www/views/onboarding/collectEmail.html:13 msgid "Enter your email" -msgstr "Enter your email" +msgstr "" #: www/views/backup.html:69 msgid "Enter your password" -msgstr "Enter your password" +msgstr "" #. Trying to import a malformed wallet export QR code #: src/js/controllers/activity.js:45 @@ -1158,54 +1123,54 @@ msgstr "Enter your password" #: www/views/mercadoLibreCards.html:19 #: www/views/modals/mercadolibre-card-details.html:45 msgid "Error" -msgstr "Error" +msgstr "" #: src/js/controllers/confirm.js:502 msgid "Error at confirm" -msgstr "Error at confirm" +msgstr "" #: src/js/controllers/buyAmazon.js:179 msgid "Error creating gift card" -msgstr "Error creating gift card" +msgstr "" #: src/js/controllers/buyAmazon.js:94 #: src/js/controllers/buyMercadoLibre.js:94 msgid "Error creating the invoice" -msgstr "Error creating the invoice" +msgstr "" #: src/js/services/profileService.js:412 msgid "Error creating wallet" -msgstr "Error creating wallet" +msgstr "" #: src/js/controllers/confirm.js:296 msgid "Error getting SendMax information" -msgstr "Error getting SendMax information" +msgstr "" #: src/js/controllers/buyAmazon.js:136 #: src/js/controllers/buyMercadoLibre.js:136 #: src/js/controllers/topup.js:114 msgid "Error in Payment Protocol" -msgstr "Error in Payment Protocol" +msgstr "" #: src/js/controllers/bitpayCardIntro.js:14 msgid "Error pairing BitPay Account" -msgstr "Error pairing BitPay Account" +msgstr "" #: src/js/controllers/paperWallet.js:41 msgid "Error scanning funds:" -msgstr "Error scanning funds:" +msgstr "" #: src/js/controllers/paperWallet.js:90 msgid "Error sweeping wallet:" -msgstr "Error sweeping wallet:" +msgstr "" #: src/js/controllers/bitpayCardIntro.js:20 msgid "Error updating Debit Cards" -msgstr "Error updating Debit Cards" +msgstr "" #: src/js/services/bwcError.js:143 msgid "Exceeded daily limit of $500 per user" -msgstr "Exceeded daily limit of $500 per user" +msgstr "" #: src/js/controllers/confirm.js:461 #: www/views/confirm.html:27 @@ -1213,38 +1178,38 @@ msgstr "Exceeded daily limit of $500 per user" #: www/views/modals/mercadolibre-card-details.html:34 #: www/views/modals/txp-details.html:119 msgid "Expired" -msgstr "Expired" +msgstr "" #: www/views/modals/paypro.html:54 #: www/views/modals/txp-details.html:125 msgid "Expires" -msgstr "Expires" +msgstr "" #: www/views/preferencesAdvanced.html:21 msgid "Export Wallet" -msgstr "Export Wallet" +msgstr "" #: www/views/preferencesHistory.html:11 #: www/views/preferencesHistory.html:14 msgid "Export to file" -msgstr "Export Wallet" +msgstr "" #: www/views/export.html:3 msgid "Export wallet" -msgstr "Export wallet" +msgstr "" #: src/js/services/walletService.js:1174 #: www/views/tab-export-qrCode.html:9 msgid "Exporting via QR not supported for this wallet" -msgstr "Exporting via QR not supported for this wallet" +msgstr "" #: www/views/preferencesInformation.html:89 msgid "Extended Public Keys" -msgstr "Extended Public Keys" +msgstr "" #: src/js/services/onGoingProcess.js:20 msgid "Extracting Wallet information..." -msgstr "Extracting Wallet information..." +msgstr "" #: src/js/controllers/export.js:115 #: src/js/controllers/export.js:126 @@ -1252,65 +1217,65 @@ msgstr "Extracting Wallet information..." #: src/js/controllers/export.js:171 #: www/views/tab-export-file.html:4 msgid "Failed to export" -msgstr "Failed to export" +msgstr "" #: www/views/tab-create-personal.html:14 #: www/views/tab-create-shared.html:14 msgid "Family vacation funds" -msgstr "Family vacation funds" +msgstr "" #: www/views/tx-details.html:79 msgid "Fee" -msgstr "Fee" +msgstr "" #: www/views/modals/chooseFeeLevel.html:75 msgid "Fee level" -msgstr "Fee level" +msgstr "" #: src/js/controllers/modals/feeLevels.js:100 msgid "Fee level is not defined" -msgstr "Fee level is not defined" +msgstr "" #: www/views/confirm.html:79 #: www/views/modals/txp-details.html:99 msgid "Fee:" -msgstr "Fee:" +msgstr "" #: src/js/controllers/feedback/send.js:23 msgid "Feedback could not be submitted. Please try again later." -msgstr "Feedback could not be submitted. Please try again later." +msgstr "" #: src/js/services/onGoingProcess.js:42 msgid "Fetching BitPay Account..." -msgstr "Fetching BitPay Account..." +msgstr "" #: src/js/services/onGoingProcess.js:21 msgid "Fetching payment information" -msgstr "Fetching payment information" +msgstr "" #: www/views/export.html:14 #: www/views/import.html:16 msgid "File/Text" -msgstr "File/Text" +msgstr "" #: www/views/preferencesLogs.html:17 msgid "Filter setting" -msgstr "Filter setting" +msgstr "" #: src/js/services/fingerprintService.js:43 #: src/js/services/fingerprintService.js:48 msgid "Finger Scan Failed" -msgstr "Finger Scan Failed" +msgstr "" #: src/js/controllers/feedback/send.js:34 #: www/views/feedback/complete.html:7 msgid "Finish" -msgstr "Finish" +msgstr "" #: www/views/tab-create-personal.html:123 #: www/views/tab-create-shared.html:152 msgid "For audit purposes" -msgstr "For audit purposes" +msgstr "" #: src/js/controllers/topup.js:308 #: www/views/buyAmazon.html:29 @@ -1319,96 +1284,99 @@ msgstr "For audit purposes" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" -msgstr "From" +msgstr "" #: src/js/controllers/bitpayCardIntro.js:71 msgid "From BitPay account" -msgstr "From BitPay account" +msgstr "" #: www/views/tab-import-phrase.html:57 msgid "From Hardware Wallet" -msgstr "From Hardware Wallet" +msgstr "" #: www/views/tab-export-qrCode.html:5 msgid "From the destination device, go to Add wallet > Import wallet and scan this QR code" -msgstr "From the destination device, go to Add wallet > Import wallet and scan this QR code" +msgstr "" #: src/js/services/bwcError.js:74 msgid "Funds are locked by pending spend proposals" -msgstr "Funds are locked by pending spend proposals" +msgstr "" #: www/views/paperWallet.html:16 msgid "Funds found:" -msgstr "Funds found:" +msgstr "" #: www/views/topup.html:49 msgid "Funds to be added" -msgstr "Funds to be added" +msgstr "" #: www/views/paperWallet.html:51 msgid "Funds transferred" -msgstr "Funds transferred" +msgstr "" #: www/views/topup.html:103 msgid "Funds were added to debit card" -msgstr "Funds were added to debit card" +msgstr "" #: www/views/paperWallet.html:22 msgid "Funds will be transferred to" -msgstr "Funds will be transferred to" +msgstr "" #: www/views/tab-receive.html:51 msgid "Generate new address" -msgstr "Generate new address" +msgstr "" #: src/js/services/onGoingProcess.js:22 msgid "Generating .csv file..." -msgstr "Generating .csv file..." +msgstr "" #: src/js/services/onGoingProcess.js:37 msgid "Generating new address..." -msgstr "Generating new address..." +msgstr "" #: www/views/bitpayCardIntro.html:23 msgid "Get local cash anywhere you go, from any Visa® compatible ATM. ATM bank fees may apply." -msgstr "Get local cash anywhere you go, from any Visa® compatible ATM. ATM bank fees may apply." +msgstr "" #: www/views/onboarding/collectEmail.html:15 msgid "Get news and updates from BitPay" -msgstr "Get news and updates from BitPay" +msgstr "" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "" + #: www/views/bitpayCard.html:49 msgid "Get started" -msgstr "Get started" +msgstr "" #: www/views/addressbook.html:20 msgid "Get started by adding your first one." -msgstr "Get started by adding your first one." +msgstr "" #: src/js/services/onGoingProcess.js:23 msgid "Getting fee levels..." -msgstr "Getting fee levels..." +msgstr "" #: www/views/buyAmazon.html:43 #: www/views/buyMercadoLibre.html:42 msgid "Gift Card" -msgstr "Gift Card" +msgstr "" #: www/views/modals/mercadolibre-card-details.html:30 #: www/views/modals/mercadolibre-card-details.html:35 msgid "Gift Card is not available to use anymore" -msgstr "Gift Card is not available to use anymore" +msgstr "" #: src/js/controllers/buyAmazon.js:204 msgid "Gift card expired" -msgstr "Gift card expired" +msgstr "" #: www/views/buyAmazon.html:111 msgid "Gift card generated and ready to use." -msgstr "Gift card generated and ready to use." +msgstr "" #: src/js/controllers/bitpayCard.js:114 #: src/js/controllers/bitpayCard.js:124 @@ -1423,59 +1391,59 @@ msgstr "Gift card generated and ready to use." #: src/js/controllers/tx-details.js:193 #: src/js/controllers/tx-details.js:56 msgid "Go Back" -msgstr "Go Back" +msgstr "" #: src/js/controllers/confirm.js:131 #: src/js/controllers/onboarding/backupRequest.js:20 #: src/js/controllers/onboarding/backupRequest.js:26 #: src/js/services/bitpayAccountService.js:84 msgid "Go back" -msgstr "Go back" +msgstr "" #: www/views/backupWarning.html:15 #: www/views/includes/confirmBackupPopup.html:8 #: www/views/onboarding/tour.html:23 msgid "Got it" -msgstr "Got it" +msgstr "" #: www/views/preferencesInformation.html:53 #: www/views/preferencesInformation.html:59 msgid "Hardware Wallet" -msgstr "Hardware Wallet" +msgstr "" #: www/views/preferencesExternal.html:18 msgid "Hardware not connected." -msgstr "Hardware not connected." +msgstr "" #: www/views/import.html:20 msgid "Hardware wallet" -msgstr "Hardware wallet" +msgstr "" #: src/js/controllers/create.js:180 #: src/js/controllers/join.js:145 msgid "Hardware wallets are not yet supported with Bitcoin Cash" -msgstr "Hardware wallets are not yet supported with Bitcoin Cash" +msgstr "" #: www/views/tab-settings.html:20 msgid "Help & Support" -msgstr "Help & Support" +msgstr "" #: src/js/controllers/bitpayCard.js:112 #: src/js/controllers/tab-settings.js:51 msgid "Help and support information is available at the website." -msgstr "Help and support information is available at the website." +msgstr "" #: www/views/addresses.html:25 msgid "Hide" -msgstr "Hide" +msgstr "" #: www/views/preferences.html:27 msgid "Hide Balance" -msgstr "Hide Balance" +msgstr "" #: www/views/advancedSettings.html:30 msgid "Hide Next Steps Card" -msgstr "Hide Next Steps Card" +msgstr "" #: www/views/join.html:49 #: www/views/tab-create-personal.html:28 @@ -1485,555 +1453,555 @@ msgstr "Hide Next Steps Card" #: www/views/tab-import-hardware.html:31 #: www/views/tab-import-phrase.html:36 msgid "Hide advanced options" -msgstr "Hide advanced options" +msgstr "" #: www/views/tabs.html:3 msgid "Home" -msgstr "Home" +msgstr "" #: src/js/controllers/feedback/send.js:61 #: src/js/controllers/feedback/send.js:65 #: src/js/controllers/feedback/send.js:69 msgid "How could we improve your experience?" -msgstr "How could we improve your experience?" +msgstr "" #: www/views/feedback/rateCard.html:3 msgid "How do you like {{appName}}?" -msgstr "How do you like {{appName}}?" +msgstr "" #: src/js/controllers/feedback/rateCard.js:29 msgid "I don't like it" -msgstr "I don't like it" +msgstr "" #: www/views/onboarding/disclaimer.html:43 msgid "I have read, understood, and agree to the Terms of Use." -msgstr "I have read, understood, and agree to the Terms of Use." +msgstr "" #: www/views/modals/terms.html:22 msgid "I have read, understood, and agree with the Terms of use." -msgstr "I have read, understood, and agree with the Terms of use." +msgstr "" #: www/views/join.html:137 #: www/views/tab-create-personal.html:107 #: www/views/tab-create-shared.html:136 msgid "I have written it down" -msgstr "I have written it down" +msgstr "" #: src/js/controllers/feedback/rateCard.js:35 msgid "I like the app" -msgstr "I like the app" +msgstr "" #: src/js/controllers/feedback/rateCard.js:26 msgid "I think this app is terrible." -msgstr "I think this app is terrible." +msgstr "" #: src/js/controllers/onboarding/backupRequest.js:19 #: www/views/includes/screenshotWarningModal.html:9 msgid "I understand" -msgstr "I understand" +msgstr "" #: www/views/onboarding/disclaimer.html:21 msgid "I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase." -msgstr "I understand that if this app is moved to another device or deleted, my bitcoin can only be recovered with the backup phrase." +msgstr "" #: www/views/onboarding/disclaimer.html:18 msgid "I understand that my funds are held securely on this device, not by a company." -msgstr "I understand that my funds are held securely on this device, not by a company." +msgstr "" #: www/views/backup.html:36 msgid "I've written it down" -msgstr "I've written it down" +msgstr "" #: www/views/preferences.html:45 msgid "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." -msgstr "If enabled, all sensitive information (private key and recovery phrase) and actions (spending and exporting) associated with this wallet will be protected." +msgstr "" #: www/views/advancedSettings.html:23 msgid "If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab." -msgstr "If enabled, the Recent Transactions card - a list of transactions occuring across all wallets - will appear in the Home tab." +msgstr "" #: www/views/advancedSettings.html:14 msgid "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays." -msgstr "If enabled, wallets will also try to spend unconfirmed funds. This option may cause transaction delays." +msgstr "" #: src/js/controllers/onboarding/backupRequest.js:18 msgid "If this device is replaced or this app is deleted, neither you nor BitPay can recover your funds without a backup." -msgstr "If this device is replaced or this app is deleted, neither you nor BitPay can recover your funds without a backup." +msgstr "" #: www/views/feedback/complete.html:23 msgid "If you have additional feedback, please let us know by tapping the \"Send feedback\" option in the Settings tab." -msgstr "If you have additional feedback, please let us know by tapping the \"Send feedback\" option in the Settings tab." +msgstr "" #: www/views/includes/screenshotWarningModal.html:8 msgid "If you take a screenshot, your backup may be viewed by other apps. You can make a safe backup with physical paper and a pen." -msgstr "If you take a screenshot, your backup may be viewed by other apps. You can make a safe backup with physical paper and a pen." +msgstr "" #: www/views/tab-import-hardware.html:42 #: www/views/tab-import-phrase.html:80 msgid "Import" -msgstr "Import" +msgstr "" #: www/views/import.html:3 msgid "Import Wallet" -msgstr "Import Wallet" +msgstr "" #: www/views/tab-import-file.html:41 msgid "Import backup" -msgstr "Import backup" +msgstr "" #: www/views/add.html:38 msgid "Import wallet" -msgstr "Import wallet" +msgstr "" #: src/js/services/onGoingProcess.js:24 msgid "Importing Wallet..." -msgstr "Importing Wallet..." +msgstr "" #: www/views/backup.html:72 msgid "In order to verify your wallet backup, please type your password." -msgstr "In order to verify your wallet backup, please type your password." +msgstr "" #: www/views/mercadoLibreCards.html:24 #: www/views/modals/mercadolibre-card-details.html:29 msgid "Inactive" -msgstr "Inactive" +msgstr "" #: www/views/includes/walletItem.html:9 #: www/views/includes/walletList.html:6 #: www/views/includes/walletListSettings.html:9 #: www/views/includes/walletSelector.html:16 msgid "Incomplete" -msgstr "Incomplete" +msgstr "" #: www/views/tab-receive.html:22 msgid "Incomplete wallet" -msgstr "Incomplete wallet" +msgstr "" #: www/views/modals/pin.html:12 msgid "Incorrect PIN, try again." -msgstr "Incorrect PIN, try again." +msgstr "" #. Trying to import a malformed wallet export QR code #: src/js/controllers/import.js:85 msgid "Incorrect code format" -msgstr "Incorrect code format" +msgstr "" #: src/js/services/bwcError.js:113 msgid "Incorrect network address" -msgstr "Incorrect network address" +msgstr "" #: src/js/controllers/confirm.js:114 #: src/js/controllers/confirm.js:306 #: src/js/services/bwcError.js:44 msgid "Insufficient confirmed funds" -msgstr "Insufficient confirmed funds" +msgstr "" #: src/js/controllers/topup.js:165 #: src/js/controllers/topup.js:177 #: src/js/services/bwcError.js:71 msgid "Insufficient funds for fee" -msgstr "Insufficient funds for fee" +msgstr "" #: www/views/tab-settings.html:123 msgid "Integrations" -msgstr "Integrations" +msgstr "" #: www/views/includes/walletHistory.html:49 msgid "Invalid" -msgstr "Invalid" +msgstr "" #: src/js/controllers/buyAmazon.js:137 #: src/js/controllers/buyMercadoLibre.js:137 #: src/js/controllers/topup.js:115 msgid "Invalid URL" -msgstr "Invalid URL" +msgstr "" #: src/js/controllers/create.js:186 #: src/js/controllers/import.js:345 #: src/js/controllers/join.js:151 msgid "Invalid account number" -msgstr "Invalid account number" +msgstr "" #: src/js/services/bwcError.js:119 msgid "Invalid address" -msgstr "Invalid address" +msgstr "" #: src/js/controllers/tabsController.js:7 msgid "Invalid data" -msgstr "Invalid data" +msgstr "" #: src/js/controllers/create.js:161 #: src/js/controllers/import.js:266 #: src/js/controllers/join.js:125 msgid "Invalid derivation path" -msgstr "Invalid derivation path" +msgstr "" #: src/js/controllers/copayers.js:90 msgid "Invitation to share a {{appName}} Wallet" -msgstr "Invitation to share a {{appName}} Wallet" +msgstr "" #: www/views/mercadoLibreCards.html:20 #: www/views/modals/mercadolibre-card-details.html:48 msgid "Invoice expired" -msgstr "Invoice expired" +msgstr "" #: src/js/controllers/feedback/send.js:79 msgid "Is there anything we could do better?" -msgstr "Is there anything we could do better?" +msgstr "" #: www/views/backup.html:54 msgid "Is this correct?" -msgstr "Is this correct?" +msgstr "" #: www/views/onboarding/collectEmail.html:22 msgid "Is this email address correct?" -msgstr "Is this email address correct?" +msgstr "" #: www/views/addresses.html:25 msgid "It's a good idea to avoid reusing addresses - this both protects your privacy and keeps your bitcoins secure against hypothetical attacks by quantum computers." -msgstr "It's a good idea to avoid reusing addresses - this both protects your privacy and keeps your bitcoins secure against hypothetical attacks by quantum computers." +msgstr "" #: src/js/controllers/backup.js:76 msgid "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again." -msgstr "It's important that you write your backup phrase down correctly. If something happens to your wallet, you'll need this backup to recover your money. Please review your backup and try again." +msgstr "" #: www/views/join.html:151 msgid "Join" -msgstr "Join" +msgstr "" #: src/js/controllers/copayers.js:85 msgid "Join my {{appName}} Wallet. Here is the invitation code: {{secret}} You can download {{appName}} for your phone or desktop at {{appUrl}}" -msgstr "Join my {{appName}} Wallet. Here is the invitation code: {{secret}} You can download {{appName}} for your phone or desktop at {{appUrl}}" +msgstr "" #: www/views/add.html:30 #: www/views/join.html:5 msgid "Join shared wallet" -msgstr "Join shared wallet" +msgstr "" #: src/js/services/onGoingProcess.js:25 msgid "Joining Wallet..." -msgstr "Joining Wallet..." +msgstr "" #: www/views/onboarding/tour.html:22 msgid "Just scan the code to pay." -msgstr "Just scan the code to pay." +msgstr "" #: src/js/services/bwcError.js:116 msgid "Key already associated with an existing wallet" -msgstr "Key already associated with an existing wallet" +msgstr "" #: www/views/preferencesLanguage.html:4 #: www/views/tab-settings.html:68 msgid "Language" -msgstr "Language" +msgstr "" #: www/views/bitpayCard.html:61 msgid "Last Month" -msgstr "Last Month" +msgstr "" #: src/js/controllers/confirm.js:132 #: www/views/preferences.html:48 #: www/views/preferencesCash.html:18 #: www/views/tx-details.html:94 msgid "Learn more" -msgstr "Learn more" +msgstr "" #: www/views/backup.html:43 msgid "Let's verify your backup phrase." -msgstr "Let's verify your backup phrase." +msgstr "" #: www/views/addresses.html:45 #: www/views/allAddresses.html:14 msgid "Loading addresses..." -msgstr "Loading addresses..." +msgstr "" #: src/js/services/onGoingProcess.js:35 msgid "Loading transaction info..." -msgstr "Loading transaction info..." +msgstr "" #: www/views/tab-settings.html:100 msgid "Lock App" -msgstr "Lock App" +msgstr "" #: src/js/controllers/lockSetup.js:23 msgid "Lock by Fingerprint" -msgstr "Lock by Fingerprint" +msgstr "" #: src/js/controllers/lockSetup.js:14 msgid "Lock by PIN" -msgstr "Lock by PIN" +msgstr "" #: www/views/modals/wallet-balance.html:80 msgid "Locked" -msgstr "Locked" +msgstr "" #: src/js/services/bwcError.js:86 msgid "Locktime in effect. Please wait to create a new spend proposal" -msgstr "Locktime in effect. Please wait to create a new spend proposal" +msgstr "" #: src/js/services/bwcError.js:89 msgid "Locktime in effect. Please wait to remove this spend proposal" -msgstr "Locktime in effect. Please wait to remove this spend proposal" +msgstr "" #: www/views/includes/logOptions.html:3 msgid "Log options" -msgstr "Log options" +msgstr "" #: www/views/modals/bitpay-card-confirmation.html:14 msgid "Log out" -msgstr "Log out" +msgstr "" #: www/views/addresses.html:87 msgid "Low amount inputs" -msgstr "Low amount inputs" +msgstr "" #: www/views/includes/walletHistory.html:27 msgid "Low fees" -msgstr "Low fees" +msgstr "" #: www/views/onboarding/tour.html:38 msgid "Makes sense" -msgstr "Makes sense" +msgstr "" #: src/js/controllers/modals/search.js:61 msgid "Matches:" -msgstr "Matches:" +msgstr "" #: www/views/includes/copayers.html:4 #: www/views/preferencesInformation.html:85 msgid "Me" -msgstr "Me" +msgstr "" #: src/js/controllers/feedback/rateCard.js:32 msgid "Meh - it's alright" -msgstr "Meh - it's alright" +msgstr "" #: src/js/controllers/tx-details.js:165 #: www/views/modals/paypro.html:48 #: www/views/modals/txp-details.html:93 #: www/views/tx-details.html:72 msgid "Memo" -msgstr "Memo" +msgstr "" #: www/views/mercadoLibre.html:6 msgid "Mercado Livre Brazil Gift Cards" -msgstr "Mercado Livre Brazil Gift Cards" +msgstr "" #: src/js/controllers/buyMercadoLibre.js:98 msgid "Mercadolibre Gift Card Service is not available at this moment. Please try back later." -msgstr "Mercadolibre Gift Card Service is not available at this moment. Please try back later." +msgstr "" #: www/views/modals/txp-details.html:131 msgid "Merchant Message" -msgstr "Merchant Message" +msgstr "" #: www/views/buyAmazon.html:55 #: www/views/buyMercadoLibre.html:54 #: www/views/topup.html:63 msgid "Miner Fee" -msgstr "Miner Fee" +msgstr "" #: src/js/services/bwcError.js:134 msgid "Missing parameter" -msgstr "Missing parameter" +msgstr "" #: src/js/services/bwcError.js:32 msgid "Missing private keys to sign" -msgstr "Missing private keys to sign" +msgstr "" #: www/views/preferences.html:61 #: www/views/preferencesAdvanced.html:3 msgid "More Options" -msgstr "More Options" +msgstr "" #: www/views/includes/walletHistory.html:47 #: www/views/tx-details.html:19 msgid "Moved" -msgstr "Moved" +msgstr "" #: src/js/controllers/tx-details.js:131 msgid "Moved Funds" -msgstr "Moved Funds" +msgstr "" #: www/views/modals/txp-details.html:57 msgid "Multiple recipients" -msgstr "Multiple recipients" +msgstr "" #: www/views/tab-import-phrase.html:8 msgid "NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the Recovery Phrase there." -msgstr "NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the Recovery Phrase there." +msgstr "" #: www/views/addressbook.add.html:21 #: www/views/addressbook.view.html:18 #: www/views/preferences.html:15 #: www/views/preferencesAlias.html:17 msgid "Name" -msgstr "Name" +msgstr "" #: www/views/buyAmazon.html:49 #: www/views/buyMercadoLibre.html:48 #: www/views/topup.html:56 msgid "Network Cost" -msgstr "Network Cost" +msgstr "" #: src/js/services/bwcError.js:47 msgid "Network error" -msgstr "Network error" +msgstr "" #: www/views/includes/walletActivity.html:43 msgid "New Proposal" -msgstr "New Proposal" +msgstr "" #: src/js/controllers/addresses.js:126 msgid "New address could not be generated. Please try again." -msgstr "New address could not be generated. Please try again." +msgstr "" #: www/views/add.html:14 msgid "New personal wallet" -msgstr "New personal wallet" +msgstr "" #: www/views/includes/nextSteps.html:3 msgid "Next steps" -msgstr "Next steps" +msgstr "" #: www/views/tab-receive.html:16 msgid "No Wallet" -msgstr "No Wallet" +msgstr "" #: src/js/controllers/buyAmazon.js:115 #: src/js/controllers/buyMercadoLibre.js:115 msgid "No access key defined" -msgstr "No access key defined" +msgstr "" #: www/views/onboarding/backupRequest.html:5 msgid "No backup, no bitcoin." -msgstr "No backup, no bitcoin." +msgstr "" #: www/views/addressbook.html:19 msgid "No contacts yet" -msgstr "No contacts yet" +msgstr "" #: www/views/preferencesLogs.html:16 msgid "No entries for this log level" -msgstr "No entries for this log level" +msgstr "" #: www/views/preferencesExternal.html:12 msgid "No hardware information available." -msgstr "No hardware information available." +msgstr "" #: www/views/tab-import-hardware.html:3 msgid "No hardware wallets supported on this device" -msgstr "No hardware wallets supported on this device" +msgstr "" #: www/views/proposals.html:24 msgid "No pending proposals" -msgstr "No pending proposals" +msgstr "" #: www/views/activity.html:25 msgid "No recent transactions" -msgstr "No recent transactions" +msgstr "" #: src/js/controllers/buyAmazon.js:44 #: src/js/controllers/topup.js:47 msgid "No signing proposal: No private key" -msgstr "No signing proposal: No private key" +msgstr "" #: www/views/walletDetails.html:204 msgid "No transactions yet" -msgstr "No transactions yet" +msgstr "" #: src/js/controllers/preferencesDelete.js:15 msgid "No wallet found" -msgstr "No wallet found" +msgstr "" #: src/js/controllers/preferencesDelete.js:8 msgid "No wallet selected" -msgstr "No wallet selected" +msgstr "" #: src/js/controllers/buyAmazon.js:300 #: src/js/controllers/buyMercadoLibre.js:292 #: src/js/controllers/confirm.js:85 #: src/js/controllers/topup.js:265 msgid "No wallets available" -msgstr "No wallets available" +msgstr "" #: www/views/paperWallet.html:45 msgid "No wallets available to receive funds" -msgstr "No wallets available to receive funds" +msgstr "" #: www/views/cashScan.html:15 msgid "No wallets eligible for Bitcoin Cash support" -msgstr "No wallets eligible for Bitcoin Cash support" +msgstr "" #: src/js/controllers/cashScan.js:58 msgid "Non BIP44 wallet" -msgstr "Non BIP44 wallet" +msgstr "" #: www/views/cashScan.html:46 msgid "Non eligible BTC wallets" -msgstr "Non eligible BTC wallets" +msgstr "" #: src/js/services/feeService.js:12 msgid "Normal" -msgstr "Normal" +msgstr "" #: src/js/services/bwcError.js:80 msgid "Not authorized" -msgstr "Not authorized" +msgstr "" #: src/js/controllers/confirm.js:307 msgid "Not enough funds for fee" -msgstr "Not enough funds for fee" +msgstr "" #: www/views/onboarding/tour.html:50 msgid "Not even BitPay can access it." -msgstr "Not even BitPay can access it." +msgstr "" #: src/js/controllers/paperWallet.js:47 msgid "Not funds found" -msgstr "Not funds found" +msgstr "" #: www/views/feedback/rateApp.html:3 #: www/views/onboarding/notifications.html:8 msgid "Not now" -msgstr "Not now" +msgstr "" #: www/views/includes/output.html:15 msgid "Note" -msgstr "Note" +msgstr "" #: www/views/backup.html:19 msgid "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase." -msgstr "Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase." +msgstr "" #: www/views/modals/wallets.html:25 msgid "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin" -msgstr "Notice: only 1-1 (single signature) wallets can be used for sell bitcoin" +msgstr "" #: www/views/preferencesNotifications.html:3 #: www/views/tab-settings.html:61 msgid "Notifications" -msgstr "Notifications" +msgstr "" #: www/views/onboarding/collectEmail.html:9 msgid "Notifications by email" -msgstr "Notifications by email" +msgstr "" #: www/views/tx-details.html:117 msgid "Notify me if confirmed" -msgstr "Notify me if confirmed" +msgstr "" #: www/views/preferencesNotifications.html:24 msgid "Notify me when transactions are confirmed" -msgstr "Notify me when transactions are confirmed" +msgstr "" #: www/views/includes/backupNeededPopup.html:8 msgid "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." -msgstr "Now is a good time to backup your wallet. If this device is lost, it is impossible to access your funds without a backup." +msgstr "" #: www/views/backupWarning.html:11 msgid "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" -msgstr "Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?" +msgstr "" #: src/js/controllers/buyAmazon.js:312 #: src/js/controllers/topup.js:286 @@ -2044,30 +2012,30 @@ msgstr "Now is a perfect time to assess your surroundings. Nearby windows? Hidde #: src/js/services/popupService.js:72 #: www/views/modals/chooseFeeLevel.html:6 msgid "OK" -msgstr "OK" +msgstr "" #: www/views/modals/tx-status.html:12 #: www/views/modals/tx-status.html:24 #: www/views/modals/tx-status.html:36 #: www/views/modals/tx-status.html:46 msgid "OKAY" -msgstr "OKAY" +msgstr "" #: www/views/modals/terms.html:15 msgid "Official English Disclaimer" -msgstr "Official English Disclaimer" +msgstr "" #: src/js/controllers/feedback/send.js:64 msgid "Oh no!" -msgstr "Oh no!" +msgstr "" #: src/js/controllers/buyMercadoLibre.js:306 msgid "Ok" -msgstr "Ok" +msgstr "" #: www/views/tab-home.html:39 msgid "On this screen you can see all your wallets, accounts, and assets." -msgstr "On this screen you can see all your wallets, accounts, and assets." +msgstr "" #: src/js/controllers/bitpayCard.js:113 #: src/js/controllers/cashScan.js:19 @@ -2076,56 +2044,56 @@ msgstr "On this screen you can see all your wallets, accounts, and assets." #: src/js/controllers/tab-settings.js:52 #: src/js/controllers/tx-details.js:55 msgid "Open" -msgstr "Open" +msgstr "" #: src/js/controllers/preferencesLanguage.js:13 msgid "Open Crowdin" -msgstr "Open Crowdin" +msgstr "" #: src/js/controllers/preferencesAbout.js:15 msgid "Open GitHub" -msgstr "Open GitHub" +msgstr "" #: src/js/controllers/preferencesAbout.js:13 msgid "Open GitHub Project" -msgstr "Open GitHub Project" +msgstr "" #: src/js/controllers/bitpayCard.js:123 #: src/js/controllers/tx-details.js:192 msgid "Open Explorer" -msgstr "Open Explorer" +msgstr "" #: www/views/tab-scan.html:22 msgid "Open Settings" -msgstr "Open Settings" +msgstr "" #: src/js/controllers/preferencesLanguage.js:11 msgid "Open Translation Community" -msgstr "Open Translation Community" +msgstr "" #: src/js/controllers/onboarding/terms.js:22 msgid "Open Website" -msgstr "Open Website" +msgstr "" #: src/js/controllers/preferencesCash.js:32 msgid "Open bitcoincash.org?" -msgstr "Open bitcoincash.org?" +msgstr "" #: src/js/controllers/cashScan.js:18 msgid "Open the recovery tool." -msgstr "Open the recovery tool." +msgstr "" #: www/views/tab-receive.html:27 msgid "Open wallet" -msgstr "Hardware Wallet" +msgstr "" #: www/views/includes/incomingDataMenu.html:19 msgid "Open website" -msgstr "Open website" +msgstr "" #: www/views/bitpayCardIntro.html:34 msgid "Order the BitPay Card" -msgstr "Order the BitPay Card" +msgstr "" #: www/views/join.html:105 #: www/views/join.html:96 @@ -2136,347 +2104,343 @@ msgstr "Order the BitPay Card" #: www/views/tab-import-file.html:18 #: www/views/tab-import-phrase.html:41 msgid "Password" -msgstr "Password" +msgstr "" #: src/js/controllers/import.js:98 msgid "Password required. Make sure to enter your password in advanced options" -msgstr "Password required. Make sure to enter your password in advanced options" +msgstr "" #: www/views/join.html:33 msgid "Paste invitation here" -msgstr "Paste invitation here" +msgstr "" #: www/views/tab-import-file.html:13 msgid "Paste the backup plain text code" -msgstr "Paste the backup plain text code" +msgstr "" #: www/views/bitpayCardIntro.html:28 msgid "Pay 0% fees to turn bitcoin into dollars." -msgstr "Pay 0% fees to turn bitcoin into dollars." +msgstr "" #: www/views/modals/paypro.html:18 msgid "Pay To" -msgstr "Pay To" +msgstr "" #: src/js/controllers/modals/txpDetails.js:51 #: www/views/modals/tx-status.html:33 msgid "Payment Accepted" -msgstr "Payment Accepted" +msgstr "" #: www/views/confirm.html:25 msgid "Payment Expires:" -msgstr "Payment Expires:" +msgstr "" #: www/views/modals/txp-details.html:6 msgid "Payment Proposal" -msgstr "Payment Proposal" +msgstr "" #: www/views/modals/tx-status.html:21 msgid "Payment Proposal Created" -msgstr "Payment Proposal Created" +msgstr "" #: www/views/tab-home.html:46 msgid "Payment Proposals" -msgstr "Payment Proposals" +msgstr "" #: src/js/services/payproService.js:32 msgid "Payment Protocol Invalid" -msgstr "Payment Protocol Invalid" +msgstr "" #: src/js/services/payproService.js:18 msgid "Payment Protocol not supported on Chrome App" -msgstr "Payment Protocol not supported on Chrome App" +msgstr "" #: www/views/includes/walletActivity.html:20 msgid "Payment Received" -msgstr "Payment Received" +msgstr "" #: www/views/modals/tx-status.html:43 #: www/views/modals/txp-details.html:43 msgid "Payment Rejected" -msgstr "Payment Rejected" +msgstr "" #: src/js/controllers/modals/txpDetails.js:44 #: www/views/confirm.html:124 #: www/views/includes/walletActivity.html:11 #: www/views/modals/txp-details.html:42 msgid "Payment Sent" -msgstr "Payment Sent" - -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "Share this transaction" +msgstr "" #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" -msgstr "Payment accepted, but not yet broadcasted" +msgstr "" #: www/views/modals/txp-details.html:40 msgid "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." -msgstr "Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created." +msgstr "" #: src/js/services/incomingData.js:152 msgid "Payment address was translated to new Bitcoin Cash address format:" -msgstr "Payment address was translated to new Bitcoin Cash address format:" +msgstr "" #: www/views/modals/txp-details.html:107 msgid "Payment details" -msgstr "Payment details" +msgstr "" #: www/views/modals/paypro.html:6 -msgid "Payment Request" -msgstr "Payment Request" +msgid "Payment request" +msgstr "" #: www/views/mercadoLibreCards.html:22 #: www/views/modals/mercadolibre-card-details.html:39 msgid "Pending" -msgstr "Pending" +msgstr "" #: www/views/proposals.html:4 msgid "Pending Proposals" -msgstr "Pending Proposals" +msgstr "" #: www/views/preferencesDeleteWallet.html:13 msgid "Permanently delete this wallet." -msgstr "Permanently delete this wallet." +msgstr "" #: src/js/services/profileService.js:403 msgid "Personal Wallet" -msgstr "Personal Wallet" +msgstr "" #: www/views/backup.html:25 msgid "Please carefully write down this phrase." -msgstr "Please carefully write down this phrase." +msgstr "" #: www/views/tab-scan.html:20 msgid "Please connect a camera to get started." -msgstr "Please connect a camera to get started." +msgstr "" #: src/js/controllers/import.js:278 msgid "Please enter the recovery phrase" -msgstr "Please enter the recovery phrase" +msgstr "" #: src/js/controllers/create.js:174 #: src/js/controllers/join.js:139 msgid "Please enter the wallet recovery phrase" -msgstr "Please enter the wallet recovery phrase" +msgstr "" #: www/views/modals/pin.html:9 msgid "Please enter your PIN" -msgstr "Please enter your PIN" +msgstr "" #: www/views/backup.html:53 msgid "Please tap each word in the correct order." -msgstr "Please tap each word in the correct order." +msgstr "" #: src/js/services/bwcError.js:101 msgid "Please upgrade Copay to perform this action" -msgstr "Please upgrade Copay to perform this action" +msgstr "" #: www/views/walletDetails.html:142 #: www/views/walletDetails.html:62 msgid "Please wait" -msgstr "Please wait" +msgstr "" #: src/js/controllers/import.js:238 msgid "Please, select your backup file" -msgstr "Please, select your backup file" +msgstr "" #: www/views/bitpayCard.html:81 msgid "Pre-Auth Holds" -msgstr "Pre-Auth Holds" +msgstr "" #: www/views/tab-settings.html:40 msgid "Preferences" -msgstr "Preferences" +msgstr "" #: src/js/services/onGoingProcess.js:38 msgid "Preparing addresses..." -msgstr "Preparing addresses..." +msgstr "" #: src/js/controllers/export.js:198 msgid "Preparing backup..." -msgstr "Preparing backup..." +msgstr "" #: src/js/routes.js:1264 msgid "Press again to exit" -msgstr "Press again to exit" +msgstr "" #: src/js/services/feeService.js:11 msgid "Priority" -msgstr "Priority" +msgstr "" #: www/views/includes/incomingDataMenu.html:80 msgid "Private Key" -msgstr "Private Key" +msgstr "" #: src/js/controllers/paperWallet.js:136 msgid "Private key encrypted. Enter password" -msgstr "Private key encrypted. Enter password" +msgstr "" #: src/js/services/bwcError.js:35 msgid "Private key is encrypted, cannot sign" -msgstr "Private key is encrypted, cannot sign" +msgstr "" #: www/views/includes/walletActivity.html:51 msgid "Proposal Accepted" -msgstr "Proposal Accepted" +msgstr "" #: src/js/controllers/modals/txpDetails.js:61 #: src/js/controllers/tx-details.js:78 #: www/views/confirm.html:125 msgid "Proposal Created" -msgstr "Proposal Created" +msgstr "" #: www/views/includes/walletActivity.html:27 msgid "Proposal Deleted" -msgstr "Proposal Deleted" +msgstr "" #: www/views/includes/walletActivity.html:35 msgid "Proposal Rejected" -msgstr "Proposal Rejected" +msgstr "" #: www/views/walletDetails.html:189 msgid "Proposals" -msgstr "Proposals" +msgstr "" #: src/js/controllers/buyAmazon.js:282 msgid "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" -msgstr "Purchase Amount is limited to {{limitPerDay}} {{currency}} per day" +msgstr "" #: src/js/controllers/buyMercadoLibre.js:281 msgid "Purchase amount must be a value between 50 and 2000" -msgstr "Purchase amount must be a value between 50 and 2000" +msgstr "" #: www/views/onboarding/notifications.html:3 msgid "Push Notifications" -msgstr "Push Notifications" +msgstr "" #: www/views/preferencesNotifications.html:17 msgid "Push notifications for {{appName}} are currently disabled. Enable them in the Settings app." -msgstr "Push notifications for {{appName}} are currently disabled. Enable them in the Settings app." +msgstr "" #: www/views/export.html:17 msgid "QR Code" -msgstr "QR Code" +msgstr "" #: www/views/onboarding/disclaimer.html:13 msgid "Quick review!" -msgstr "Quick review!" +msgstr "" #: src/js/controllers/create.js:84 #: src/js/controllers/join.js:68 msgid "Random" -msgstr "Random" +msgstr "" #: www/views/feedback/rateApp.html:14 msgid "Rate on the app store" -msgstr "Rate on the app store" +msgstr "" #: www/views/addresses.html:52 msgid "Read less" -msgstr "Read less" +msgstr "" #: www/views/addresses.html:51 msgid "Read more" -msgstr "Read more" +msgstr "" #: src/js/controllers/preferences.js:65 #: src/js/controllers/tx-details.js:54 msgid "Read more in our Wiki" -msgstr "Read more in our Wiki" +msgstr "" #: src/js/controllers/cashScan.js:61 msgid "Read only wallet" -msgstr "Read only wallet" +msgstr "" #: www/views/tab-receive.html:3 #: www/views/tabs.html:7 msgid "Receive" -msgstr "Receive" +msgstr "" #: www/views/customAmount.html:44 msgid "Receive in" -msgstr "Receive in" +msgstr "" #: www/views/includes/walletHistory.html:24 #: www/views/tx-details.html:18 msgid "Received" -msgstr "Received" +msgstr "" #: src/js/controllers/tx-details.js:130 msgid "Received Funds" -msgstr "Received Funds" +msgstr "" #: www/views/includes/walletHistory.html:57 #: www/views/tx-details.html:24 msgid "Receiving" -msgstr "Receiving" +msgstr "" #: www/views/bitpayCard.html:60 #: www/views/includes/walletHistory.html:3 msgid "Recent" -msgstr "Recent" +msgstr "" #: www/views/advancedSettings.html:21 msgid "Recent Transaction Card" -msgstr "Recent Transaction Card" +msgstr "" #: www/views/activity.html:4 #: www/views/tab-home.html:58 msgid "Recent Transactions" -msgstr "Recent Transactions" +msgstr "" #: www/views/amount.html:18 #: www/views/tab-send.html:9 msgid "Recipient" -msgstr "Recipient" +msgstr "" #: www/views/modals/txp-details.html:62 msgid "Recipients" -msgstr "Recipients" +msgstr "" #: www/views/import.html:12 msgid "Recovery phrase" -msgstr "Recovery phrase" +msgstr "" #: src/js/services/onGoingProcess.js:26 msgid "Recreating Wallet..." -msgstr "Recreating Wallet..." +msgstr "" #: www/views/modals/mercadolibre-card-details.html:22 msgid "Redeem now" -msgstr "Redeem now" +msgstr "" #: src/js/controllers/modals/txpDetails.js:63 #: src/js/controllers/tx-details.js:80 msgid "Rejected" -msgstr "Rejected" +msgstr "" #: src/js/services/onGoingProcess.js:27 msgid "Rejecting payment proposal" -msgstr "Rejecting payment proposal" +msgstr "" #: www/views/preferencesAbout.html:9 msgid "Release information" -msgstr "Release information" +msgstr "" #: www/views/addressbook.view.html:36 #: www/views/modals/mercadolibre-card-details.html:69 msgid "Remove" -msgstr "Remove" +msgstr "" #: src/js/controllers/preferencesBitpayServices.js:7 msgid "Remove BitPay Account?" -msgstr "Remove BitPay Account?" +msgstr "" #: src/js/controllers/preferencesBitpayServices.js:19 msgid "Remove BitPay Card?" -msgstr "Remove BitPay Card?" +msgstr "" #: src/js/controllers/preferencesBitpayServices.js:8 msgid "Removing your BitPay account will remove all associated BitPay account data from this device. Are you sure you would like to remove your BitPay Account ({{email}}) from this device?" -msgstr "Removing your BitPay account will remove all associated BitPay account data from this device. Are you sure you would like to remove your BitPay Account ({{email}}) from this device?" +msgstr "" #: www/views/join.html:116 #: www/views/join.html:124 @@ -2486,43 +2450,43 @@ msgstr "Removing your BitPay account will remove all associated BitPay account d #: www/views/tab-create-shared.html:123 #: www/views/tab-export-file.html:17 msgid "Repeat password" -msgstr "Repeat password" +msgstr "" #: www/views/tab-export-file.html:16 msgid "Repeat the password" -msgstr "Repeat the password" +msgstr "" #: www/views/preferences.html:56 msgid "Request Fingerprint" -msgstr "Request Fingerprint" +msgstr "" #: www/views/tab-receive.html:45 msgid "Request Specific amount" -msgstr "Request Specific amount" +msgstr "" #: www/views/preferences.html:42 msgid "Request Spending Password" -msgstr "Request Spending Password" +msgstr "" #: www/views/tab-create-shared.html:44 msgid "Required number of signatures" -msgstr "Required number of signatures" +msgstr "" #: www/views/onboarding/welcome.html:9 msgid "Restore from backup" -msgstr "Restore from backup" +msgstr "" #: src/js/services/onGoingProcess.js:29 msgid "Retrieving inputs information" -msgstr "Retrieving inputs information" +msgstr "" #: src/js/controllers/onboarding/tour.js:56 msgid "Retry" -msgstr "Retry" +msgstr "" #: www/views/tab-scan.html:23 msgid "Retry Camera" -msgstr "Retry Camera" +msgstr "" #: www/views/addressbook.add.html:56 #: www/views/includes/note.html:9 @@ -2530,290 +2494,292 @@ msgstr "Retry Camera" #: www/views/preferencesBwsUrl.html:25 #: www/views/preferencesNotifications.html:46 msgid "Save" -msgstr "Save" +msgstr "" #: www/views/tab-scan.html:3 #: www/views/tabs.html:11 msgid "Scan" -msgstr "Scan" +msgstr "" #: www/views/tab-scan.html:15 msgid "Scan QR Codes" -msgstr "Scan QR Codes" +msgstr "" #: www/views/addresses.html:31 msgid "Scan addresses for funds" -msgstr "Scan addresses for funds" +msgstr "" #: www/views/modals/fingerprintCheck.html:11 msgid "Scan again" -msgstr "Scan again" +msgstr "" #: src/js/services/fingerprintService.js:56 msgid "Scan your fingerprint please" -msgstr "Scan your fingerprint please" +msgstr "" #: www/views/preferencesCash.html:23 msgid "Scan your wallets for Bitcoin Cash" -msgstr "Scan your wallets for Bitcoin Cash" +msgstr "" #: src/js/services/onGoingProcess.js:30 msgid "Scanning Wallet funds..." -msgstr "Scanning Wallet funds..." +msgstr "" #: www/views/includes/walletList.html:11 msgid "Scanning funds..." -msgstr "Scanning funds..." +msgstr "" #: www/views/includes/screenshotWarningModal.html:7 msgid "Screenshots are not secure" -msgstr "Screenshots are not secure" +msgstr "" #: www/views/modals/search.html:6 msgid "Search Transactions" -msgstr "Search Transactions" +msgstr "" #: www/views/tab-send.html:13 msgid "Search or enter bitcoin address" -msgstr "Search or enter bitcoin address" +msgstr "" #: src/js/controllers/tab-send.js:28 msgid "Clipboard" -msgstr "Clipboard" +msgstr "" #: src/js/controllers/tab-send.js:29 msgid "Your Clipboard is empty" -msgstr "Your Clipboard is empty" +msgstr "" #: www/views/modals/search.html:16 msgid "Search transactions" -msgstr "Search transactions" +msgstr "" #: www/views/preferencesAltCurrency.html:14 msgid "Search your currency" -msgstr "Search your currency" +msgstr "" #: www/views/preferences.html:30 msgid "Security" -msgstr "Security" +msgstr "" #: www/views/modals/mercadolibre-card-details.html:64 msgid "See invoice" -msgstr "See invoice" +msgstr "" #: www/views/tab-import-file.html:7 msgid "Select a backup file" -msgstr "Select a backup file" +msgstr "" #: src/js/controllers/tab-receive.js:139 msgid "Select a wallet" -msgstr "Select a wallet" +msgstr "" #: www/views/modals/paypro.html:38 msgid "Self-signed Certificate" -msgstr "Self-signed Certificate" +msgstr "" #: src/js/services/onGoingProcess.js:41 msgid "Selling Bitcoin..." -msgstr "Selling Bitcoin..." +msgstr "" #: www/views/feedback/send.html:13 #: www/views/feedback/send.html:43 #: www/views/tab-send.html:3 #: www/views/tabs.html:15 msgid "Send" -msgstr "Send" +msgstr "" #: www/views/feedback/send.html:3 #: www/views/tab-settings.html:29 msgid "Send Feedback" -msgstr "Send Feedback" +msgstr "" #: www/views/addressbook.view.html:31 msgid "Send Money" -msgstr "Send Money" +msgstr "" #: www/views/allAddresses.html:19 msgid "Send addresses by email" -msgstr "Send addresses by email" +msgstr "" #: www/views/includes/logOptions.html:17 #: www/views/tab-export-file.html:82 msgid "Send by email" -msgstr "Send by email" +msgstr "" #: src/js/controllers/confirm.js:177 #: src/js/controllers/tab-send.js:94 msgid "Send from" -msgstr "Send from" +msgstr "" #: src/js/controllers/tab-send.js:77 msgid "Send to" -msgstr "Send to" +msgstr "" #: www/views/tab-send.html:20 msgid "Paste Clipboard" -msgstr "Paste Clipboard" +msgstr "" #: www/views/tab-send.html:21 msgid "Paste Address" -msgstr "Paste Address" +msgstr "" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "Transfer between wallets" +msgid "Wallet to Wallet Transfer" +msgstr "" #: www/views/tab-send.html:35 msgid "Scan QR Code" -msgstr "Scan QR Code" +msgstr "" #: www/views/tab-send.html:46 msgid "Send Bitcoin faster!" -msgstr "Send Bitcoin faster!" +msgstr "" + +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "" #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" -msgstr "Save frequently used addresses and send them Bitcoin in just one tap" +msgstr "" #: www/views/tab-send.html:55 msgid "Add your first contact" -msgstr "Add your first contact" +msgstr "" #: www/views/tab-send.html:65 msgid "Your Bitcoin wallet is empty" -msgstr "Your Bitcoin wallet is empty" +msgstr "" #: www/views/tab-send.html:69 msgid "To get started, buy Bitcoin Cash (BCH) or Bitcoin Core (BTC), or share your address." -msgstr "To get started, buy Bitcoin Cash (BCH) or Bitcoin Core (BTC), or share your address." +msgstr "" #: www/views/tab-send.html:70 msgid "You can receive bitcoin from any wallet or service." -msgstr "You can receive bitcoin from any wallet or service." +msgstr "" #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." -msgstr "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "" #: www/views/tab-send.html:74 msgid "Buy Bitcoin now" -msgstr "Buy Bitcoin now" +msgstr "" #: www/views/tab-send.html:76 msgid "Show my address" -msgstr "Show my address" +msgstr "" #: www/views/includes/itemSelector.html:8 msgid "Send max amount" -msgstr "Send max amount" +msgstr "" #: www/views/includes/incomingDataMenu.html:46 msgid "Send payment to this address" -msgstr "Send payment to this address" +msgstr "" #: www/views/feedback/rateApp.html:17 msgid "Send us feedback instead" -msgstr "Send us feedback instead" +msgstr "" #: www/views/confirm.html:15 #: www/views/includes/txp.html:12 #: www/views/modals/txp-details.html:19 #: www/views/tx-details.html:23 msgid "Sending" -msgstr "Sending" +msgstr "" #: src/js/services/onGoingProcess.js:39 msgid "Sending 2FA code..." -msgstr "Sending 2FA code..." +msgstr "" #: src/js/services/onGoingProcess.js:36 msgid "Sending feedback..." -msgstr "Sending feedback..." +msgstr "" #: www/views/confirm.html:16 msgid "Sending maximum amount" -msgstr "Sending maximum amount" +msgstr "" #: src/js/services/onGoingProcess.js:31 msgid "Sending transaction" -msgstr "Sending transaction" +msgstr "" #: src/js/controllers/confirm.js:545 msgid "Sending {{amountStr}} from your {{name}} wallet" -msgstr "Sending {{amountStr}} from your {{name}} wallet" +msgstr "" #: www/views/includes/walletHistory.html:42 #: www/views/modals/tx-status.html:9 #: www/views/topup.html:100 #: www/views/tx-details.html:17 msgid "Sent" -msgstr "Sent" +msgstr "" #: src/js/controllers/tx-details.js:129 msgid "Sent Funds" -msgstr "Sent Funds" +msgstr "" #: src/js/services/bwcError.js:38 msgid "Server response could not be verified" -msgstr "Server response could not be verified" +msgstr "" #: src/js/controllers/buyAmazon.js:97 #: src/js/controllers/buyMercadoLibre.js:97 msgid "Service not available" -msgstr "Service not available" +msgstr "" #: www/views/includes/homeIntegrations.html:3 msgid "Services" -msgstr "Services" +msgstr "" #: www/views/preferencesLogs.html:3 msgid "Session Log" -msgstr "Scan your fingerprint please" +msgstr "" #: www/views/preferencesAbout.html:35 msgid "Session log" -msgstr "Session log" +msgstr "" #: www/views/tab-export-file.html:10 msgid "Set up a password" -msgstr "Set up a password" +msgstr "" #: src/js/controllers/preferencesFee.js:85 msgid "Set your own fee in satoshis/byte" -msgstr "Set your own fee in satoshis/byte" +msgstr "" #: www/views/tab-settings.html:3 #: www/views/tabs.html:19 msgid "Settings" -msgstr "Settings" +msgstr "" #: www/views/feedback/complete.html:17 #: www/views/feedback/complete.html:26 msgid "Share the love by inviting your friends." -msgstr "Share the love by inviting your friends." +msgstr "" #: www/views/copayers.html:20 msgid "Share this invitation with your copayers" -msgstr "Share this invitation with your copayers" +msgstr "" #: src/js/controllers/feedback/complete.js:5 #: www/views/tab-settings.html:36 msgid "Share {{appName}}" -msgstr "Share {{appName}}" +msgstr "" #: www/views/tab-import-hardware.html:24 msgid "Shared Wallet" -msgstr "Shared Wallet" +msgstr "" #: www/views/preferencesExternal.html:34 msgid "Show Recovery Phrase" -msgstr "Show Recovery Phrase" +msgstr "" #: www/views/tab-receive.html:34 msgid "Show address" -msgstr "Show address" +msgstr "" #: www/views/join.html:48 #: www/views/tab-create-personal.html:27 @@ -2823,321 +2789,308 @@ msgstr "Show address" #: www/views/tab-import-hardware.html:30 #: www/views/tab-import-phrase.html:35 msgid "Show advanced options" -msgstr "Show advanced options" +msgstr "" #: www/views/tab-send.html:37 msgid "Show bitcoin address" -msgstr "Show bitcoin address" +msgstr "" #: www/views/tab-send.html:59 msgid "Show more" -msgstr "Show more" +msgstr "" #: src/js/services/bwcError.js:104 msgid "Signatures rejected by server" -msgstr "Signatures rejected by server" +msgstr "" #: src/js/services/onGoingProcess.js:32 msgid "Signing transaction" -msgstr "Signing transaction" +msgstr "" #: www/views/onboarding/backupRequest.html:6 msgid "Since only you control your money, you’ll need to save your backup phrase in case this app is deleted." -msgstr "Since only you control your money, you’ll need to save your backup phrase in case this app is deleted." +msgstr "" #: www/views/tab-create-personal.html:122 #: www/views/tab-create-shared.html:151 msgid "Single Address Wallet" -msgstr "Single Address Wallet" +msgstr "" #: www/views/onboarding/collectEmail.html:40 #: www/views/onboarding/tour.html:11 msgid "Skip" -msgstr "Skip" +msgstr "" #: src/js/controllers/confirm.js:371 #: src/js/controllers/modals/txpDetails.js:47 msgid "Slide to accept" -msgstr "Slide to accept" +msgstr "" #: www/views/buyAmazon.html:96 msgid "Slide to buy" -msgstr "Slide to buy" +msgstr "" #: src/js/controllers/confirm.js:365 msgid "Slide to pay" -msgstr "Slide to pay" +msgstr "" #: src/js/controllers/confirm.js:377 #: src/js/controllers/modals/txpDetails.js:40 msgid "Slide to send" -msgstr "Slide to send" +msgstr "" #: www/views/cashScan.html:56 msgid "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the" -msgstr "Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the" +msgstr "" #: src/js/controllers/create.js:88 #: src/js/controllers/join.js:71 msgid "Specify Recovery Phrase..." -msgstr "Specify Recovery Phrase..." +msgstr "" #: src/js/services/bwcError.js:92 msgid "Spend proposal is not accepted" -msgstr "Spend proposal is not accepted" +msgstr "" #: src/js/services/bwcError.js:95 msgid "Spend proposal not found" -msgstr "Spend proposal not found" +msgstr "" #: src/js/services/bwcError.js:137 msgid "Spending Password needed" -msgstr "Spending Password needed" +msgstr "" #: www/views/walletDetails.html:173 msgid "Spending this balance will need significant Bitcoin network fees" -msgstr "Spending this balance will need significant Bitcoin network fees" +msgstr "" #: www/views/tab-send.html:28 msgid "Start sending bitcoin" -msgstr "Start sending bitcoin" +msgstr "" #: www/views/lockSetup.html:3 msgid "Startup Lock" -msgstr "Startup Lock" +msgstr "" #: www/views/mercadoLibreCards.html:21 #: www/views/modals/mercadolibre-card-details.html:42 msgid "Still pending" -msgstr "Still pending" +msgstr "" #: www/views/topup.html:101 msgid "Success" -msgstr "Success" +msgstr "" #: src/js/services/feeService.js:14 msgid "Super Economy" -msgstr "Super Economy" +msgstr "" #: www/views/preferencesCash.html:11 msgid "Support Bitcoin Cash" -msgstr "Support Bitcoin Cash" +msgstr "" #: www/views/paperWallet.html:7 msgid "Sweep" -msgstr "Sweep" +msgstr "" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" +#: www/views/paperWallet.html:3 msgid "Sweep paper wallet" msgstr "" -#: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" -msgstr "Sweep Paper Wallet" - #: src/js/services/onGoingProcess.js:33 msgid "Sweeping Wallet..." -msgstr "Sweeping Wallet..." +msgstr "" #: www/views/preferencesDeleteWallet.html:16 msgid "THIS ACTION CANNOT BE REVERSED" -msgstr "THIS ACTION CANNOT BE REVERSED" +msgstr "" #: www/views/onboarding/welcome.html:5 msgid "Take control of your money,
get started with bitcoin." -msgstr "Take control of your money,
get started with bitcoin." +msgstr "" #: www/views/walletDetails.html:132 #: www/views/walletDetails.html:52 msgid "Tap and hold to show" -msgstr "Tap and hold to show" +msgstr "" #: www/views/includes/walletInfo.html:3 msgid "Tap to recreate" -msgstr "Tap to recreate" +msgstr "" #: www/views/includes/walletInfo.html:4 msgid "Tap to retry" -msgstr "Tap to retry" +msgstr "" #: www/views/termsOfUse.html:3 msgid "Terms Of Use" -msgstr "Terms Of Use" +msgstr "" #: www/views/modals/terms.html:3 #: www/views/onboarding/disclaimer.html:29 #: www/views/onboarding/disclaimer.html:43 #: www/views/preferencesAbout.html:30 msgid "Terms of Use" -msgstr "Terms of Use" +msgstr "" #: www/views/tab-create-personal.html:118 #: www/views/tab-import-phrase.html:68 msgid "Testnet" -msgstr "Testnet" +msgstr "" #: www/views/includes/incomingDataMenu.html:61 msgid "Text" -msgstr "Text" +msgstr "" #: src/js/controllers/feedback/send.js:27 #: src/js/controllers/feedback/send.js:76 #: www/views/feedback/complete.html:20 #: www/views/feedback/rateApp.html:4 msgid "Thank you!" -msgstr "Thank you!" +msgstr "" #: src/js/controllers/feedback/send.js:72 msgid "Thanks!" -msgstr "Thanks!" +msgstr "" #: src/js/controllers/feedback/send.js:73 msgid "That's exciting to hear. We'd love to earn that fifth star from you – how could we improve your experience?" -msgstr "That's exciting to hear. We'd love to earn that fifth star from you – how could we improve your experience?" +msgstr "" #: src/js/services/ledger.js:152 msgid "The Ledger Chrome application is not installed" -msgstr "The Ledger Chrome application is not installed" +msgstr "" #: www/views/modals/wallet-balance.html:55 msgid "The amount of bitcoin immediately spendable from this wallet." -msgstr "The amount of bitcoin immediately spendable from this wallet." +msgstr "" #: www/views/modals/wallet-balance.html:93 msgid "The amount of bitcoin stored in this wallet that is allocated as inputs to your pending transaction proposals. The amount is determined using unspent transaction outputs associated with this wallet and may be more than the actual amounts associated with your pending transaction proposals." -msgstr "The amount of bitcoin stored in this wallet that is allocated as inputs to your pending transaction proposals. The amount is determined using unspent transaction outputs associated with this wallet and may be more than the actual amounts associated with your pending transaction proposals." +msgstr "" #: www/views/modals/wallet-balance.html:74 msgid "The amount of bitcoin stored in this wallet with less than 1 blockchain confirmation." -msgstr "The amount of bitcoin stored in this wallet with less than 1 blockchain confirmation." +msgstr "" #: www/views/tab-import-phrase.html:5 msgid "The derivation path" -msgstr "The derivation path" +msgstr "" #: www/views/onboarding/tour.html:37 msgid "The exchange rate changes with the market." -msgstr "The exchange rate changes with the market." +msgstr "" #: www/views/preferencesFee.html:12 msgid "The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy." -msgstr "The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy." +msgstr "" #: www/views/addresses.html:51 msgid "The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab." -msgstr "The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab." +msgstr "" #: src/js/controllers/onboarding/terms.js:21 msgid "The official English Terms of Service are available on the BitPay website." -msgstr "The official English Terms of Service are available on the BitPay website." +msgstr "" #: www/views/tab-import-phrase.html:4 msgid "The password of the recovery phrase (if set)" -msgstr "The password of the recovery phrase (if set)" +msgstr "" #: src/js/services/walletService.js:1139 msgid "The payment was created but could not be completed. Please try again from home screen" -msgstr "The payment was created but could not be completed. Please try again from home screen" +msgstr "" #: www/views/modals/txp-details.html:26 msgid "The payment was removed by creator" -msgstr "The payment was removed by creator" +msgstr "" #: www/views/join.html:91 #: www/views/tab-create-personal.html:63 #: www/views/tab-create-shared.html:92 #: www/views/tab-import-phrase.html:43 msgid "The recovery phrase could require a password to be imported" -msgstr "The recovery phrase could require a password to be imported" +msgstr "" #: src/js/services/bwcError.js:56 msgid "The request could not be understood by the server" -msgstr "The request could not be understood by the server" +msgstr "" #: www/views/addresses.html:52 msgid "The restore process will stop when 20 addresses are generated in a row which contain no funds. To safely generate more addresses, make a payment to one of the unused addresses which has already been generated." -msgstr "The restore process will stop when 20 addresses are generated in a row which contain no funds. To safely generate more addresses, make a payment to one of the unused addresses which has already been generated." +msgstr "" #: src/js/services/bwcError.js:98 msgid "The spend proposal is not pending" -msgstr "The spend proposal is not pending" +msgstr "" #: www/views/modals/wallet-balance.html:36 msgid "The total amount of bitcoin stored in this wallet." -msgstr "The total amount of bitcoin stored in this wallet." +msgstr "" #: www/views/preferencesHistory.html:27 msgid "The transaction history and every new incoming transaction are cached in the app. This feature clean this up and synchronizes again from the server" -msgstr "The transaction history and every new incoming transaction are cached in the app. This feature clean this up and synchronizes again from the server" +msgstr "" #: www/views/tab-import-phrase.html:6 msgid "The wallet service URL" -msgstr "The wallet service URL" +msgstr "" #: src/js/controllers/tab-home.js:38 msgid "There is a new version of {{appName}} available" -msgstr "There is a new version of {{appName}} available" +msgstr "" #: src/js/controllers/import.js:229 #: src/js/controllers/import.js:254 #: src/js/controllers/import.js:335 msgid "There is an error in the form" -msgstr "There is an error in the form" +msgstr "" #: src/js/controllers/feedback/send.js:61 #: src/js/controllers/feedback/send.js:65 msgid "There's obviously something we're doing wrong." -msgstr "There's obviously something we're doing wrong." +msgstr "" #: src/js/controllers/feedback/rateCard.js:38 msgid "This app is fantastic!" -msgstr "This app is fantastic!" +msgstr "" #: www/views/onboarding/tour.html:47 msgid "This app stores your bitcoin with cutting-edge security." -msgstr "This app stores your bitcoin with cutting-edge security." +msgstr "" #: src/js/controllers/confirm.js:523 msgid "This bitcoin payment request has expired." -msgstr "This bitcoin payment request has expired." - -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "Payment expires:" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "Payment request has expired" +msgstr "" #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 msgid "This password cannot be recovered. If the password is lost, there is no way you could recover your funds." -msgstr "This password cannot be recovered. If the password is lost, there is no way you could recover your funds." +msgstr "" #: www/views/backup.html:31 msgid "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." -msgstr "This recovery phrase was created with a password. To recover this wallet both the recovery phrase and password are needed." +msgstr "" #: www/views/tx-details.html:91 msgid "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." -msgstr "This transaction amount is too small compared to current Bitcoin network fees. Spending these funds will need a Bitcoin network fee cost comparable to the funds itself." +msgstr "" #: www/views/tx-details.html:87 msgid "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" -msgstr "This transaction could take a long time to confirm or could be dropped due to the low fees set by the sender" +msgstr "" #: www/views/walletDetails.html:109 #: www/views/walletDetails.html:29 msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." -msgstr "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information." +msgstr "" #: www/views/modals/txp-details.html:136 #: www/views/tx-details.html:121 msgid "Timeline" -msgstr "Timeline" +msgstr "" #: www/views/confirm.html:31 #: www/views/includes/output.html:2 @@ -3146,388 +3099,372 @@ msgstr "Timeline" #: www/views/tx-details.html:41 #: www/views/tx-details.html:53 msgid "To" -msgstr "To" +msgstr "" #: www/views/tab-send.html:32 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." -msgstr "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." +msgstr "" + +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "" #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" -msgstr "To {{reason}} you must first add your BitPay account - {{email}}" +msgstr "" #: src/js/services/onGoingProcess.js:48 msgid "Top up in progress..." -msgstr "Top up in progress..." +msgstr "" #: src/js/controllers/topup.js:206 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" -msgstr "Top up {{amountStr}} to debit card ({{cardLastNumber}})" - -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "Start ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "Exchange your BTC to BCH in minutes." - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "To start the process you need to add funds to your wallet." - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "The process is fast and you will receive the exchanged amount in your wallet." - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." +msgstr "" #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 #: www/views/topup.html:70 msgid "Total" -msgstr "Total" +msgstr "" #: www/views/walletDetails.html:196 msgid "Total Locked Balance" -msgstr "Total Locked Balance" +msgstr "" #: www/views/tab-create-shared.html:35 msgid "Total number of copayers" -msgstr "Total number of copayers" +msgstr "" #: www/views/addresses.html:81 msgid "Total wallet inputs" -msgstr "Total wallet inputs" +msgstr "" #: src/js/services/fingerprintService.js:63 #: src/js/services/fingerprintService.js:68 msgid "Touch ID Failed" -msgstr "Touch ID Failed" +msgstr "" #: src/js/controllers/tx-details.js:12 msgid "Transaction" -msgstr "Transaction" +msgstr "" #: www/views/confirm.html:126 msgid "Transaction Created" -msgstr "Transaction Created" +msgstr "" #: www/views/preferencesAdvanced.html:29 #: www/views/preferencesHistory.html:3 msgid "Transaction History" -msgstr "Transaction History" +msgstr "" #: src/js/services/bwcError.js:83 msgid "Transaction already broadcasted" -msgstr "Transaction already broadcasted" +msgstr "" #: src/js/controllers/buyAmazon.js:308 #: src/js/controllers/buyMercadoLibre.js:301 #: src/js/controllers/topup.js:281 msgid "Transaction has not been created" -msgstr "Transaction has not been created" +msgstr "" #: www/views/topup.html:104 msgid "Transaction initiated" -msgstr "Transaction initiated" +msgstr "" #: src/js/controllers/tx-details.js:119 msgid "Transaction not available at this time" -msgstr "Transaction not available at this time" +msgstr "" #: src/js/controllers/activity.js:45 #: src/js/controllers/tab-home.js:174 msgid "Transaction not found" -msgstr "Transaction not found" +msgstr "" #: www/views/modals/chooseFeeLevel.html:55 msgid "Transactions without fee are not supported." -msgstr "Transactions without fee are not supported." +msgstr "" #: src/js/controllers/paperWallet.js:109 msgid "Transfer to" -msgstr "Transfer to" +msgstr "" #: www/views/tab-send.html:67 msgid "Transfer to Wallet" -msgstr "Transfer to Wallet" +msgstr "" #: www/views/modals/pin.html:13 msgid "Try again in {{expires}}" -msgstr "Try again in {{expires}}" +msgstr "" #: www/views/bitpayCardIntro.html:18 msgid "Turn bitcoin into dollars, swipe anywhere Visa® is accepted." -msgstr "Turn bitcoin into dollars, swipe anywhere Visa® is accepted." +msgstr "" #: www/views/tab-import-phrase.html:17 msgid "Type the Recovery Phrase (usually 12 words)" -msgstr "Type the Recovery Phrase (usually 12 words)" +msgstr "" #: src/js/controllers/backup.js:75 msgid "Uh oh..." -msgstr "Uh oh..." +msgstr "" #: www/views/tx-details.html:100 msgid "Unconfirmed" -msgstr "Unconfirmed" +msgstr "" #: www/views/walletDetails.html:190 msgid "Unsent transactions" -msgstr "Unsent transactions" +msgstr "" #: www/views/addresses.html:39 msgid "Unused Addresses" -msgstr "Unused Addresses" +msgstr "" #: www/views/addresses.html:50 msgid "Unused Addresses Limit" -msgstr "Unused Addresses Limit" +msgstr "" #: src/js/controllers/tab-home.js:146 msgid "Update Available" -msgstr "Update Available" +msgstr "" #: www/views/proposals.html:14 msgid "Updating pending proposals. Please stand by" -msgstr "Updating pending proposals. Please stand by" +msgstr "" #: www/views/walletDetails.html:217 msgid "Updating transaction history. Please stand by." -msgstr "Updating transaction history. Please stand by." +msgstr "" #: www/views/activity.html:14 msgid "Updating... Please stand by" -msgstr "Updating... Please stand by" +msgstr "" #: src/js/services/feeService.js:10 msgid "Urgent" -msgstr "Urgent" +msgstr "" #: www/views/advancedSettings.html:12 msgid "Use Unconfirmed Funds" -msgstr "Use Unconfirmed Funds" +msgstr "" #: src/js/services/onGoingProcess.js:34 msgid "Validating recovery phrase..." -msgstr "Validating recovery phrase..." +msgstr "" #: www/views/modals/fingerprintCheck.html:4 msgid "Verify your identity" -msgstr "Verify your identity" +msgstr "" #: www/views/preferencesAbout.html:14 #: www/views/preferencesExternal.html:25 msgid "Version" -msgstr "Version" +msgstr "" #: www/views/tab-export-file.html:69 msgid "View" -msgstr "View" +msgstr "" #: www/views/addresses.html:34 msgid "View All Addresses" -msgstr "View All Addresses" +msgstr "" #: src/js/controllers/onboarding/terms.js:20 msgid "View Terms of Service" -msgstr "View Terms of Service" +msgstr "" #: src/js/controllers/bitpayCard.js:122 #: src/js/controllers/tx-details.js:191 msgid "View Transaction on Explorer.Bitcoin.com" -msgstr "View Transaction on Explorer.Bitcoin.com" +msgstr "" #: src/js/controllers/tab-home.js:148 msgid "View Update" -msgstr "View Update" +msgstr "" #: www/views/tx-details.html:147 msgid "View on blockchain" -msgstr "View on blockchain" +msgstr "" #: www/views/mercadoLibre.html:26 msgid "Visit mercadolivre.com.br →" -msgstr "Visit mercadolivre.com.br →" +msgstr "" #: www/views/walletDetails.html:182 msgid "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." -msgstr "WARNING: Key derivation is not working on this device/wallet. Actions cannot be performed on this wallet." +msgstr "" #: www/views/tab-export-file.html:45 msgid "WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export." -msgstr "WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export." +msgstr "" #: www/views/tab-export-file.html:36 msgid "WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export." -msgstr "WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export." +msgstr "" #: www/views/modals/paypro.html:42 msgid "WARNING: UNTRUSTED CERTIFICATE" -msgstr "WARNING: UNTRUSTED CERTIFICATE" +msgstr "" #: src/js/services/onGoingProcess.js:15 msgid "Waiting for Ledger..." -msgstr "Waiting for Ledger..." +msgstr "" #: src/js/services/onGoingProcess.js:16 msgid "Waiting for Trezor..." -msgstr "Waiting for Trezor..." +msgstr "" #: www/views/copayers.html:48 msgid "Waiting for copayers" -msgstr "Waiting for copayers" +msgstr "" #: www/views/copayers.html:53 msgid "Waiting..." -msgstr "Waiting..." +msgstr "" #: www/views/addresses.html:3 #: www/views/preferencesAdvanced.html:17 msgid "Wallet Addresses" -msgstr "Wallet Addresses" +msgstr "" #: www/views/preferencesColor.html:4 msgid "Wallet Color" -msgstr "Wallet Color" +msgstr "" #: www/views/preferencesInformation.html:29 msgid "Wallet Configuration (m-n)" -msgstr "Wallet Configuration (m-n)" +msgstr "" #: www/views/onboarding/collectEmail.html:5 msgid "Wallet Created" -msgstr "Wallet Created" +msgstr "" #: www/views/preferencesInformation.html:23 msgid "Wallet Id" -msgstr "Wallet Id" +msgstr "" #: www/views/preferencesAdvanced.html:13 #: www/views/preferencesInformation.html:3 msgid "Wallet Information" -msgstr "Wallet Information" +msgstr "" #: www/views/addresses.html:76 msgid "Wallet Inputs" -msgstr "Wallet Inputs" +msgstr "" #: www/views/join.html:26 msgid "Wallet Invitation" -msgstr "Wallet Invitation" +msgstr "" #: www/views/join.html:60 #: www/views/tab-create-personal.html:38 #: www/views/tab-create-shared.html:67 msgid "Wallet Key" -msgstr "Wallet Key" +msgstr "" #: www/views/preferencesAlias.html:4 msgid "Wallet Name" -msgstr "New personal wallet" +msgstr "" #: www/views/preferencesInformation.html:11 msgid "Wallet Name (at creation)" -msgstr "Wallet Name (at creation)" +msgstr "" #: www/views/preferencesInformation.html:35 msgid "Wallet Network" -msgstr "Wallet Network" +msgstr "" #: www/views/join.html:77 #: www/views/tab-create-personal.html:50 #: www/views/tab-create-shared.html:79 msgid "Wallet Recovery Phrase" -msgstr "Wallet Recovery Phrase" +msgstr "" #: src/js/services/bwcError.js:26 msgid "Wallet Recovery Phrase is invalid" -msgstr "Wallet Recovery Phrase is invalid" +msgstr "" #: www/views/preferencesAdvanced.html:25 #: www/views/tab-import-phrase.html:73 msgid "Wallet Service URL" -msgstr "Wallet Service URL" +msgstr "" #: www/views/preferences.html:4 msgid "Wallet Settings" -msgstr "Wallet Settings" +msgstr "" #: www/views/tab-import-hardware.html:11 #: www/views/tab-import-phrase.html:61 msgid "Wallet Type" -msgstr "Wallet Type" +msgstr "" #: src/js/services/bwcError.js:59 msgid "Wallet already exists" -msgstr "Wallet already exists" +msgstr "" #: src/js/services/profileService.js:516 msgid "Wallet already in {{appName}}" -msgstr "Wallet already in {{appName}}" +msgstr "" #: www/views/includes/walletActivity.html:6 msgid "Wallet created" -msgstr "Wallet created" +msgstr "" #: www/views/copayers.html:58 msgid "Wallet incomplete and broken" -msgstr "Wallet incomplete and broken" +msgstr "" #: src/js/services/bwcError.js:65 msgid "Wallet is full" -msgstr "Wallet is full" +msgstr "" #: src/js/services/bwcError.js:125 msgid "Wallet is locked" -msgstr "Wallet is locked" +msgstr "" #: src/js/services/bwcError.js:128 msgid "Wallet is not complete" -msgstr "Wallet is not complete" +msgstr "" #: www/views/tab-create-personal.html:12 #: www/views/tab-create-shared.html:12 msgid "Wallet name" -msgstr "Wallet name" +msgstr "" #: src/js/services/bwcError.js:131 msgid "Wallet needs backup" -msgstr "Wallet needs backup" +msgstr "" #: www/views/tab-receive.html:59 #: www/views/walletDetails.html:169 msgid "Wallet not backed up" -msgstr "Wallet not backed up" +msgstr "" #: src/js/services/bwcError.js:68 msgid "Wallet not found" -msgstr "Wallet not found" +msgstr "" #: src/js/controllers/cashScan.js:81 #: src/js/controllers/tab-home.js:230 msgid "Wallet not registered" -msgstr "Wallet not registered" +msgstr "" #: src/js/services/bwcError.js:29 msgid "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase" -msgstr "Wallet not registered at the wallet service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your recovery phrase" +msgstr "" #: www/views/backup.html:12 msgid "Wallet recovery phrase not available" -msgstr "Wallet recovery phrase not available" +msgstr "" #: src/js/services/bwcError.js:50 msgid "Wallet service not found" -msgstr "Wallet service not found" +msgstr "" #: www/views/tab-home.html:69 msgid "Wallets" -msgstr "Wallets" +msgstr "" #: src/js/controllers/addressbookView.js:36 #: src/js/controllers/modals/txpDetails.js:153 @@ -3536,177 +3473,177 @@ msgstr "Wallets" #: src/js/controllers/preferencesExternal.js:14 #: www/views/preferencesDeleteWallet.html:11 msgid "Warning!" -msgstr "Warning!" +msgstr "" #: www/views/modals/txp-details.html:47 msgid "Warning: this transaction has unconfirmed inputs" -msgstr "Warning: this transaction has unconfirmed inputs" +msgstr "" #: src/js/controllers/onboarding/backupRequest.js:17 msgid "Watch out!" -msgstr "Watch out!" +msgstr "" #: src/js/controllers/feedback/send.js:69 msgid "We'd love to do better." -msgstr "We'd love to do better." +msgstr "" #: www/views/backup.html:35 msgid "We'll confirm on the next screen." -msgstr "We'll confirm on the next screen." +msgstr "" #: src/js/controllers/feedback/send.js:77 msgid "We're always looking for ways to improve {{appName}}." -msgstr "We're always looking for ways to improve {{appName}}." +msgstr "" #: src/js/controllers/feedback/send.js:83 msgid "We're always looking for ways to improve {{appName}}. How could we improve your experience?" -msgstr "We're always looking for ways to improve {{appName}}. How could we improve your experience?" +msgstr "" #: www/views/includes/incomingDataMenu.html:6 msgid "Website" -msgstr "Website" +msgstr "" #: www/views/preferencesLanguage.html:16 msgid "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." -msgstr "We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin." +msgstr "" #: www/views/preferencesAlias.html:11 msgid "What do you call this wallet?" -msgstr "What do you call this wallet?" +msgstr "" #: www/views/preferencesAlias.html:12 msgid "When this wallet was created, it was called “{{walletName}}”. You can change the name displayed on this device below." -msgstr "When this wallet was created, it was called “{{walletName}}”. You can change the name displayed on this device below." +msgstr "" #: www/views/onboarding/collectEmail.html:10 msgid "Where would you like to receive email notifications about payments?" -msgstr "Where would you like to receive email notifications about payments?" +msgstr "" #: www/views/addresses.html:19 msgid "Why?" -msgstr "Why?" +msgstr "" #: www/views/feedback/rateApp.html:10 msgid "Would you be willing to rate {{appName}} in the app store?" -msgstr "Would you be willing to rate {{appName}} in the app store?" +msgstr "" #: www/views/onboarding/notifications.html:4 msgid "Would you like to receive push notifications about payments?" -msgstr "Would you like to receive push notifications about payments?" +msgstr "" #: src/js/controllers/import.js:288 msgid "Wrong number of recovery words:" -msgstr "Wrong number of recovery words:" +msgstr "" #: src/js/services/bwcError.js:140 msgid "Wrong spending password" -msgstr "Wrong spending password" +msgstr "" #: www/views/modals/confirmation.html:7 msgid "Yes" -msgstr "Yes" +msgstr "" #: src/js/controllers/onboarding/backupRequest.js:25 msgid "Yes, skip" -msgstr "Yes, skip" +msgstr "" #: src/js/controllers/onboarding/backupRequest.js:24 msgid "You can create a backup later from your wallet settings." -msgstr "You can create a backup later from your wallet settings." +msgstr "" #: src/js/controllers/preferencesLanguage.js:12 msgid "You can make contributions by signing up on our Crowdin community translation website. We’re looking forward to hearing from you!" -msgstr "You can make contributions by signing up on our Crowdin community translation website. We’re looking forward to hearing from you!" +msgstr "" #: www/views/tab-scan.html:16 msgid "You can scan bitcoin addresses, payment requests, paper wallets, and more." -msgstr "You can scan bitcoin addresses, payment requests, paper wallets, and more." +msgstr "" #: src/js/controllers/preferencesAbout.js:14 msgid "You can see the latest developments and contribute to this open source app by visiting our project on GitHub." -msgstr "You can see the latest developments and contribute to this open source app by visiting our project on GitHub." +msgstr "" #: www/views/onboarding/tour.html:19 msgid "You can spend bitcoin at millions of websites and stores worldwide." -msgstr "You can spend bitcoin at millions of websites and stores worldwide." +msgstr "" #: www/views/backup.html:15 msgid "You can still export it from Advanced > Export." -msgstr "You can still export it from Advanced > Export." +msgstr "" #: www/views/onboarding/tour.html:32 msgid "You can trade it for other currencies like US Dollars, Euros, or Pounds." -msgstr "You can trade it for other currencies like US Dollars, Euros, or Pounds." +msgstr "" #: www/views/onboarding/tour.html:46 msgid "You control your bitcoin." -msgstr "You control your bitcoin." +msgstr "" #: www/views/modals/chooseFeeLevel.html:64 msgid "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." -msgstr "You should not set a fee higher than {{maxFeeRecommended}} satoshis/byte." +msgstr "" #: www/views/modals/bitpay-card-confirmation.html:5 msgid "You will need to log back for fill in your BitPay Card." -msgstr "You will need to log back for fill in your BitPay Card." +msgstr "" #: www/views/preferencesNotifications.html:34 msgid "You'll receive email notifications about payments sent and received from your wallets." -msgstr "You'll receive email notifications about payments sent and received from your wallets." +msgstr "" #: www/views/bitpayCard.html:50 msgid "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." -msgstr "Your BitPay Card is ready. Add funds to your card to start using it at stores and ATMs worldwide." +msgstr "" #: www/views/mercadoLibre.html:57 #: www/views/mercadoLibreCards.html:6 msgid "Your Gift Cards" -msgstr "Your Gift Cards" +msgstr "" #: www/views/includes/confirmBackupPopup.html:6 msgid "Your bitcoin wallet is backed up!" -msgstr "Your bitcoin wallet is backed up!" +msgstr "" #: www/views/tab-home.html:36 msgid "Your bitcoin wallet is ready!" -msgstr "Your bitcoin wallet is ready!" +msgstr "" #: www/views/modals/chooseFeeLevel.html:61 msgid "Your fee is lower than recommended." -msgstr "Your fee is lower than recommended." +msgstr "" #: www/views/feedback/send.html:42 msgid "Your ideas, feedback, or comments" -msgstr "Your ideas, feedback, or comments" +msgstr "" #: www/views/tab-create-shared.html:22 msgid "Your name" -msgstr "Your name" +msgstr "" #: www/views/join.html:16 msgid "Your nickname" -msgstr "Your nickname" +msgstr "" #: www/views/tab-export-file.html:11 #: www/views/tab-import-file.html:20 msgid "Your password" -msgstr "Your password" +msgstr "" #: www/views/buyAmazon.html:102 msgid "Your purchase could not be completed" -msgstr "Your purchase could not be completed" +msgstr "" #: www/views/buyAmazon.html:105 msgid "Your purchase was added to the list of pending" -msgstr "Your purchase was added to the list of pending" +msgstr "" #: www/views/onboarding/backupRequest.html:10 msgid "Your wallet is never saved to cloud storage or standard device backups." -msgstr "Your wallet is never saved to cloud storage or standard device backups." +msgstr "" #: src/js/services/walletService.js:1030 msgid "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." -msgstr "Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down." +msgstr "" #: www/views/includes/walletList.html:13 #: www/views/includes/walletSelector.html:21 @@ -3715,232 +3652,112 @@ msgstr "Your wallet key will be encrypted. The Spending Password cannot be recov #: www/views/walletDetails.html:131 #: www/views/walletDetails.html:51 msgid "[Balance Hidden]" -msgstr "[Balance Hidden]" +msgstr "" #: www/views/walletDetails.html:141 #: www/views/walletDetails.html:61 msgid "[Scanning Funds]" -msgstr "[Scanning Funds]" +msgstr "" #: src/js/controllers/bitpayCardIntro.js:11 msgid "add your BitPay Visa card(s)" -msgstr "add your BitPay Visa card(s)" +msgstr "" #: www/views/includes/available-balance.html:8 msgid "locked by pending payments" -msgstr "locked by pending payments" +msgstr "" #: src/js/services/profileService.js:404 msgid "me" -msgstr "me" +msgstr "" #: www/views/addressbook.add.html:32 msgid "name@example.com" -msgstr "name@example.com" +msgstr "" #: www/views/preferencesHistory.html:15 msgid "preparing..." -msgstr "preparing..." +msgstr "" #: www/views/cashScan.html:57 msgid "recovery tool." -msgstr "recovery tool." +msgstr "" #: src/js/controllers/buyAmazon.js:239 msgid "{{amountStr}} for Amazon.com Gift Card" -msgstr "{{amountStr}} for Amazon.com Gift Card" +msgstr "" #: src/js/controllers/buyMercadoLibre.js:237 msgid "{{amountStr}} for Mercado Livre Brazil Gift Card" -msgstr "{{amountStr}} for Mercado Livre Brazil Gift Card" +msgstr "" #: www/views/preferencesBwsUrl.html:21 msgid "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." -msgstr "{{appName}} depends on Bitcore Wallet Service (BWS) for blockchain information, networking and Copayer synchronization. The default configuration points to https://bws.bitpay.com (BitPay's public BWS instance)." +msgstr "" #: src/js/controllers/confirm.js:408 msgid "{{fee}} will be deducted for bitcoin networking fees." -msgstr "{{fee}} will be deducted for bitcoin networking fees." +msgstr "" #: www/views/confirm.html:85 msgid "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" -msgstr "{{tx.txp[wallet.id].feeRatePerStr}} of the sending amount" +msgstr "" #: www/views/walletDetails.html:218 msgid "{{updatingTxHistoryProgress}} transactions downloaded" -msgstr "{{updatingTxHistoryProgress}} transactions downloaded" +msgstr "" #: www/views/cashScan.html:33 #: www/views/copayers.html:46 #: www/views/includes/walletInfo.html:18 msgid "{{wallet.m}}-of-{{wallet.n}}" -msgstr "{{wallet.m}}-of-{{wallet.n}}" +msgstr "" #: src/js/services/shapeshiftService.js:8 msgid "Shapeshift" -msgstr "Shapeshift" +msgstr "" #: www/views/includes/community.html:3 msgid "Community" -msgstr "Community" +msgstr "" #: src/js/services/communityService.js:40 msgid "Bitcoin Cash Reddit" -msgstr "Bitcoin Cash Reddit" +msgstr "" #: src/js/services/communityService.js:47 msgid "Bitcoin.com Twitter" -msgstr "Bitcoin.com Twitter" +msgstr "" #: www/views/includes/nextSteps.html:3 msgid "Explore Bitcoin.com" -msgstr "Explore Bitcoin.com" +msgstr "" #: src/js/services/bitcoincomService.js:21 msgid "Bitcoin Cash Games" -msgstr "Bitcoin Cash Games" - -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" msgstr "" #: src/js/services/bitcoincomService.js:28 msgid "News" -msgstr "News" +msgstr "" #: src/js/services/bitcoincomService.js:35 msgid "Mining Pool" -msgstr "Mining Pool" +msgstr "" #: src/js/services/bitcoincomService.js:42 msgid "Tools" -msgstr "Tools" +msgstr "" #: src/js/services/bitcoincomService.js:49 msgid "Bitcoin Price Charts" -msgstr "Bitcoin Price Charts" +msgstr "" #: src/js/services/bitcoincomService.js:56 msgid "Free Bitcoin Cash" -msgstr "Free Bitcoin Cash" +msgstr "" #: www/views/tab-home.html:30 msgid "Your Bitcoin Wallets are ready!" -msgstr "Your Bitcoin Wallets are ready!" - -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "Address does not contain currency information, please make sure you are sending the correct currency." - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "Review Transaction" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "You are sending" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "You are shifting" - -#: www/views/review.html:36 -msgid "To:" -msgstr "To:" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "Add personal note" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "Suggested by merchant:" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "Enter text here" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "Personal note:" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "Less than 1 cent" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "This invoice is no longer accepting payments" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "" - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "" - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "" - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "" - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "" - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "" - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" msgstr "" diff --git a/i18n/po/zh-CN/template-zh-CN.po b/i18n/po/zh-CN/template-zh-CN.po index f648a8cd6..eb8304e89 100644 --- a/i18n/po/zh-CN/template-zh-CN.po +++ b/i18n/po/zh-CN/template-zh-CN.po @@ -11,7 +11,7 @@ msgstr "" "Last-Translator: emilold\n" "Language-Team: Chinese Simplified\n" "Language: zh\n" -"PO-Revision-Date: 2018-09-15 05:56\n" +"PO-Revision-Date: 2018-07-27 08:43\n" #: www/views/modals/paypro.html:34 msgid "(Trusted)" @@ -81,26 +81,6 @@ msgstr "帐号" msgid "Instant transactions with low fees" msgstr "以较低费用进行即时交易" -#: www/views/walletSelector.html:49 -msgid "Insufficient funds" -msgstr "资金不足" - -#: www/views/amount.html:42 -msgid "Change Currency" -msgstr "更改货币" - -#: www/views/amount.html:49 -msgid "Available Funds" -msgstr "可用资金" - -#: www/views/amount.html:59 -msgid "Use All Available Funds" -msgstr "使用所有可用资金" - -#: www/views/amount.html:99 -msgid "Next" -msgstr "下一步" - #: www/views/preferencesBitpayServices.html:23 msgid "Accounts" msgstr "帐户" @@ -226,20 +206,6 @@ msgstr "差不多完成了 ！让我们回顾一下。" msgid "Alternative Currency" msgstr "替代货币" -#: www/views/tab-settings.html:75 -msgid "Price Display" -msgstr "价格显示" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:12 -msgid "Fiat" -msgstr "法币" - -#: src/js/controllers/tab-settings.js:19 -#: www/views/preferencesPriceDisplay.html:15 -msgid "Cryptocurrency" -msgstr "加密货币" - #: src/js/controllers/buyAmazon.js:98 msgid "Amazon.com is not available at this moment. Please try back later." msgstr "亚马逊服务器暂时无法访问，请稍候再试。" @@ -520,7 +486,7 @@ msgid "Cannot Create Wallet" msgstr "不能创建钱包" #: src/js/services/profileService.js:442 -msgid "Cannot join the same wallet more than once" +msgid "Cannot join the same wallet more that once" msgstr "无法重复加入同一个钱包" #: www/views/includes/bitpayCardsCard.html:2 @@ -696,7 +662,6 @@ msgstr "Copayer {{$index}}" #: src/js/controllers/copayers.js:79 #: src/js/controllers/export.js:193 -#: src/js/controllers/confirm.js:41 #: www/views/includes/copyToClipboard.html:4 msgid "Copied to clipboard" msgstr "已复制到剪贴板" @@ -1316,7 +1281,6 @@ msgstr "供审计目的" #: www/views/modals/txp-details.html:74 #: www/views/topup.html:34 #: www/views/tx-details.html:52 -#: www/views/review.html:22 msgid "From" msgstr "来自" @@ -1377,6 +1341,10 @@ msgid "Get news and updates from BitPay" msgstr "从 BitPay 获取新闻和更新" #: www/views/onboarding/welcome.html:8 +msgctxt "button" +msgid "Get started" +msgstr "开始使用" + #: www/views/bitpayCard.html:49 msgid "Get started" msgstr "马上体验" @@ -2200,10 +2168,6 @@ msgstr "支付被拒绝" msgid "Payment Sent" msgstr "支付已发送" -#: www/views/includes/slideToAcceptSuccess.html:12 -msgid "Share this transaction" -msgstr "分享此交易" - #: www/views/modals/txp-details.html:32 msgid "Payment accepted, but not yet broadcasted" msgstr "支付已被接受，但尚未广播" @@ -2221,8 +2185,8 @@ msgid "Payment details" msgstr "支付明细" #: www/views/modals/paypro.html:6 -msgid "Payment Request" -msgstr "付款请求" +msgid "Payment request" +msgstr "支付请求" #: www/views/mercadoLibreCards.html:22 #: www/views/modals/mercadolibre-card-details.html:39 @@ -2657,8 +2621,8 @@ msgid "Paste Address" msgstr "粘贴地址" #: www/views/tab-send.html:27 -msgid "Transfer between wallets" -msgstr "在钱包之间转账" +msgid "Wallet to Wallet Transfer" +msgstr "钱包转账" #: www/views/tab-send.html:35 msgid "Scan QR Code" @@ -2668,6 +2632,10 @@ msgstr "扫描二维码" msgid "Send Bitcoin faster!" msgstr "更快地发送比特币！" +#: www/views/tab-send.html:46 +msgid "Send Bitcoin faster!" +msgstr "更快地发送比特币！" + #: www/views/tab-send.html:50 msgid "Save frequently used addresses and send them Bitcoin in just one tap" msgstr "保存常用地址，只需点击一下即可将比特币发送到这些地址" @@ -2689,8 +2657,6 @@ msgid "You can receive bitcoin from any wallet or service." msgstr "您可以从任何钱包或服务接收比特币。" #: www/views/tab-send.html:72 -#: www/views/shapeshift.html:23 -#: www/views/tab-send.html:33 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." msgstr "若要开始，您将需要创建一个比特币的钱包，并获得一些比特币。" @@ -2925,14 +2891,9 @@ msgid "Sweep" msgstr "扫描" #: www/views/includes/incomingDataMenu.html:89 -msgctxt "List item" -msgid "Sweep paper wallet" -msgstr "清空纸钱包" - #: www/views/paperWallet.html:3 -msgctxt "Page title" -msgid "Sweep Paper Wallet" -msgstr "清空纸钱包" +msgid "Sweep paper wallet" +msgstr "Sweep 纸钱包" #: src/js/services/onGoingProcess.js:33 msgid "Sweeping Wallet..." @@ -3100,14 +3061,6 @@ msgstr "此应用程序商店你比特币与尖端的安全。" msgid "This bitcoin payment request has expired." msgstr "这比特币付款请求已过期。" -#: www/views/review.html:55 -msgid "Payment expires:" -msgstr "付款到期：" - -#: www/views/review.html:56 -msgid "Payment request has expired" -msgstr "付款请求已过期" - #: www/views/join.html:133 #: www/views/tab-create-personal.html:103 #: www/views/tab-create-shared.html:132 @@ -3149,6 +3102,10 @@ msgstr "发送到" msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service." msgstr "若要开始，请买比特币或共享您的地址。你可以从任何钱包或服务接收比特币。" +#: www/views/tab-send.html:33 +msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin." +msgstr "首先，您需要创建一个比特币钱包，并获得一些比特币。" + #: src/js/services/bitpayAccountService.js:73 msgid "To {{reason}} you must first add your BitPay account - {{email}}" msgstr "到 {{reason}}，您必须首先添加您的 BitPay 帐户-{{email}}" @@ -3161,26 +3118,6 @@ msgstr "在进展充值..." msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})" msgstr "充值 {{amountStr}}，记入借方卡 ({{cardLastNumber}})" -#: www/views/shapeshift.html:30 -msgid "Start ShapeShift" -msgstr "开始 ShapeShift" - -#: www/views/shapeshift.html:30 -msgid "Exchange your BTC to BCH in minutes." -msgstr "在数分钟内将您的 BTC 兑换为 BCH。" - -#: www/views/shapeshift.html:30 -msgid "To start the process you need to add funds to your wallet." -msgstr "要开始兑换，您需要先向钱包中充入资金。" - -#: www/views/shapeshift.html:30 -msgid "The process is fast and you will receive the exchanged amount in your wallet." -msgstr "兑换操作非常快，您将在自己的钱包中收到兑换后的金额。" - -#: www/views/shapeshift.html:34 -msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction." -msgstr "此服务由第三方 ShapeShift 提供，他们将收取少量服务费。所需费用将在您开始交易之前显示。" - #: www/views/buyAmazon.html:61 #: www/views/buyMercadoLibre.html:60 #: www/views/modals/wallet-balance.html:23 @@ -3797,10 +3734,6 @@ msgstr "探索 Bitcoin.com" msgid "Bitcoin Cash Games" msgstr "Bitcoin Cash 游戏" -#: www/views/includes/community.html:29 -msgid "Share the Wallet App" -msgstr "分享钱包应用" - #: src/js/services/bitcoincomService.js:28 msgid "News" msgstr "新闻" @@ -3825,119 +3758,3 @@ msgstr "免费的 Bitcoin Cash" msgid "Your Bitcoin Wallets are ready!" msgstr "您的比特币钱包已就绪！" -#: src/js/controllers/amount.js:49 -msgid "Address does not contain currency information, please make sure you are sending the correct currency." -msgstr "地址未包含货币信息，请确保您发送的货币正确。" - -#: www/views/review.html:4 -msgid "Review Transaction" -msgstr "检查交易" - -#: src/js/controllers/review.controller.js:36 -msgid "You are sending" -msgstr "您将发送" - -#: src/js/controllers/review.controller.js:66 -msgid "You are shifting" -msgstr "您将兑换" - -#: www/views/review.html:36 -msgid "To:" -msgstr "到：" - -#: www/views/review.html:53 -msgid "Add personal note" -msgstr "添加个人注释" - -#: www/views/review.html:87 -msgid "Suggested by merchant:" -msgstr "商户建议：" - -#: src/js/controllers/review.controller.js:37 -msgid "Enter text here" -msgstr "在此处输入文本" - -#: www/views/review.html:57 -msgid "Personal note:" -msgstr "个人注释：" - -#: www/views/review.html:69 -msgid "Less than 1 cent" -msgstr "少于 1 美分" - -#: src/js/services/incomingData.js:129 -msgid "This invoice is no longer accepting payments" -msgstr "此发票不再接受付款" - -#: www/views/amount.html.js:60 -msgid "Send Maximum Amount" -msgstr "发送最大金额" - -#: src/js/controllers/amount.controller.js:239 -msgid "Unknown error." -msgstr "未知错误。" - -#: www/views/paperWallet.html:48 -msgid "No Bitcoin Cash wallet to transfer funds to found." -msgstr "未找到可以转入资金的 Bitcoin Cash 钱包。" - -#: www/views/paperWallet.html:54 -msgid "No Bitcoin Cash found." -msgstr "未找到 Bitcoin Cash。" - -#: www/views/paperWallet.html:60 -msgid "Bitcoin Core found:" -msgstr "已找到 Bitcoin Core：" - -#: www/views/paperWallet.html:98 -msgid "No Bitcoin Core wallet to transfer funds to found." -msgstr "未找到可以转入资金的 Bitcoin Core 钱包。" - -#: www/views/paperWallet.html:104 -msgid "No Bitcoin Core found." -msgstr "未找到 Bitcoin Core。" - -#: src/js/controllers/tab-scan.js:120 -msgid "Scan Failed" -msgstr "扫描失败" - -#: src/js/controllers/tab-scan.js:121 -msgid "Data not recognised." -msgstr "数据未被识别。" - -#: src/js/controllers/tab-scan.js:121 -msgid "Unsupported" -msgstr "不受支持" - -#: src/js/controllers/tab-scan.js:121 -msgid "Testnet is not supported." -msgstr "不支持测试网。" - -#: www/views/includes/incomingDataMenu.html:81 -msgid "URL" -msgstr "网址" - -#: www/views/includes/incomingDataMenu.html:90 -msgid "Open in web browser" -msgstr "在网络浏览器中打开" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid address" -msgstr "地址无效" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is not defined" -msgstr "未定义金额" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is below the minimun" -msgstr "金额低于最低金额" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Amount is above the limit" -msgstr "金额高于限额" - -#: src/js/services/shapeshift.service.js.html:90 -msgid "Invalid response from Shapeshift" -msgstr "Shapeshift 的响应无效" - diff --git a/package.json b/package.json index e54e3d14d..c1f37b2e6 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "postinstall": "npm run apply:copay && echo && echo \"Repo configured for standard Copay distribution. To switch to the BitPay distribution, run 'npm run apply:bitpay'.\" && echo", "start": "echo && echo \"Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", "apply:copay": "npm i fs-extra@0.30 && cd app-template && node apply.js copay && cd .. && npm i", - "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare && cd ../ && ./fix-asn1.sh", + "apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare", "apply:bitpay": "npm i fs-extra@0.30 && cd app-template && node apply.js bitpay && cd .. && npm i", "unstage-package": "git reset package.json", "clean-all": "git clean -dfx" diff --git a/resources/bitcoin.com/ios/icon/AppIcon24x24@2x.png b/resources/bitcoin.com/ios/icon/AppIcon24x24@2x.png deleted file mode 100644 index 67dddbb02..000000000 Binary files a/resources/bitcoin.com/ios/icon/AppIcon24x24@2x.png and /dev/null differ diff --git a/resources/bitcoin.com/ios/icon/AppIcon27.5x27.5@2x.png b/resources/bitcoin.com/ios/icon/AppIcon27.5x27.5@2x.png deleted file mode 100644 index 0033e910b..000000000 Binary files a/resources/bitcoin.com/ios/icon/AppIcon27.5x27.5@2x.png and /dev/null differ diff --git a/resources/bitcoin.com/ios/icon/AppIcon44x44@2x.png b/resources/bitcoin.com/ios/icon/AppIcon44x44@2x.png deleted file mode 100644 index ac78920fc..000000000 Binary files a/resources/bitcoin.com/ios/icon/AppIcon44x44@2x.png and /dev/null differ diff --git a/resources/bitcoin.com/ios/icon/AppIcon86x86@2x.png b/resources/bitcoin.com/ios/icon/AppIcon86x86@2x.png deleted file mode 100644 index 5a0e05b71..000000000 Binary files a/resources/bitcoin.com/ios/icon/AppIcon86x86@2x.png and /dev/null differ diff --git a/resources/bitcoin.com/ios/icon/AppIcon98x98@2x.png b/resources/bitcoin.com/ios/icon/AppIcon98x98@2x.png deleted file mode 100644 index a0aaf7bd7..000000000 Binary files a/resources/bitcoin.com/ios/icon/AppIcon98x98@2x.png and /dev/null differ diff --git a/resources/bitcoin.com/ios/icon/icon-1024.png b/resources/bitcoin.com/ios/icon/icon-1024.png deleted file mode 100644 index 2950ff8de..000000000 Binary files a/resources/bitcoin.com/ios/icon/icon-1024.png and /dev/null differ diff --git a/resources/bitcoin.com/ios/icon/icon-20.png b/resources/bitcoin.com/ios/icon/icon-20.png deleted file mode 100644 index 323da6465..000000000 Binary files a/resources/bitcoin.com/ios/icon/icon-20.png and /dev/null differ diff --git a/resources/bitcoin.com/mac/pkg/build_mas.py b/resources/bitcoin.com/mac/pkg/build_mas.py index 90f7ad5f0..d067abacd 100755 --- a/resources/bitcoin.com/mac/pkg/build_mas.py +++ b/resources/bitcoin.com/mac/pkg/build_mas.py @@ -178,17 +178,11 @@ def codesign_app(config, args): plistlib.writePlist(child_entitlements, tmp_child_entitlements) info('Child entitlements: %s' % tmp_child_entitlements) - - libffmpeg = glob(os.path.join(args.output, 'Contents/Versions/55.0.2883.87/nwjs Framework.framework/Versions/A'), 'libffmpeg.dylib', returnOnFound=True) - system('codesign --deep --force --verbose --verify --sign "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, libffmpeg)) - libnode = glob(os.path.join(args.output, 'Contents/Versions/55.0.2883.87/nwjs Framework.framework/Versions/A'), 'libnode.dylib', returnOnFound=True) - system('codesign --deep --force --verbose --verify --sign "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, libnode)) - - helperApp = glob(args.output, 'nwjs Helper.app', returnOnFound=True) - system('codesign --deep --force --verbose --verify --sign "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, helperApp)) framework = glob(args.output, 'nwjs Framework.framework', returnOnFound=True) - system('codesign --deep --force --verbose --verify --sign "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, framework)) - + system('codesign -f --verbose -s "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, framework)) + helperApp = glob(args.output, 'nwjs Helper.app', returnOnFound=True) + system('codesign -f --verbose -s "%s" --entitlements %s --deep "%s"' % (identity, tmp_child_entitlements, helperApp)) + ## sign parent app (_, tmp_parent_entitlements) = tempfile.mkstemp() if config.has_option('Sign', 'ParentEntitlements'): diff --git a/resources/bitcoin.com/mac/pkg/entitlements-parent.plist b/resources/bitcoin.com/mac/pkg/entitlements-parent.plist index b39edb569..12d6997e3 100644 --- a/resources/bitcoin.com/mac/pkg/entitlements-parent.plist +++ b/resources/bitcoin.com/mac/pkg/entitlements-parent.plist @@ -5,9 +5,7 @@ com.apple.security.app-sandbox com.apple.security.application-groups - - 299HJ3G3BP.com.bitcoin.mwallet.mac - + $GROUPID com.apple.security.files.user-selected.read-only com.apple.security.network.client diff --git a/src/android/build-extras.gradle b/src/android/build-extras.gradle index e7dd50572..dcc6df0ad 100644 --- a/src/android/build-extras.gradle +++ b/src/android/build-extras.gradle @@ -1,25 +1,21 @@ -ext { - ANDROID_SUPPORT_V4_VERSION = '26.1.0' -} - configurations.all { - resolutionStrategy { - force "com.android.support:support-v4:26.1.0" - force "com.google.android.gms:play-services-auth:11.8.0" - force "com.google.android.gms:play-services-identity:11.8.0" - force "com.google.android.gms:play-services-ads:11.8.0" - force "com.google.android.gms:play-services-base:11.8.0" - force "com.google.android.gms:play-services-gcm:11.8.0" - force "com.google.android.gms:play-services-analytics:11.8.0" - force "com.google.android.gms:play-services-location:11.8.0" - force "com.google.android.gms:play-services-basement:11.8.0" - force "com.google.android.gms:play-services-tagmanager:11.8.0" - force 'com.google.firebase:firebase-core:11.8.0' - force 'com.google.firebase:firebase-crash:11.8.0' - force 'com.google.firebase:firebase-auth:11.8.0' - force 'com.google.firebase:firebase-common:11.8.0' - force 'com.google.firebase:firebase-config:11.8.0' - force 'com.google.firebase:firebase-perf:11.8.0' - force 'com.google.firebase:firebase-messaging:11.8.0' - } + resolutionStrategy { + force "com.android.support:support-v4:26.1.0" + force "com.google.android.gms:play-services-auth:11.8.0" + force "com.google.android.gms:play-services-identity:11.8.0" + force "com.google.android.gms:play-services-ads:11.8.0" + force "com.google.android.gms:play-services-base:11.8.0" + force "com.google.android.gms:play-services-gcm:11.8.0" + force "com.google.android.gms:play-services-analytics:11.8.0" + force "com.google.android.gms:play-services-location:11.8.0" + force "com.google.android.gms:play-services-basement:11.8.0" + force "com.google.android.gms:play-services-tagmanager:11.8.0" + force 'com.google.firebase:firebase-core:11.8.0' + force 'com.google.firebase:firebase-crash:11.8.0' + force 'com.google.firebase:firebase-auth:11.8.0' + force 'com.google.firebase:firebase-common:11.8.0' + force 'com.google.firebase:firebase-config:11.8.0' + force 'com.google.firebase:firebase-perf:11.8.0' + force 'com.google.firebase:firebase-messaging:11.8.0' + } } \ No newline at end of file diff --git a/src/js/app.js b/src/js/app.js index 62ff2e6f4..745ceef50 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -19,9 +19,7 @@ var modules = [ 'copayApp.controllers', 'copayApp.directives', 'copayApp.addons', - 'bitcoincom.controllers', - 'bitcoincom.directives', - 'bitcoincom.services' + 'bitcoincom.directives' ]; var copayApp = window.copayApp = angular.module('copayApp', modules); @@ -31,6 +29,4 @@ angular.module('copayApp.services', []); angular.module('copayApp.controllers', []); angular.module('copayApp.directives', []); angular.module('copayApp.addons', []); -angular.module('bitcoincom.controllers', []); angular.module('bitcoincom.directives', []); -angular.module('bitcoincom.services', []); diff --git a/src/js/controllers/addressbookAdd.js b/src/js/controllers/addressbookAdd.js index ff284b234..9529d943e 100644 --- a/src/js/controllers/addressbookAdd.js +++ b/src/js/controllers/addressbookAdd.js @@ -21,9 +21,6 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu $timeout(function() { var form = addressbookForm; if (data && form) { - if (data.result) { - data = data.result; - } data = data.replace(/^bitcoin(cash)?:/, ''); form.address.$setViewValue(data); form.address.$isValid = true; @@ -39,9 +36,9 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu addressbook.address = translated.legacy; } - var channel = "ga"; - if (platformInfo.isCordova) { - channel = "firebase"; + var channel = "firebase"; + if (platformInfo.isNW) { + channel = "ga"; } var log = new window.BitAnalytics.LogEvent("contact_created", [{ "coin": $scope.addressbookEntry.coin diff --git a/src/js/controllers/addressbookView.js b/src/js/controllers/addressbookView.js index 16df9e559..aab6fb5b4 100644 --- a/src/js/controllers/addressbookView.js +++ b/src/js/controllers/addressbookView.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, sendFlowService, $state, $timeout, lodash, addressbookService, popupService, $ionicHistory, platformInfo, gettextCatalog, configService, bitcoinCashJsService) { +angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, $state, $timeout, lodash, addressbookService, popupService, $ionicHistory, platformInfo, gettextCatalog, configService, bitcoinCashJsService) { var config = configService.getSync(); var defaults = configService.getDefaults(); @@ -21,14 +21,23 @@ angular.module('copayApp.controllers').controller('addressbookViewController', f }); $scope.sendTo = function() { - var stateParams = { - data: $scope.addressbookEntry.address, - toName: $scope.addressbookEntry.name, - toEmail: $scope.addressbookEntry.email, - coin: $scope.addressbookEntry.coin - }; - - sendFlowService.start(stateParams); + $ionicHistory.removeBackView(); + $state.go('tabs.send'); + $timeout(function() { + var to = ''; + if ($scope.addressbookEntry.coin == 'bch') { + var a = 'bitcoincash:' + $scope.addressbookEntry.address; + to = bitcoinCashJsService.readAddress(a).legacy; + } else { + to = $scope.addressbookEntry.address; + } + $state.transitionTo('tabs.send.amount', { + toAddress: to, + toName: $scope.addressbookEntry.name, + toEmail: $scope.addressbookEntry.email, + coin: $scope.addressbookEntry.coin + }); + }, 100); }; $scope.remove = function(addressbookEntry) { diff --git a/src/js/controllers/amount.controller.js b/src/js/controllers/amount.controller.js deleted file mode 100644 index 07f31bb3e..000000000 --- a/src/js/controllers/amount.controller.js +++ /dev/null @@ -1,774 +0,0 @@ -'use strict'; - -(function(){ - -angular - .module('bitcoincom.controllers') - .controller('amountController', amountController); - -function amountController(configService, $filter, gettextCatalog, $ionicHistory, $ionicModal, $ionicScrollDelegate, lodash, $log, nodeWebkitService, rateService, $scope, $state, $timeout, sendFlowService, shapeshiftService, txFormatService, platformInfo, ongoingProcess, popupService, profileService, walletService, $window) { - var vm = this; - - // Variables - vm.allowSend = false; - vm.altCurrencyList = []; - vm.alternativeAmount = ''; - vm.alternativeUnit = ''; - vm.amount = '0'; - vm.availableFunds = ''; - vm.canSendAllAvailableFunds = true; - vm.errorMessage = ''; - // Use insufficient for logic, as when the amount is invalid, funds being - // either sufficent or insufficient doesn't make sense. - vm.fundsAreInsufficient = false; - vm.globalResult = ''; - vm.isRequestingSpecificAmount = false; - vm.listComplete = false; - vm.lastUsedPopularList = []; - vm.maxAmount = 0; - vm.minAmount = 0; - vm.sendableFunds = ''; - vm.showSendMaxButton = false; - vm.showSendLimitMaxButton = false; - vm.thirdParty = false; - vm.unit = ''; - - // Functions - vm.changeUnit = changeUnit; - vm.close = close; - vm.findCurrency = findCurrency; - vm.finish = finish; - vm.goBack = goBack; - vm.loadMore = loadMore; - vm.next = next; - vm.openPopup = openPopup; - vm.pushDigit = pushDigit; - vm.removeDigit = removeDigit; - vm.save = save; - vm.sendMax = sendMax; - - - $scope.$on('$ionicView.beforeEnter', onBeforeEnter); - $scope.$on('$ionicView.leave', onLeave); - - var LENGTH_EXPRESSION_LIMIT = 19; - var LENGTH_BEFORE_COMMA_EXPRESSION_LIMIT = 8; - var LENGTH_AFTER_COMMA_EXPRESSION_LIMIT = 8; - - var altCurrencyModal = null; - var altUnitIndex = 0; - var availableUnits = []; - var canSendMax = true; - var fiatCode; - var isNW = platformInfo.isNW; - var isAndroid = platformInfo.isAndroid; - var isIos = platformInfo.isIOS; - var lastUsedAltCurrencyList = []; - var passthroughParams = {}; - var satToUnit; - var transactionSendableAmount = { - crypto: '', - satoshis: null - }; - var unitDecimals; - var unitIndex = 0; - var unitToSatoshi; - var useSendMax = false; - var walletSpendableAmount = { - crypto: '', - satoshis: null - }; - - function onLeave() { - angular.element($window).off('keydown'); - } - - function onBeforeEnter(event, data) { - if (data.direction == "back") { - sendFlowService.state.pop(); - } - - initCurrencies(); - - passthroughParams = sendFlowService.state.getClone(); - console.log('amount onBeforeEnter after back sendflow ', passthroughParams); - - vm.fromWalletId = passthroughParams.fromWalletId; - vm.toWalletId = passthroughParams.toWalletId; - vm.minAmount = parseFloat(passthroughParams.minAmount); - vm.maxAmount = parseFloat(passthroughParams.maxAmount); - - vm.isRequestingSpecificAmount = !passthroughParams.fromWalletId; - vm.showSendMaxButton = !vm.isRequestingSpecificAmount; - - var config = configService.getSync().wallet.settings; - unitToSatoshi = config.unitToSatoshi; - satToUnit = 1 / unitToSatoshi; - unitDecimals = config.unitDecimals; - - setAvailableUnits(); - updateUnitUI(); - - var reNr = /^[1234567890\.]$/; - var reOp = /^[\*\+\-\/]$/; - - if (!isAndroid && !isIos) { - angular.element($window).on('keydown', function(e) { - if (!e.key) return; - if (e.which === 8) { // you can add others here inside brackets. - if (!altCurrencyModal) { - e.preventDefault(); - vm.removeDigit(); - } - } - - if (e.key.match(reNr)) { - vm.pushDigit(e.key); - } else if (e.key.match(reOp)) { - pushOperator(e.key); - } else if (e.keyCode === 86) { - if (e.ctrlKey || e.metaKey) processClipboard(); - } else if (e.keyCode === 13) vm.finish(); - - $timeout(function() { - $scope.$apply(); - }); - }); - } - - - resetAmount(); - - processAmount(); - - $timeout(function() { - $ionicScrollDelegate.resize(); - }, 10); - - function setAvailableUnits() { - var defaults = configService.getDefaults(); - var configCache = configService.getSync(); - availableUnits = []; - - var coinFromWallet = ''; - if (passthroughParams.fromWalletId) { - var fromWallet = profileService.getWallet(passthroughParams.fromWalletId); - coinFromWallet = fromWallet.coin; - } else { - var toWallet = profileService.getWallet(passthroughParams.toWalletId); - coinFromWallet = toWallet.coin; - } - - if (coinFromWallet === 'bch') { - availableUnits.push({ - name: 'Bitcoin Cash', - id: 'bch', - shortName: (configCache.bitcoinCashAlias || defaults.bitcoinCashAlias).toUpperCase(), - }); - }; - - if (coinFromWallet === 'btc') { - availableUnits.push({ - name: 'Bitcoin', - id: 'btc', - shortName: (configCache.bitcoinAlias || defaults.bitcoinAlias).toUpperCase(), - }); - } - - unitIndex = 0; - - - // currency have preference - var fiatName; - if (passthroughParams.currency) { - fiatCode = passthroughParams.currency; - altUnitIndex = unitIndex - unitIndex = availableUnits.length; - } else { - fiatCode = config.alternativeIsoCode || 'USD'; - fiatName = config.alternanativeName || fiatCode; - altUnitIndex = availableUnits.length; - } - - availableUnits.push({ - name: fiatName || fiatCode, - // TODO - id: fiatCode, - shortName: fiatCode, - isFiat: true, - }); - - unitIndex = lodash.findIndex(availableUnits, { - isFiat: true - }); - - altUnitIndex = 0; - - if (passthroughParams.fromWalletId) { - var fromWallet = profileService.getWallet(passthroughParams.fromWalletId); - updateAvailableFundsFromWallet(fromWallet); - } - - if (passthroughParams.thirdParty) { - vm.thirdParty = passthroughParams.thirdParty; // Parse stringified JSON-object - if (vm.thirdParty) { - initShapeshift(); - } - } - } - } - - function goBack() { - sendFlowService.router.goBack(); - } - - function initShapeshift() { - if (vm.thirdParty.id === 'shapeshift') { - vm.thirdParty.data = vm.thirdParty.data || {}; - - vm.fromWallet = profileService.getWallet(vm.fromWalletId); - vm.toWallet = profileService.getWallet(vm.toWalletId); - - vm.showSendMaxButton = false; - vm.showSendLimitMaxButton = false; - vm.canSendAllAvailableFunds = false; - - ongoingProcess.set('connectingShapeshift', true); - shapeshiftService.getMarketData(vm.fromWallet.coin, vm.toWallet.coin, function onMarketData(err, data) { - ongoingProcess.set('connectingShapeshift', false); - if (err) { - // Error stop here - popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.message, function () { - goBack(); - }); - } else { - vm.thirdParty.data.minAmount = vm.minAmount = parseFloat(data.minimum); - vm.thirdParty.data.maxAmount = vm.maxAmount = parseFloat(data.maxLimit); - setMaximumButtonFromWallet(vm.fromWallet); - } - }); - } - } - - function paste(value) { - vm.amount = value; - processAmount(); - $timeout(function() { - $scope.$apply(); - }); - } - - function processClipboard() { - if (!isNW) return; - var value = nodeWebkitService.readFromClipboard(); - if (value && evaluate(value) > 0) paste(evaluate(value)); - } - - function sendMax() { - if (canSendMax) { - useSendMax = true; - finish(); - } else { - var transactionSendableAmountInUnits = transactionSendableAmount.satoshis * satToUnit; - if (vm.minAmount && transactionSendableAmountInUnits < vm.minAmount) { - popupService.showAlert( - gettextCatalog.getString('Insufficient funds'), - gettextCatalog.getString('Amount below minimum allowed') - ); - } else { - // Need to be precise, so use crypto directly rather than fiat with exchange rate - if (availableUnits[unitIndex].isFiat) { - var tempIndex = altUnitIndex; - altUnitIndex = unitIndex; - unitIndex = tempIndex; - } - vm.amount = transactionSendableAmountInUnits.toFixed(LENGTH_AFTER_COMMA_EXPRESSION_LIMIT); - useSendMax = true; - finish(); - } - } - } - - function updateUnitUI() { - vm.unit = availableUnits[unitIndex].shortName; - vm.alternativeUnit = availableUnits[altUnitIndex].shortName; - - processAmount(); - $log.debug('Update unit coin @amount unit:' + vm.unit + " alternativeUnit:" + vm.alternativeUnit); - } - - function changeUnit() { - - vm.amount = '0'; - - if (!(availableUnits[unitIndex].isFiat && availableUnits.length > 2 && altUnitIndex == 0)) { - unitIndex++; - if (unitIndex >= availableUnits.length) unitIndex = 0; - } - - if (availableUnits[unitIndex].isFiat) { - altUnitIndex = altUnitIndex == 0 && availableUnits.length > 2 ? 1 : 0; - } else { - altUnitIndex = lodash.findIndex(availableUnits, { - isFiat: true - }); - } - - updateAvailableFundsStringIfNeeded(); - updateUnitUI(); - } - - function pushDigit(digit) { - if (vm.amount && digit != '.') { - var amountSplitByComma = vm.amount.split('.'); - if (amountSplitByComma.length > 1 && amountSplitByComma[1].length >= LENGTH_AFTER_COMMA_EXPRESSION_LIMIT) return; - if (amountSplitByComma.length == 1 && amountSplitByComma[0].length >= LENGTH_BEFORE_COMMA_EXPRESSION_LIMIT) return; - } - - if (vm.amount && vm.amount.length >= LENGTH_EXPRESSION_LIMIT) return; - if (vm.amount.indexOf('.') > -1 && digit == '.') return; - if (vm.amount == '0' && digit == '0') return; - if (availableUnits[unitIndex].isFiat && vm.amount.indexOf('.') > -1 && vm.amount[vm.amount.indexOf('.') + 2]) return; - - if (vm.amount == '0' && digit != '.') { - vm.amount = ''; - } - - if (vm.amount == '' && digit == '.') { - vm.amount = '0'; - } - - vm.amount = (vm.amount + digit).replace('..', '.'); - processAmount(); - } - - function pushOperator(operator) { - if (!vm.amount || vm.amount.length == 0) return; - vm.amount = pushOperator(vm.amount); - - function pushOperator(val) { - if (!isOperator(lodash.last(val))) { - return val + operator; - } else { - return val.slice(0, -1) + operator; - } - } - } - - function isOperator(val) { - var regex = /[\/\-\+\x\*]/; - return regex.test(val); - } - - function isExpression(val) { - var regex = /^\.?\d+(\.?\d+)?([\/\-\+\*x]\d?\.?\d+)+$/; - return regex.test(val); - } - - function removeDigit() { - vm.amount = (vm.amount).toString().slice(0, -1); - processAmount(); - } - - function resetAmount() { - vm.amount = vm.alternativeAmount = vm.globalResult = '0'; - vm.allowSend = false; - } - - - function openPopup() { - $ionicModal.fromTemplateUrl('views/modals/altCurrency.html', { - scope: $scope - }).then(function(modal) { - altCurrencyModal = modal; - altCurrencyModal.show(); - }); - } - - function close() { - altCurrencyModal.remove(); - altCurrencyModal = null; - } - - function processAmount() { - var formatedValue = format(vm.amount); - var result = evaluate(formatedValue); - - var amountInCrypto = 0; - - if (lodash.isNumber(result)) { - vm.globalResult = isExpression(vm.amount) ? '= ' + processResult(result) : ''; - - if (availableUnits[unitIndex].isFiat) { - - var a = fromFiat(result); - if (a) { - amountInCrypto = a; - var amountInSatoshis = a * unitToSatoshi; - vm.fundsAreInsufficient = !!passthroughParams.fromWalletId - && walletSpendableAmount.satoshis !== null - && walletSpendableAmount.satoshis < amountInSatoshis; - - vm.alternativeAmount = txFormatService.formatAmount(amountInSatoshis, true); - vm.allowSend = lodash.isNumber(a) - && a > 0 - && (!vm.minAmount || a >= vm.minAmount) - && (!vm.maxAmount || a <= vm.maxAmount) - && !vm.fundsAreInsufficient; - } else { - if (result) { - vm.alternativeAmount = 'N/A'; - } else { - vm.alternativeAmount = null; - } - vm.fundsAreInsufficient = false; - vm.allowSend = false; - } - } else { - amountInCrypto = result; - vm.fundsAreInsufficient = passthroughParams.fromWalletId - && walletSpendableAmount.satoshis !== null - && walletSpendableAmount.satoshis < result * unitToSatoshi; - - vm.alternativeAmount = $filter('formatFiatAmount')(toFiat(result)); - vm.allowSend = lodash.isNumber(result) - && result > 0 - && (!vm.minAmount || result >= vm.minAmount) - && (!vm.maxAmount || result <= vm.maxAmount) - && !vm.fundsAreInsufficient; - } - - } else { - vm.fundsAreInsufficient = false; - } - - if (vm.fundsAreInsufficient) { - vm.errorMessage = gettextCatalog.getString('Not enough available funds'); - - } else if (amountInCrypto && vm.thirdParty && vm.thirdParty.id === 'shapeshift') { - if (amountInCrypto < vm.minAmount) { - vm.errorMessage = gettextCatalog.getString('Amount is below minimum'); - - } else if (amountInCrypto > vm.maxAmount) { - vm.errorMessage = gettextCatalog.getString('Amount is above maximum'); - - } else { - vm.errorMessage = ''; - } - } else { - vm.errorMessage = ''; - } - } - - function processResult(val) { - if (availableUnits[unitIndex].isFiat) return $filter('formatFiatAmount')(val); - else return txFormatService.formatAmount(val.toFixed(unitDecimals) * unitToSatoshi, true); - } - - function fromFiat(val) { - return parseFloat((rateService.fromFiat(val, fiatCode, availableUnits[altUnitIndex].id) * satToUnit).toFixed(unitDecimals)); - } - - function toFiat(val) { - if (!rateService.getRate(fiatCode)) return; - - return parseFloat((rateService.toFiat(val * unitToSatoshi, fiatCode, availableUnits[unitIndex].id)).toFixed(2)); - } - - function evaluate(val) { - var result; - try { - result = $scope.$eval(val); - } catch (e) { - return 0; - } - if (!lodash.isFinite(result)) return 0; - return result; - } - - function format(val) { - if (!val) return; - - var result = val.toString(); - - if (isOperator(lodash.last(val))) result = result.slice(0, -1); - - return result.replace('x', '*'); - } - - function finish() { - var unit = availableUnits[unitIndex]; - var uiAmount = evaluate(format(vm.amount)); - - var satoshis = 0; - if (unit.isFiat) { - satoshis = Math.floor(fromFiat(uiAmount) * unitToSatoshi); - } else { - satoshis = Math.floor(uiAmount * unitToSatoshi); - } - - var confirmData = { - amount: (useSendMax && canSendMax) ? undefined : satoshis, - displayAddress: passthroughParams.displayAddress, - fromWalletId: passthroughParams.fromWalletId, - sendMax: useSendMax, - toAddress: passthroughParams.toAddress, - toWalletId: passthroughParams.toWalletId - }; - - if (vm.thirdParty) { - confirmData.thirdParty = vm.thirdParty; - } - - if (!confirmData.fromWalletId) { - $state.transitionTo('tabs.paymentRequest.confirm', confirmData); - } else { - sendFlowService.goNext(confirmData); - useSendMax = false; - } - } - - - // Currency - - var nextCurrencies = 10; - var completeAlternativeList = []; - - var popularCurrencyList = [ - {isoCode: 'USD', order: 0}, - {isoCode: 'EUR', order: 1}, - {isoCode: 'JPY', order: 2}, - {isoCode: 'GBP', order: 3}, - {isoCode: 'AUD', order: 4}, - {isoCode: 'CAD', order: 5}, - {isoCode: 'CHF', order: 6}, - {isoCode: 'CNY', order: 7}, - {isoCode: 'KRW', order: 8}, - {isoCode: 'HKD', order: 9}, - ]; - - function initCurrencies() { - var unusedCurrencyList = [{ - isoCode: 'LTL' - }, { - isoCode: 'BTC' - }, { - isoCode: 'BCC' - }, { - isoCode: 'BCH_BTC' - }, { - isoCode: 'BCH' - }]; - rateService.whenAvailable(function() { - - vm.listComplete = false; - - var idx = lodash.indexBy(unusedCurrencyList, 'isoCode'); - var idx2 = lodash.indexBy(lastUsedAltCurrencyList, 'isoCode'); - var idx3 = lodash.indexBy(popularCurrencyList, 'isoCode'); - var alternatives = rateService.listAlternatives(true); - - lodash.each(alternatives, function(c) { - if (idx3[c.isoCode]) { - idx3[c.isoCode].name = c.name; - } - if (!idx[c.isoCode] && !idx2[c.isoCode] && !idx3[c.isoCode]) { - completeAlternativeList.push(c); - } - }); - - vm.altCurrencyList = completeAlternativeList.slice(0, 10); - vm.lastUsedPopularList = lodash.unique(lodash.union(lastUsedAltCurrencyList, popularCurrencyList), 'isoCode'); - - rateService.updateRates(); - - $timeout(function() { - $scope.$apply(); - }); - }); - } - - function loadMore() { - $timeout(function() { - vm.altCurrencyList = completeAlternativeList.slice(0, nextCurrencies); - nextCurrencies += 10; - vm.listComplete = vm.altCurrencyList.length >= completeAlternativeList.length; - $scope.$broadcast('scroll.infiniteScrollComplete'); - }, 100); - } - - function next() { - useSendMax = false; - vm.finish(); - } - - function findCurrency(search) { - if (!search) initCurrencies(); - var list = lodash.unique(lodash.union(completeAlternativeList, lodash.union(lastUsedAltCurrencyList, popularCurrencyList)), 'isoCode'); - vm.altCurrencyList = lodash.filter(list, function(item) { - var val = item.name - var val2 = item.isoCode; - return lodash.includes(val.toLowerCase(), search.toLowerCase()) || lodash.includes(val2.toLowerCase(), search.toLowerCase()); - }); - $timeout(function() { - $scope.$apply(); - }); - } - - function save(newAltCurrency) { - var opts = { - wallet: { - settings: { - alternativeName: newAltCurrency.name, - alternativeIsoCode: newAltCurrency.isoCode, - } - } - }; - - configService.set(opts, function(err) { - if (err) $log.warn(err); - walletService.updateRemotePreferences(profileService.getWallets()); - var altUnitIndex = lodash.findIndex(availableUnits, { - isFiat: true - }); - availableUnits[altUnitIndex].id = newAltCurrency.isoCode; - availableUnits[altUnitIndex].name = newAltCurrency.isoCode; - availableUnits[altUnitIndex].shortName = newAltCurrency.isoCode; - fiatCode = newAltCurrency.isoCode; - updateAvailableFundsStringIfNeeded(); - updateUnitUI(); - close(); - }); - } - - function updateAvailableFundsStringIfNeeded() { - if (passthroughParams.fromWalletId && walletSpendableAmount.satoshis !== null) { - vm.availableFunds = walletSpendableAmount.crypto; - - if (availableUnits[unitIndex].isFiat) { - var coin = availableUnits[altUnitIndex].id; - txFormatService.formatAlternativeStr(coin, walletSpendableAmount.satoshis, function formatCallback(formatted){ - - if (formatted) { - $scope.$apply(function() { - vm.availableFunds = formatted; - }); - } - }); - } - updateMaximumButtonIfNeeded(); - } - } - - function updateAvailableFundsFromWallet(wallet) { - console.log('amount updateAvailableFundsFromWallet()'); - var availableFundsInFiat = ''; - if (wallet.status && wallet.status.isValid) { - walletSpendableAmount.crypto = wallet.status.spendableBalanceStr; - walletSpendableAmount.satoshis = wallet.status.spendableAmount; - if (wallet.status.alternativeBalanceAvailable) { - availableFundsInFiat = wallet.status.spendableBalanceAlternative + ' ' + wallet.status.alternativeIsoCode; - } else { - availableFundsInFiat = ''; - } - - } else if (wallet.cachedStatus && wallet.cachedStatus.isValid) { - - if (wallet.cachedStatus.alternativeBalanceAvailable) { - availableFundsInFiat = wallet.cachedStatus.spendableBalanceAlternative + ' ' + wallet.cachedStatus.alternativeIsoCode; - } else { - availableFundsInFiat = ''; - } - walletSpendableAmount.crypto = wallet.cachedStatus.spendableBalanceStr; - walletSpendableAmount.satoshis = wallet.cachedStatus.spendableAmount; - - } else { - - walletSpendableAmount.crypto = ''; - walletSpendableAmount.satoshis = null; - } - - if (availableUnits[unitIndex].isFiat) { - vm.availableFunds = availableFundsInFiat || walletSpendableAmount.crypto; - } else { - vm.availableFunds = walletSpendableAmount.crypto; - } - - setMaximumButtonFromWallet(wallet); - } - - function updateMaximumButtonIfNeeded() { - console.log('sendmax updateMaximumButtonIfNeeded()'); - if (vm.showSendMaxButton || vm.showSendLimitMaxButton) { - transactionSendableAmount.fiat = ''; - vm.sendableFunds = transactionSendableAmount.crypto; - - if (availableUnits[unitIndex].isFiat) { - var coin = availableUnits[altUnitIndex].id; - txFormatService.formatAlternativeStr(coin, transactionSendableAmount.satoshis, function formatCallback(formatted){ - if (formatted) { - $scope.$apply(function onApply() { - vm.sendableFunds = formatted; - }); - } - }); - } - } - } - - function setMaximumButtonFromWallet(wallet) { - console.log('sendmax setMaximumButtonFromWallet()'); - var minSatoshis = vm.minAmount * unitToSatoshi; - var maxSatoshis = vm.maxAmount * unitToSatoshi; - - if (minSatoshis > walletSpendableAmount.satoshis) { - console.log('sendmax Hiding max buttons as minimum is too high.'); - canSendMax = false; - vm.showSendMaxButton = true; - vm.showSendLimitMaxButton = false; - transactionSendableAmount.satoshis = walletSpendableAmount.satoshis; - - } else if (maxSatoshis) { - if (walletSpendableAmount.satoshis > maxSatoshis) { - console.log('sendmax Showing max limit button as available is greater than max limit.'); - canSendMax = false; - vm.showSendMaxButton = false; - vm.showSendLimitMaxButton = true; - transactionSendableAmount.satoshis = maxSatoshis; - } else { - console.log('sendmax Showing sendmax as all available as less than max limit.'); - // Enabling send max here is a little dangerous, if they receive funds between pressing - // this and the calculation in the Review screen. - canSendMax = false; - vm.showSendMaxButton = true; - vm.showSendLimitMaxButton = false; - transactionSendableAmount.satoshis = walletSpendableAmount.satoshis; - } - - } else { - console.log('sendmax Showing sendmax as all available because no limits.'); - canSendMax = true; - vm.showSendMaxButton = true; - vm.showSendLimitMaxButton = false; - transactionSendableAmount.satoshis = walletSpendableAmount.satoshis; - } - - if (vm.showSendMaxButton || vm.showSendLimitMaxButton) { - console.log('sendmax Setting max button text'); - transactionSendableAmount.crypto = txFormatService.formatAmountStr(wallet.coin, transactionSendableAmount.satoshis); - vm.sendableFunds = transactionSendableAmount.crypto; - - if (availableUnits[unitIndex].isFiat) { - txFormatService.formatAlternativeStr(wallet.coin, transactionSendableAmount.satoshis, function onFormat(formatted){ - if (formatted) { - $scope.$apply(function onApply() { - vm.sendableFunds = formatted; - }); - } - }); - } - } - - } -} -})(); \ No newline at end of file diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js new file mode 100644 index 000000000..52695e829 --- /dev/null +++ b/src/js/controllers/amount.js @@ -0,0 +1,636 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('amountController', function($scope, $filter, $timeout, $ionicModal, $ionicScrollDelegate, $ionicHistory, storageService, walletService, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, popupService, bwcError, payproService, profileService, bitcore, amazonService, nodeWebkitService) { + + var _id; + var unitToSatoshi; + var satToUnit; + var unitDecimals; + var satToBtc; + var SMALL_FONT_SIZE_LIMIT = 10; + var LENGTH_EXPRESSION_LIMIT = 19; + var LENGTH_BEFORE_COMMA_EXPRESSION_LIMIT = 8; + var LENGTH_AFTER_COMMA_EXPRESSION_LIMIT = 8; + var isNW = platformInfo.isNW; + + var unitIndex = 0; + var altUnitIndex = 0; + var availableUnits = []; + var fiatCode; + + var fixedUnit; + + $scope.amountModel = { amount: 0 }; + + $scope.isChromeApp = platformInfo.isChromeApp; + $scope.isAndroid = platformInfo.isAndroid; + $scope.isIos = platformInfo.isIOS; + + $scope.$on('$ionicView.leave', function() { + angular.element($window).off('keydown'); + }); + + $scope.$on("$ionicView.beforeEnter", function(event, data) { + + initCurrencies(); + + if (data.stateParams.shapeshiftOrderId && data.stateParams.shapeshiftOrderId.length > 0) { + $scope.minShapeshiftAmount = parseFloat(data.stateParams.minShapeshiftAmount); + $scope.maxShapeshiftAmount = parseFloat(data.stateParams.maxShapeshiftAmount); + $scope.shapeshiftOrderId = data.stateParams.shapeshiftOrderId; + } + + // To get the wallet from with the new flow + $scope.fromWalletId = data.stateParams.fromWalletId; + + if (data.stateParams.noPrefix) { + $scope.showWarningMessage = data.stateParams.noPrefix != 0; + if ($scope.showWarningMessage) { + var message = 'Address doesn\'t contain currency information, please make sure you are sending the correct currency.'; + popupService.showAlert('', message, function() {}, 'Ok'); + } + } + + var config = configService.getSync().wallet.settings; + + function setAvailableUnits() { + var defaults = configService.getDefaults(); + var configCache = configService.getSync(); + availableUnits = []; + + var hasBCHWallets = profileService.getWallets({ + coin: 'bch' + }).length; + + if (hasBCHWallets) { + availableUnits.push({ + name: 'Bitcoin Cash', + id: 'bch', + shortName: (configCache.bitcoinCashAlias || defaults.bitcoinCashAlias).toUpperCase(), + }); + }; + + var hasBTCWallets = profileService.getWallets({ + coin: 'btc' + }).length; + + if (hasBTCWallets) { + availableUnits.push({ + name: 'Bitcoin', + id: 'btc', + shortName: (configCache.bitcoinAlias || defaults.bitcoinAlias).toUpperCase(), + }); + } + + unitIndex = 0; + + if (data.stateParams.coin) { + var coins = data.stateParams.coin.split(','); + var newAvailableUnits = []; + + lodash.each(coins, function(c) { + var coin = lodash.find(availableUnits, { + id: c + }); + if (!coin) { + $log.warn('Could not find desired coin:' + data.stateParams.coin) + } else { + newAvailableUnits.push(coin); + } + }); + + if (newAvailableUnits.length > 0) { + availableUnits = newAvailableUnits; + } + } + + + // currency have preference + var fiatName; + if (data.stateParams.currency) { + fiatCode = data.stateParams.currency; + altUnitIndex = unitIndex + unitIndex = availableUnits.length; + } else { + fiatCode = config.alternativeIsoCode || 'USD'; + fiatName = config.alternanativeName || fiatCode; + altUnitIndex = availableUnits.length; + } + + availableUnits.push({ + name: fiatName || fiatCode, + // TODO + id: fiatCode, + shortName: fiatCode, + isFiat: true, + }); + + if (data.stateParams.fixedUnit) { + fixedUnit = true; + } + + unitIndex = lodash.findIndex(availableUnits, { + isFiat: true + }); + + altUnitIndex = 0; + }; + + // Go to... + _id = data.stateParams.id; // Optional (BitPay Card ID or Wallet ID) + $scope.nextStep = data.stateParams.nextStep; + + setAvailableUnits(); + updateUnitUI(); + + $scope.hasMaxAmount = true; + if ($ionicHistory.backView().stateName == 'tabs.receive') { + $scope.hasMaxAmount = false; + } + + $scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' || $ionicHistory.backView().stateName == 'tabs.bitpayCard'); + $scope.recipientType = data.stateParams.recipientType || null; + $scope.toAddress = data.stateParams.toAddress; + $scope.displayAddress = data.stateParams.displayAddress; + $scope.toName = data.stateParams.toName; + $scope.toEmail = data.stateParams.toEmail; + $scope.toColor = data.stateParams.toColor; + + if (!$scope.nextStep && !data.stateParams.toAddress) { + $log.error('Bad params at amount') + throw ('bad params'); + } + + var reNr = /^[1234567890\.]$/; + var reOp = /^[\*\+\-\/]$/; + + if (!$scope.isAndroid && !$scope.isIos) { + var disableKeys = angular.element($window).on('keydown', function(e) { + if (!e.key) return; + if (e.which === 8) { // you can add others here inside brackets. + if (!$scope.altCurrencyModal) { + e.preventDefault(); + $scope.removeDigit(); + } + } + + if (e.key.match(reNr)) { + $scope.pushDigit(e.key); + } else if (e.key.match(reOp)) { + $scope.pushOperator(e.key); + } else if (e.keyCode === 86) { + if (e.ctrlKey || e.metaKey) processClipboard(); + } else if (e.keyCode === 13) $scope.finish(); + + $timeout(function() { + $scope.$apply(); + }); + }); + } + + $scope.specificAmount = $scope.specificAlternativeAmount = ''; + $scope.isCordova = platformInfo.isCordova; + unitToSatoshi = config.unitToSatoshi; + satToUnit = 1 / unitToSatoshi; + satToBtc = 1 / 100000000; + unitDecimals = config.unitDecimals; + + $scope.resetAmount(); + + // in SAT ALWAYS + if ($stateParams.toAmount) { + $scope.amountModel.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals); + } + + $scope.processAmount(); + + $timeout(function() { + $ionicScrollDelegate.resize(); + }, 10); + }); + + $scope.goBack = function() { + if ($scope.shapeshiftOrderId) { + $state.go('tabs.send').then(function() { + $ionicHistory.clearHistory(); + $state.go('tabs.home').then(function() { + $state.transitionTo('tabs.shapeshift'); + }); + }); + } else { + $ionicHistory.goBack(); + } + } + + function paste(value) { + $scope.amountModel.amount = value; + $scope.processAmount(); + $timeout(function() { + $scope.$apply(); + }); + }; + + function processClipboard() { + if (!isNW) return; + var value = nodeWebkitService.readFromClipboard(); + if (value && evaluate(value) > 0) paste(evaluate(value)); + }; + + $scope.sendMax = function() { + $scope.useSendMax = true; + $scope.finish(); + }; + + $scope.toggleAlternative = function() { + if ($scope.amountModel.amount && isExpression($scope.amountModel.amount)) { + var amount = evaluate(format($scope.amountModel.amount)); + $scope.globalResult = '= ' + processResult(amount); + } + }; + + function updateUnitUI() { + $scope.unit = availableUnits[unitIndex].shortName; + $scope.alternativeUnit = availableUnits[altUnitIndex].shortName; + + $scope.processAmount(); + $log.debug('Update unit coin @amount unit:' + $scope.unit + " alternativeUnit:" + $scope.alternativeUnit); + }; + + $scope.changeUnit = function() { + + $scope.amountModel.amount = '0'; + + if (fixedUnit) return; + + if (!(availableUnits[unitIndex].isFiat && availableUnits.length > 2 && altUnitIndex == 0)) { + unitIndex++; + if (unitIndex >= availableUnits.length) unitIndex = 0; + } + + if (availableUnits[unitIndex].isFiat) { + altUnitIndex = altUnitIndex == 0 && availableUnits.length > 2 ? 1 : 0; + } else { + altUnitIndex = lodash.findIndex(availableUnits, { + isFiat: true + }); + } + + updateUnitUI(); + }; + + + $scope.changeAlternativeUnit = function() { + + // Do nothing is fiat is not main unit + if (!availableUnits[unitIndex].isFiat) return; + + var nextCoin = lodash.findIndex(availableUnits, function(x) { + if (x.isFiat) return false; + if (x.id == availableUnits[altUnitIndex].id) return false; + return true; + }); + + if (nextCoin >= 0) { + altUnitIndex = nextCoin; + updateUnitUI(); + } + }; + + function checkFontSize() { + if ($scope.amountModel.amount && $scope.amountModel.amount.length >= SMALL_FONT_SIZE_LIMIT) $scope.smallFont = true; + else $scope.smallFont = false; + }; + + $scope.pushDigit = function(digit) { + if ($scope.amountModel.amount && digit != '.') { + var amountSplitByComma = $scope.amountModel.amount.split('.'); + if (amountSplitByComma.length > 1 && amountSplitByComma[1].length >= LENGTH_AFTER_COMMA_EXPRESSION_LIMIT) return; + if (amountSplitByComma.length == 1 && amountSplitByComma[0].length >= LENGTH_BEFORE_COMMA_EXPRESSION_LIMIT) return; + } + + if ($scope.amountModel.amount && $scope.amountModel.amount.length >= LENGTH_EXPRESSION_LIMIT) return; + if ($scope.amountModel.amount.indexOf('.') > -1 && digit == '.') return; + if ($scope.amountModel.amount == '0' && digit == '0') return; + if (availableUnits[unitIndex].isFiat && $scope.amountModel.amount.indexOf('.') > -1 && $scope.amountModel.amount[$scope.amountModel.amount.indexOf('.') + 2]) return; + + if ($scope.amountModel.amount == '0' && digit != '.') { + $scope.amountModel.amount = ''; + } + + if ($scope.amountModel.amount == '' && digit == '.') { + $scope.amountModel.amount = '0'; + } + + $scope.amountModel.amount = ($scope.amountModel.amount + digit).replace('..', '.'); + checkFontSize(); + $scope.processAmount(); + }; + + $scope.pushOperator = function(operator) { + if (!$scope.amountModel.amount || $scope.amountModel.amount.length == 0) return; + $scope.amountModel.amount = _pushOperator($scope.amountModel.amount); + + function _pushOperator(val) { + if (!isOperator(lodash.last(val))) { + return val + operator; + } else { + return val.slice(0, -1) + operator; + } + }; + }; + + function isOperator(val) { + var regex = /[\/\-\+\x\*]/; + return regex.test(val); + }; + + function isExpression(val) { + var regex = /^\.?\d+(\.?\d+)?([\/\-\+\*x]\d?\.?\d+)+$/; + return regex.test(val); + }; + + $scope.removeDigit = function() { + $scope.amountModel.amount = ($scope.amountModel.amount).toString().slice(0, -1); + $scope.processAmount(); + checkFontSize(); + }; + + $scope.resetAmount = function() { + $scope.amountModel.amount = $scope.alternativeAmount = $scope.globalResult = ''; + $scope.allowSend = false; + checkFontSize(); + }; + + + $scope.openPopup = function() { + $ionicModal.fromTemplateUrl('views/modals/altCurrency.html', { + scope: $scope + }).then(function(modal) { + $scope.altCurrencyModal = modal; + $scope.altCurrencyModal.show(); + }); + }; + + $scope.close = function() { + $scope.altCurrencyModal.remove(); + $scope.altCurrencyModal = false; + }; + + $scope.processAmount = function() { + var formatedValue = format($scope.amountModel.amount); + var result = evaluate(formatedValue); + + if (lodash.isNumber(result)) { + $scope.globalResult = isExpression($scope.amountModel.amount) ? '= ' + processResult(result) : ''; + + if (availableUnits[unitIndex].isFiat) { + + var a = fromFiat(result); + if (a) { + $scope.alternativeAmount = txFormatService.formatAmount(a * unitToSatoshi, true); + $scope.allowSend = lodash.isNumber(a) && a > 0 + && (!$scope.shapeshiftOrderId + || (a >= $scope.minShapeshiftAmount && a <= $scope.maxShapeshiftAmount)); + } else { + if (result) { + $scope.alternativeAmount = 'N/A'; + } else { + $scope.alternativeAmount = null; + } + $scope.allowSend = false; + } + } else { + $scope.alternativeAmount = $filter('formatFiatAmount')(toFiat(result)); + $scope.allowSend = lodash.isNumber(result) && result > 0 + && (!$scope.shapeshiftOrderId + || (result >= $scope.minShapeshiftAmount && result <= $scope.maxShapeshiftAmount)); + } + } + }; + + function processResult(val) { + if (availableUnits[unitIndex].isFiat) return $filter('formatFiatAmount')(val); + else return txFormatService.formatAmount(val.toFixed(unitDecimals) * unitToSatoshi, true); + }; + + function fromFiat(val) { + return parseFloat((rateService.fromFiat(val, fiatCode, availableUnits[altUnitIndex].id) * satToUnit).toFixed(unitDecimals)); + }; + + function toFiat(val) { + if (!rateService.getRate(fiatCode)) return; + + return parseFloat((rateService.toFiat(val * unitToSatoshi, fiatCode, availableUnits[unitIndex].id)).toFixed(2)); + }; + + function evaluate(val) { + var result; + try { + result = $scope.$eval(val); + } catch (e) { + return 0; + } + if (!lodash.isFinite(result)) return 0; + return result; + }; + + function format(val) { + if (!val) return; + + var result = val.toString(); + + if (isOperator(lodash.last(val))) result = result.slice(0, -1); + + return result.replace('x', '*'); + }; + + $scope.finish = function() { + + function finish() { + var unit = availableUnits[unitIndex]; + var _amount = evaluate(format($scope.amountModel.amount)); + var coin = unit.id; + if (unit.isFiat) { + coin = availableUnits[altUnitIndex].id; + } + + if ($scope.nextStep) { + $state.transitionTo($scope.nextStep, { + id: _id, + amount: $scope.useSendMax ? null : _amount, + currency: unit.id.toUpperCase(), + coin: coin, + useSendMax: $scope.useSendMax, + fromWalletId: $scope.fromWalletId + }); + } else { + var amount = _amount; + + if (unit.isFiat) { + amount = (fromFiat(amount) * unitToSatoshi).toFixed(0); + } else { + amount = (amount * unitToSatoshi).toFixed(0); + } + + var confirmData = { + recipientType: $scope.recipientType, + toAmount: amount, + toAddress: $scope.toAddress, + displayAddress: $scope.displayAddress || $scope.toAddress, + toName: $scope.toName, + toEmail: $scope.toEmail, + toColor: $scope.toColor, + coin: coin, + useSendMax: $scope.useSendMax, + fromWalletId: $scope.fromWalletId + }; + + if ($scope.shapeshiftOrderId) { + var shapeshiftOrderUrl = 'https://www.shapeshift.io/#/status/'; + shapeshiftOrderUrl += $scope.shapeshiftOrderId; + confirmData.description = shapeshiftOrderUrl; + confirmData.fromWalletId = $scope.fromWalletId; + + if (confirmData.useSendMax) { + var wallet = lodash.find(profileService.getWallets({ coin: coin }), + function(w) { + return w.id == $scope.fromWalletId; + }); + + var balance = parseFloat(wallet.cachedBalance.substring(0, wallet.cachedBalance.length-4)); + if (balance < $scope.minShapeshiftAmount * 1.04) { + confirmData.useSendMax = false; + confirmData.toAmount = $scope.minShapeshiftAmount * unitToSatoshi; + } else if (balance > $scope.maxShapeshiftAmount) { + confirmData.useSendMax = false; + confirmData.toAmount = $scope.maxShapeshiftAmount * unitToSatoshi * 0.99; + } + } + } + + $state.transitionTo('tabs.send.confirm', confirmData); + } + $scope.useSendMax = null; + } + + if ($scope.showWarningMessage) { + var u = $scope.unit == 'BCH' || $scope.unit == 'BTC' ? $scope.unit : $scope.alternativeUnit; + var message = 'Are you sure you want to send ' + u.toUpperCase() + '?'; + popupService.showConfirm(message, '', 'Yes', 'No', function(res) { + if (!res) { + $scope.useSendMax = null; + return; + }; + finish(); + }); + } else { + finish(); + } + + }; + + + // Currency + + var next = 10; + var completeAlternativeList = []; + + var popularCurrencyList = [ + {isoCode: 'USD', order: 0}, + {isoCode: 'EUR', order: 1}, + {isoCode: 'JPY', order: 2}, + {isoCode: 'GBP', order: 3}, + {isoCode: 'AUD', order: 4}, + {isoCode: 'CAD', order: 5}, + {isoCode: 'CHF', order: 6}, + {isoCode: 'CNY', order: 7}, + {isoCode: 'KRW', order: 8}, + {isoCode: 'HKD', order: 9}, + ] + + function initCurrencies() { + var unusedCurrencyList = [{ + isoCode: 'LTL' + }, { + isoCode: 'BTC' + }, { + isoCode: 'BCC' + }, { + isoCode: 'BCH_BTC' + }, { + isoCode: 'BCH' + }]; + rateService.whenAvailable(function() { + + $scope.listComplete = false; + + var idx = lodash.indexBy(unusedCurrencyList, 'isoCode'); + var idx2 = lodash.indexBy($scope.lastUsedAltCurrencyList, 'isoCode'); + var idx3 = lodash.indexBy(popularCurrencyList, 'isoCode'); + var alternatives = rateService.listAlternatives(true); + + lodash.each(alternatives, function(c) { + if (idx3[c.isoCode]) { + idx3[c.isoCode].name = c.name; + } + if (!idx[c.isoCode] && !idx2[c.isoCode] && !idx3[c.isoCode]) { + completeAlternativeList.push(c); + } + }); + + $scope.altCurrencyList = completeAlternativeList.slice(0, 10); + $scope.lastUsedPopularList = lodash.unique(lodash.union($scope.lastUsedAltCurrencyList, popularCurrencyList), 'isoCode'); + + $timeout(function() { + $scope.$apply(); + }); + }); + } + + $scope.loadMore = function() { + $timeout(function() { + $scope.altCurrencyList = completeAlternativeList.slice(0, next); + next += 10; + $scope.listComplete = $scope.altCurrencyList.length >= completeAlternativeList.length; + $scope.$broadcast('scroll.infiniteScrollComplete'); + }, 100); + }; + + $scope.findCurrency = function(search) { + if (!search) initCurrencies(); + var list = lodash.unique(lodash.union(completeAlternativeList, lodash.union($scope.lastUsedAltCurrencyList, popularCurrencyList)), 'isoCode'); + $scope.altCurrencyList = lodash.filter(list, function(item) { + var val = item.name + var val2 = item.isoCode; + return lodash.includes(val.toLowerCase(), search.toLowerCase()) || lodash.includes(val2.toLowerCase(), search.toLowerCase()); + }); + $timeout(function() { + $scope.$apply(); + }); + }; + + $scope.save = function(newAltCurrency) { + var opts = { + wallet: { + settings: { + alternativeName: newAltCurrency.name, + alternativeIsoCode: newAltCurrency.isoCode, + } + } + }; + + configService.set(opts, function(err) { + if (err) $log.warn(err); + walletService.updateRemotePreferences(profileService.getWallets()); + var altUnitIndex = lodash.findIndex(availableUnits, { + isFiat: true + }); + availableUnits[altUnitIndex].id = newAltCurrency.isoCode; + availableUnits[altUnitIndex].name = newAltCurrency.isoCode; + availableUnits[altUnitIndex].shortName = newAltCurrency.isoCode; + fiatCode = newAltCurrency.isoCode; + updateUnitUI(); + $scope.close(); + }); + }; +}); diff --git a/src/js/controllers/amount.spec.js b/src/js/controllers/amount.spec.js deleted file mode 100644 index fdef97109..000000000 --- a/src/js/controllers/amount.spec.js +++ /dev/null @@ -1,604 +0,0 @@ -describe('amountController', function(){ - var configCache, - configService, - gettextCatalog, - $controller, - $ionicHistory, - $rootScope, - ongoingProcess, - platformInfo, - popupService, - profileService, - rateService, - sendFlowService, - shapeshiftService, - txFormatService, - $scope, - $state, - $stateParams; - - - - beforeEach(function(){ - module('ngLodash'); - module('copayApp.controllers'); - - configCache = { - wallet: { - settings: { - unitToSatoshi: 100000000 - } - } - }; - - - configService = jasmine.createSpyObj(['getDefaults','getSync']); - configService.getDefaults.and.returnValue({ - bitcoinCashAlias: 'bch', - bitcoinAlias: 'btc' - }); - configService.getSync.and.returnValue(configCache); - - gettextCatalog = jasmine.createSpyObj(['getString']); - gettextCatalog.getString.and.callFake(function(str){ return str; }); - $ionicHistory = jasmine.createSpyObj(['backView']); - - ongoingProcess = jasmine.createSpyObj(['set']); - - platformInfo = { - isChromeApp: false, - isAndroid: false, - isIos: true - }; - popupService = jasmine.createSpyObj(['showAlert']); - profileService = jasmine.createSpyObj(['getWallet', 'getWallets']); - - rateService = jasmine.createSpyObj(['fromFiat', 'listAlternatives', 'updateRates', 'whenAvailable']); - sendFlowService = jasmine.createSpyObj(['getStateClone', 'pushState']); - shapeshiftService = jasmine.createSpyObj(['getMarketData']); - txFormatService = jasmine.createSpyObj(['formatAlternativeStr', 'formatAmountStr']); - - txFormatService.formatAlternativeStr.and.callFake(function(coin, satoshis, cb) { - if (typeof satoshis !== "number") { - throw "satoshis in formatAlternativeStr() is not a number." - } - var units = satoshis / 100000000; - var formatted = (units * 10000).toFixed(2) + ' USD'; - cb(formatted); - }); - - txFormatService.formatAmountStr.and.callFake(function(coin, satoshis) { - if (typeof satoshis !== "number") { - throw "satoshis in formatAmountStr() is not a number." - } - return (satoshis * 100000000).toFixed(8) + ' ' + (coin || 'bch').toUpperCase(); - }); - - $state = jasmine.createSpyObj(['transitionTo']); - $stateParams = {}; - - inject(function(_$controller_, _$rootScope_){ - // The injector unwraps the underscores (_) from around the parameter names when matching - $controller = _$controller_; - $rootScope = _$rootScope_; - }); - - - - }); - - it('receives fromWalletId and toAddress.', function() { - - var backView = { - stateName: 'ignoreme' - }; - $ionicHistory.backView.and.returnValue(backView); - - var wallet = { - status: { - isValid: true, - spendableAmount: 123456 - } - }; - profileService.getWallet.and.returnValue(wallet); - profileService.getWallets.and.returnValue([{}]); - rateService.fromFiat.and.returnValue(12); // satoshis or coins? - - var $scope = $rootScope.$new(); - - - var amountController = $controller('amountController', { - configService: configService, - gettextCatalog: gettextCatalog, - $ionicHistory: $ionicHistory, - $ionicModal: {}, - $ionicScrollDelegate: {}, - nodeWebkitService: {}, - ongoingProcess: ongoingProcess, - platformInfo: platformInfo, - profileService: profileService, - popupService: popupService, - rateService: rateService, - $scope: $scope, - sendFlowService: sendFlowService, - shapeshiftService: shapeshiftService, - $state: {}, - $stateParams: $stateParams, - txFormatService: txFormatService, - walletService: {} - }); - - var sendFlowState = { - fromWalletId: 'fd56c1e7-e3ac-4fd9-8afc-27b9c1b3718b', - toAddress: 'qrup46avn8t466xxwlzs4qelht7cnwvesv2e29wf7s' - }; - - sendFlowService.getStateClone.and.returnValue(sendFlowState); - - $scope.$emit('$ionicView.beforeEnter', {}); - - //expect($scope.fromWalletId).toBe('fd56c1e7-e3ac-4fd9-8afc-27b9c1b3718b'); - //expect($scope.toAddress).toBe('qrup46avn8t466xxwlzs4qelht7cnwvesv2e29wf7s'); - }); - - - - describe('Shapeshift', function() { - var walletFrom; - var walletTo; - - beforeEach(function(){ - walletFrom = {}; - walletTo = {}; - - profileService.getWallet.and.callFake(function(walletId){ - if (walletId === '4cd7673e-7320-4dfa-86e5-d4edb51d460a') { - return walletFrom; - } else if (walletId === 'bf00af8f-0788-4b57-b30a-0390747407e9') { - return walletTo; - } else { - return null; - } - }); - - rateService.listAlternatives.and.returnValue([ - {name: "Australian Dollar", isoCode: "AUD"}, - {name: "United States Dollar", isoCode: "USD"} - ]); - - }); - - it ('with available balance below limit, shows sendMax for triggering alert', function() { - - walletFrom.coin = 'btc'; - walletFrom.status = { - isValid: true, - spendableAmount: 789 - }; - walletTo.coin = 'bch'; - - profileService.getWallets.and.returnValue([{}]); - rateService.fromFiat.and.returnValue(12); - - var $scope = $rootScope.$new(); - - var amountController = $controller('amountController', { - configService: configService, - gettextCatalog: gettextCatalog, - $ionicHistory: $ionicHistory, - $ionicModal: {}, - $ionicScrollDelegate: {}, - nodeWebkitService: {}, - ongoingProcess: ongoingProcess, - platformInfo: platformInfo, - profileService: profileService, - popupService: popupService, - rateService: rateService, - $scope: $scope, - sendFlowService: sendFlowService, - shapeshiftService: shapeshiftService, - $state: $state, - $stateParams: $stateParams, - txFormatService: txFormatService, - walletService: {} - }); - - rateService.whenAvailable.and.callFake(function(cb){ - cb(); - }); - - var sendFlowState = { - amount: '', - displayAddress: null, - fromWalletId: '4cd7673e-7320-4dfa-86e5-d4edb51d460a', - sendMax: false, - thirdParty: { - id: 'shapeshift', - data: {}, - }, - toAddress: '', - toWalletId: 'bf00af8f-0788-4b57-b30a-0390747407e9' - }; - - sendFlowService.getStateClone.and.returnValue(sendFlowState); - - var reqCoinIn = ''; - var reqCoinOut = ''; - shapeshiftService.getMarketData.and.callFake(function(coinIn, coinOut, cb){ - reqCoinIn = coinIn; - reqCoinOut = coinOut; - cb({ - maxLimit: '0.6846239', - minimum: '0.00013692' - }); - }); - - $scope.$emit('$ionicView.beforeEnter', {}); - - expect(rateService.updateRates.calls.any()).toEqual(true); - - expect(reqCoinIn).toBe('btc'); - expect(reqCoinOut).toBe('bch'); - - expect(amountController.maxAmount).toBe(0.68462390); - expect(amountController.minAmount).toBe(0.00013692); - - expect(amountController.showSendMaxButton).toEqual(true); - expect(amountController.showSendLimitMaxButton).toEqual(false); - - expect(amountController.sendableFunds).toEqual('0.08 USD'); - - // Now hit the Send Max button - amountController.sendMax(); - - expect(popupService.showAlert.calls.argsFor(0)[0]).toEqual('Insufficient funds'); - expect(popupService.showAlert.calls.argsFor(0)[1]).toEqual('Amount below minimum allowed'); - expect(sendFlowService.pushState.calls.any()).toEqual(false); - expect($state.transitionTo.calls.any()).toEqual(false); - }); - - it ('with available balance between limits, uses sendMax', function() { - - walletFrom.coin = 'btc'; - walletFrom.status = { - isValid: true, - spendableAmount: 456789 - }; - walletTo.coin = 'bch'; - - profileService.getWallets.and.returnValue([{}]); - rateService.fromFiat.and.returnValue(12); - - var $scope = $rootScope.$new(); - - var amountController = $controller('amountController', { - configService: configService, - gettextCatalog: {}, - $ionicHistory: $ionicHistory, - $ionicModal: {}, - $ionicScrollDelegate: {}, - nodeWebkitService: {}, - ongoingProcess: ongoingProcess, - platformInfo: platformInfo, - profileService: profileService, - popupService: {}, - rateService: rateService, - $scope: $scope, - sendFlowService: sendFlowService, - shapeshiftService: shapeshiftService, - $state: $state, - $stateParams: $stateParams, - txFormatService: txFormatService, - walletService: {} - }); - - rateService.whenAvailable.and.callFake(function(cb){ - cb(); - }); - - var sendFlowState = { - amount: '', - displayAddress: null, - fromWalletId: '4cd7673e-7320-4dfa-86e5-d4edb51d460a', - sendMax: false, - thirdParty: { - id: 'shapeshift', - data: {}, - }, - toAddress: '', - toWalletId: 'bf00af8f-0788-4b57-b30a-0390747407e9' - }; - - sendFlowService.getStateClone.and.returnValue(sendFlowState); - - var reqCoinIn = ''; - var reqCoinOut = ''; - shapeshiftService.getMarketData.and.callFake(function(coinIn, coinOut, cb){ - reqCoinIn = coinIn; - reqCoinOut = coinOut; - cb({ - maxLimit: '0.6846239', - minimum: '0.00013692' - }); - }); - - $scope.$emit('$ionicView.beforeEnter', {}); - - expect(rateService.updateRates.calls.any()).toEqual(true); - - expect(reqCoinIn).toBe('btc'); - expect(reqCoinOut).toBe('bch'); - - expect(amountController.maxAmount).toBe(0.68462390); - expect(amountController.minAmount).toBe(0.00013692); - - expect(amountController.showSendMaxButton).toEqual(true); - expect(amountController.showSendLimitMaxButton).toEqual(false); - - // Now hit the Send Max button - var pushedState = null; - sendFlowService.pushState.and.callFake(function (sendFlowState){ - pushedState = sendFlowState; - }); - - amountController.sendMax(); - - expect(pushedState.amount).toBeUndefined(); - expect(pushedState.fromWalletId).toEqual('4cd7673e-7320-4dfa-86e5-d4edb51d460a'); - expect(pushedState.sendMax).toEqual(true); - expect(pushedState.toWalletId).toEqual('bf00af8f-0788-4b57-b30a-0390747407e9'); - - expect(pushedState.thirdParty.id).toEqual('shapeshift'); - expect(pushedState.thirdParty.data.maxAmount).toEqual(0.6846239); - expect(pushedState.thirdParty.data.minAmount).toEqual(0.00013692); - - expect($state.transitionTo.calls.count()).toEqual(1); - expect($state.transitionTo.calls.argsFor(0)[0]).toEqual('tabs.send.review'); - }); - - it ('with available balance higher than max, uses send limit max instead of sendMax', function() { - - walletFrom.coin = 'btc'; - walletFrom.status = { - isValid: true, - spendableAmount: 123456789 - }; - walletTo.coin = 'bch'; - - profileService.getWallets.and.returnValue([{}]); - rateService.fromFiat.and.returnValue(12); // satoshis or coins? - - var $scope = $rootScope.$new(); - - var amountController = $controller('amountController', { - configService: configService, - gettextCatalog: {}, - $ionicHistory: $ionicHistory, - $ionicModal: {}, - $ionicScrollDelegate: {}, - nodeWebkitService: {}, - ongoingProcess: ongoingProcess, - platformInfo: platformInfo, - profileService: profileService, - popupService: {}, - rateService: rateService, - $scope: $scope, - sendFlowService: sendFlowService, - shapeshiftService: shapeshiftService, - $state: $state, - $stateParams: $stateParams, - txFormatService: txFormatService, - walletService: {} - }); - - rateService.whenAvailable.and.callFake(function(cb){ - cb(); - }); - - var sendFlowState = { - amount: '', - displayAddress: null, - fromWalletId: '4cd7673e-7320-4dfa-86e5-d4edb51d460a', - sendMax: false, - thirdParty: { - id: 'shapeshift', - data: {}, - }, - toAddress: '', - toWalletId: 'bf00af8f-0788-4b57-b30a-0390747407e9' - }; - - sendFlowService.getStateClone.and.returnValue(sendFlowState); - - var reqCoinIn = ''; - var reqCoinOut = ''; - shapeshiftService.getMarketData.and.callFake(function(coinIn, coinOut, cb){ - reqCoinIn = coinIn; - reqCoinOut = coinOut; - cb({ - maxLimit: '0.6846239', - minimum: '0.00013692' - }); - }); - - $scope.$emit('$ionicView.beforeEnter', {}); - - expect(rateService.updateRates.calls.any()).toEqual(true); - - expect(reqCoinIn).toBe('btc'); - expect(reqCoinOut).toBe('bch'); - - expect(amountController.maxAmount).toBe(0.6846239); - expect(amountController.minAmount).toBe(0.00013692); - - expect(amountController.showSendMaxButton).toEqual(false); - expect(amountController.showSendLimitMaxButton).toEqual(true); - - // Now hit the Send Max button - var pushedState = null; - sendFlowService.pushState.and.callFake(function (sendFlowState){ - pushedState = sendFlowState; - }); - - amountController.sendMax(); - - expect(pushedState.amount).toEqual(68462390); - expect(pushedState.fromWalletId).toEqual('4cd7673e-7320-4dfa-86e5-d4edb51d460a'); - expect(pushedState.sendMax).toEqual(false); - expect(pushedState.toWalletId).toEqual('bf00af8f-0788-4b57-b30a-0390747407e9'); - - expect(pushedState.thirdParty.id).toEqual('shapeshift'); - expect(pushedState.thirdParty.data.maxAmount).toEqual(0.6846239); - expect(pushedState.thirdParty.data.minAmount).toEqual(0.00013692); - - expect($state.transitionTo.calls.count()).toEqual(1); - expect($state.transitionTo.calls.argsFor(0)[0]).toEqual('tabs.send.review'); - }); - }); - - - describe('Wallet transfer', function() { - var walletFrom; - var walletTo; - - beforeEach(function(){ - walletFrom = {}; - walletTo = {}; - - profileService.getWallet.and.callFake(function(walletId){ - if (walletId === '4cd7673e-7320-4dfa-86e5-d4edb51d460a') { - return walletFrom; - } else if (walletId === 'bf00af8f-0788-4b57-b30a-0390747407e9') { - return walletTo; - } else { - return null; - } - }); - - rateService.listAlternatives.and.returnValue([ - {name: "Australian Dollar", isoCode: "AUD"}, - {name: "United States Dollar", isoCode: "USD"} - ]); - - }); - - it('wallet transfer send max.', function() { - - walletFrom.coin = 'btc'; - walletFrom.status = { - isValid: true, - spendableAmount: 123456789 - }; - - profileService.getWallets.and.returnValue([{}]); - - var $scope = $rootScope.$new(); - - var amountController = $controller('amountController', { - configService: configService, - gettextCatalog: gettextCatalog, - $ionicHistory: $ionicHistory, - $ionicModal: {}, - $ionicScrollDelegate: {}, - nodeWebkitService: {}, - ongoingProcess: ongoingProcess, - platformInfo: platformInfo, - profileService: profileService, - popupService: popupService, - rateService: rateService, - $scope: $scope, - sendFlowService: sendFlowService, - shapeshiftService: shapeshiftService, - $state: $state, - $stateParams: $stateParams, - txFormatService: txFormatService, - walletService: {} - }); - - var sendFlowState = { - fromWalletId: '4cd7673e-7320-4dfa-86e5-d4edb51d460a', - toWalletId: 'bf00af8f-0788-4b57-b30a-0390747407e9' - }; - - sendFlowService.getStateClone.and.returnValue(sendFlowState); - - $scope.$emit('$ionicView.beforeEnter', {}); - - expect(amountController.showSendMaxButton).toEqual(true); - expect(amountController.showSendLimitMaxButton).toEqual(false); - - expect(amountController.sendableFunds).toEqual('12345.68 USD'); - - // Now hit the Send Max button - var pushedState = null; - sendFlowService.pushState.and.callFake(function (sendFlowState){ - pushedState = sendFlowState; - }); - - amountController.sendMax(); - - expect(pushedState.amount).toBeUndefined(); - expect(pushedState.fromWalletId).toEqual('4cd7673e-7320-4dfa-86e5-d4edb51d460a'); - expect(pushedState.sendMax).toEqual(true); - expect(pushedState.toWalletId).toEqual('bf00af8f-0788-4b57-b30a-0390747407e9'); - - expect($state.transitionTo.calls.count()).toEqual(1); - expect($state.transitionTo.calls.argsFor(0)[0]).toEqual('tabs.send.review'); - }); - - - // This situation was seen in real life - it('wallet transfer with valid cached status only.', function() { - - walletFrom.coin = 'btc'; - walletFrom.status = { - isValid: false, - }; - walletFrom.cachedStatus = { - isValid: true, - spendableAmount: 5678 - }; - - profileService.getWallets.and.returnValue([{}]); - - var $scope = $rootScope.$new(); - - var amountController = $controller('amountController', { - configService: configService, - gettextCatalog: gettextCatalog, - $ionicHistory: $ionicHistory, - $ionicModal: {}, - $ionicScrollDelegate: {}, - nodeWebkitService: {}, - ongoingProcess: ongoingProcess, - platformInfo: platformInfo, - profileService: profileService, - popupService: popupService, - rateService: rateService, - $scope: $scope, - sendFlowService: sendFlowService, - shapeshiftService: shapeshiftService, - $state: $state, - $stateParams: $stateParams, - txFormatService: txFormatService, - walletService: {} - }); - - var sendFlowState = { - fromWalletId: '4cd7673e-7320-4dfa-86e5-d4edb51d460a', - toWalletId: 'bf00af8f-0788-4b57-b30a-0390747407e9' - }; - - sendFlowService.getStateClone.and.returnValue(sendFlowState); - - $scope.$emit('$ionicView.beforeEnter', {}); - - expect(amountController.showSendMaxButton).toEqual(true); - expect(amountController.showSendLimitMaxButton).toEqual(false); - - expect(amountController.sendableFunds).toEqual('0.57 USD'); - }); - - }); - -}); \ No newline at end of file diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js index 6ec7089c6..0eec71f12 100644 --- a/src/js/controllers/backup.js +++ b/src/js/controllers/backup.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('backupController', - function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, lodash, profileService, bwcService, walletService, ongoingProcess, popupService, gettextCatalog, $ionicModal) { + function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, lodash, profileService, bwcService, walletService, ongoingProcess, popupService, gettextCatalog, $ionicModal, firebaseEventsService) { if ($state.current.name == 'onboarding.backup') { $scope.onboarding = true; @@ -89,8 +89,7 @@ angular.module('copayApp.controllers').controller('backupController', $scope.setFlow(2); }) } else { - - //firebaseEventsService.logEvent('backed_up_wallet'); + firebaseEventsService.logEvent('backed_up_wallet'); openConfirmBackupModal(); } }; diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index ae4bc7153..03af26fd1 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,20 +1,25 @@ 'use strict'; -angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $timeout, $ionicScrollDelegate, $ionicLoading, ionicToast, addressbookService, gettextCatalog, walletService, platformInfo, lodash, configService, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, feeService, bitcoinCashJsService, bwcError, txConfirmNotification, soundService, clipboardService) { +angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService) { var countDown = null; var FEE_TOO_HIGH_LIMIT_PER = 15; var tx = {}; - var lastTxId = ""; // Config Related values var config = configService.getSync(); var walletConfig = config.wallet; + var unitToSatoshi = walletConfig.settings.unitToSatoshi; + var unitDecimals = walletConfig.settings.unitDecimals; + var satToUnit = 1 / unitToSatoshi; var configFeeLevel = walletConfig.settings.feeLevel ? walletConfig.settings.feeLevel : 'normal'; + // Platform info + var isChromeApp = platformInfo.isChromeApp; var isCordova = platformInfo.isCordova; + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; //custom fee flag var usingCustomFee = false; @@ -26,16 +31,6 @@ angular.module('copayApp.controllers').controller('confirmController', function( }, 10); } - $scope.shareTransaction = function() { - var explorerTxUrl = 'https://explorer.bitcoin.com/'+tx.coin+'/tx/'+lastTxId; - if (platformInfo.isCordova) { - var text = 'Take a look at this Bitcoin transaction here: '+explorerTxUrl; - window.plugins.socialsharing.share(text, null, null, null); - } else { - ionicToast.show(gettextCatalog.getString('Copied to clipboard'), 'bottom', false, 3000); - clipboardService.copyToClipboard(explorerTxUrl); - } - }; $scope.showWalletSelector = function() { $scope.walletSelector = true; @@ -50,6 +45,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $ionicConfig.views.swipeBackEnabled(false); }); + function exitWithError(err) { $log.info('Error setting wallet selector:' + err); popupService.showAlert(gettextCatalog.getString(), bwcError.msg(err), function() { @@ -72,108 +68,112 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); }; - var setWalletSelector = function(coin, network, minAmount, cb) { + $scope.$on("$ionicView.beforeEnter", function(event, data) { - // no min amount? (sendMax) => look for no empty wallets - minAmount = minAmount || 1; + function setWalletSelector(coin, network, minAmount, cb) { - $scope.wallets = profileService.getWallets({ - onlyComplete: true, - network: network, - coin: coin - }); + // no min amount? (sendMax) => look for no empty wallets + minAmount = minAmount || 1; - if (tx.fromWalletId) { - $scope.wallets = lodash.filter($scope.wallets, function (w) { - return w.id == tx.fromWalletId; + $scope.wallets = profileService.getWallets({ + onlyComplete: true, + network: network, + coin: coin }); - } + + if (tx.fromWalletId) { + $scope.wallets = lodash.filter($scope.wallets, function(w) { + return w.id == tx.fromWalletId; + }); + } - if (!$scope.wallets || !$scope.wallets.length) { - setNoWallet(gettextCatalog.getString('No wallets available'), true); - return cb(); - } - var filteredWallets = []; - var index = 0; - var walletsUpdated = 0; + if (!$scope.wallets || !$scope.wallets.length) { + setNoWallet(gettextCatalog.getString('No wallets available'), true); + return cb(); + } - lodash.each($scope.wallets, function (w) { - walletService.getStatus(w, {}, function (err, status) { - if (err || !status) { - $log.error(err); - } else { - walletsUpdated++; - w.status = status; + var filteredWallets = []; + var index = 0; + var walletsUpdated = 0; - if (!status.availableBalanceSat) - $log.debug('No balance available in: ' + w.name); + lodash.each($scope.wallets, function(w) { + walletService.getStatus(w, {}, function(err, status) { + if (err || !status) { + $log.error(err); + } else { + walletsUpdated++; + w.status = status; - if (status.availableBalanceSat > minAmount) { - filteredWallets.push(w); + if (!status.availableBalanceSat) + $log.debug('No balance available in: ' + w.name); + + if (status.availableBalanceSat > minAmount) { + filteredWallets.push(w); + } } - } - if (++index == $scope.wallets.length) { - if (!walletsUpdated) - return cb('Could not update any wallet'); + if (++index == $scope.wallets.length) { + if (!walletsUpdated) + return cb('Could not update any wallet'); - if (lodash.isEmpty(filteredWallets)) { - setNoWallet(gettextCatalog.getString('Insufficient confirmed funds'), true); + if (lodash.isEmpty(filteredWallets)) { + setNoWallet(gettextCatalog.getString('Insufficient confirmed funds'), true); + } + $scope.wallets = lodash.clone(filteredWallets); + return cb(); } - $scope.wallets = lodash.clone(filteredWallets); - return cb(); - } - }); - }); - }; - - $scope.getContacts = function(addr) { - addressbookService.list(function(err, ab) { - if (err) $log.error(err); - - $scope.hasContacts = lodash.isEmpty(ab) ? false : true; - if (!$scope.hasContacts) return cb(); - - var completeContacts = []; - lodash.each(ab, function(v, k) { - completeContacts.push({ - name: lodash.isObject(v) ? v.name : v, - address: k, - email: lodash.isObject(v) ? v.email : null, - recipientType: 'contact', - coin: v.coin, - displayCoin: (v.coin == 'bch' - ? (config.bitcoinCashAlias || defaults.bitcoinCashAlias) - : (config.bitcoinAlias || defaults.bitcoinAlias)).toUpperCase() }); }); + }; - return cb(); - }); - }; - - $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.fromWallet = profileService.getWallet(data.stateParams.fromWalletId); // Wallet to send from + // Setup $scope + var B = data.stateParams.coin == 'bch' ? bitcoreCash : bitcore; + var networkName; + try { + networkName = (new B.Address(data.stateParams.toAddress)).network.name; + } catch(e) { + var message = gettextCatalog.getString('Invalid address'); + var backText = gettextCatalog.getString('Go back'); + var learnText = gettextCatalog.getString('Learn more'); + popupService.showConfirm(null, message, backText, learnText, function(back) { + $ionicHistory.nextViewOptions({ + disableAnimate: true, + historyRoot: true + }); + $state.go('tabs.send').then(function() { + $ionicHistory.clearHistory(); + if (!back) { + var url = 'https://support.bitpay.com/hc/en-us/articles/115004671663'; + externalLinkService.open(url); + } + }); + }); + return; + } // Grab stateParams tx = { - amount: parseInt(data.stateParams.amount), + toAmount: parseInt(data.stateParams.toAmount), sendMax: data.stateParams.useSendMax == 'true' ? true : false, fromWalletId: data.stateParams.fromWalletId, toAddress: data.stateParams.toAddress, + displayAddress: data.stateParams.displayAddress, + description: data.stateParams.description, + paypro: data.stateParams.paypro, + feeLevel: configFeeLevel, spendUnconfirmed: walletConfig.spendUnconfirmed, // Vanity tx info (not in the real tx) - recipientType: $scope.recipientType || null, - toName: null, - toEmail: null, - toColor: null, - network: false, - coin: $scope.fromWallet.coin, + recipientType: data.stateParams.recipientType || null, + toName: data.stateParams.toName, + toEmail: data.stateParams.toEmail, + toColor: data.stateParams.toColor, + network: networkName, + coin: data.stateParams.coin, txp: {}, }; @@ -182,71 +182,18 @@ angular.module('copayApp.controllers').controller('confirmController', function( tx.feeRate = parseInt(data.stateParams.requiredFeeRate); } - if (tx.coin && tx.coin === 'bch') { + if (tx.coin && tx.coin == 'bch') { tx.feeLevel = 'normal'; } - var B = data.stateParams.coin === 'bch' ? bitcoreCash : bitcore; - var networkName; - $scope.recipientType = null; - try { - if (data.stateParams.toWalletId) { // There is a toWalletId, so we presume this is a wallet-to-wallet transfer - $scope.recipientType = 'wallet'; // set transaction type to wallet-to-wallet - $ionicLoading.show(); - - var toWallet = profileService.getWallet(data.stateParams.toWalletId); - tx.toColor = toWallet.color; - tx.toName = toWallet.name; - - // We need an address to send to, so we ask the walletService to create a new address for the toWallet. - walletService.getAddress(toWallet, true, function (err, addr) { - $ionicLoading.hide(); - tx.toAddress = addr; - networkName = (new B.Address(tx.toAddress)).network.name; - tx.network = networkName; - setupTx(tx); - }); - } else { // This is a Wallet-to-address transfer - networkName = (new B.Address(tx.toAddress)).network.name; - tx.network = networkName; - setupTx(tx); - } - } catch (e) { - var message = gettextCatalog.getString('Invalid address'); - popupService.showAlert(null, message, function () { - $ionicHistory.nextViewOptions({ - disableAnimate: true, - historyRoot: true - }); - $state.go('tabs.send').then(function () { - $ionicHistory.clearHistory(); - }); - }); - return; - } - }); - - var setupTx = function(tx) { - if (tx.coin === 'bch') { - tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr; - } else { - tx.displayAddress = entry.address; - } - - addressbookService.get(tx.coin+tx.toAddress, function(err, addr) { // Check if the recipient is a contact - if (!err && addr) { - tx.toName = addr.name; - tx.toEmail = addr.email; - tx.recipientType = 'contact'; - } - }); - // Other Scope vars $scope.isCordova = isCordova; + $scope.isWindowsPhoneApp = isWindowsPhoneApp; $scope.showAddress = false; + $scope.walletSelectorTitle = gettextCatalog.getString('Send from'); - setWalletSelector(tx.coin, tx.network, tx.amount, function(err) { + setWalletSelector(tx.coin, tx.network, tx.toAmount, function(err) { if (err) { return exitWithError('Could not update wallets'); } @@ -260,7 +207,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.displayBalanceAsFiat = walletConfig.settings.priceDisplay === 'fiat'; - }; + }); function getSendMaxInfo(tx, wallet, cb) { @@ -284,7 +231,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( return setSendError(msg); } - if (tx.amount > Number.MAX_SAFE_INTEGER) { + if (tx.toAmount > Number.MAX_SAFE_INTEGER) { var msg = gettextCatalog.getString('Amount too big'); $log.warn(msg); return setSendError(msg); @@ -294,7 +241,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( txp.outputs = [{ 'toAddress': tx.toAddress, - 'amount': tx.amount, + 'amount': tx.toAmount, 'message': tx.description }]; @@ -333,13 +280,13 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.tx = tx; function updateAmount() { - if (!tx.amount) return; + if (!tx.toAmount) return; // Amount - tx.amountStr = txFormatService.formatAmountStr(wallet.coin, tx.amount); + tx.amountStr = txFormatService.formatAmountStr(wallet.coin, tx.toAmount); tx.amountValueStr = tx.amountStr.split(' ')[0]; tx.amountUnitStr = tx.amountStr.split(' ')[1]; - txFormatService.formatAlternativeStr(wallet.coin, tx.amount, function(v) { + txFormatService.formatAlternativeStr(wallet.coin, tx.toAmount, function(v) { var parts = v.split(' '); tx.alternativeAmountStr = v; tx.alternativeAmountValueStr = parts[0]; @@ -395,7 +342,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( } tx.sendMaxInfo = sendMaxInfo; - tx.amount = tx.sendMaxInfo.amount; + tx.toAmount = tx.sendMaxInfo.amount; updateAmount(); ongoingProcess.set('calculatingFee', false); $timeout(function() { @@ -446,7 +393,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( function useSelectedWallet() { if (!$scope.useSendMax) { - showAmount(tx.amount); + showAmount(tx.toAmount); } $scope.onWalletSelect($scope.wallet); @@ -455,19 +402,19 @@ angular.module('copayApp.controllers').controller('confirmController', function( function setButtonText(isMultisig, isPayPro) { if (isPayPro) { - if (isCordova) { + if (isCordova && !isWindowsPhoneApp) { $scope.buttonText = gettextCatalog.getString('Slide to pay'); } else { $scope.buttonText = gettextCatalog.getString('Click to pay'); } } else if (isMultisig) { - if (isCordova) { + if (isCordova && !isWindowsPhoneApp) { $scope.buttonText = gettextCatalog.getString('Slide to accept'); } else { $scope.buttonText = gettextCatalog.getString('Click to accept'); } } else { - if (isCordova) { + if (isCordova && !isWindowsPhoneApp) { $scope.buttonText = gettextCatalog.getString('Slide to send'); } else { $scope.buttonText = gettextCatalog.getString('Click to send'); @@ -475,6 +422,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( } }; + $scope.toggleAddress = function() { $scope.showAddress = !$scope.showAddress; }; @@ -517,8 +465,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( if (!lodash.isEmpty(warningMsg)) msg += '\n' + warningMsg; - popupService.showAlert(null, msg, function() {}); - + popupService.showAlert(null, msg, function() {}); }; $scope.onWalletSelect = function(wallet) { @@ -665,7 +612,6 @@ angular.module('copayApp.controllers').controller('confirmController', function( txConfirmNotification.subscribe(wallet, { txid: txp.txid }); - lastTxId = txp.txid; } }, onSendStatusChange); }; @@ -697,9 +643,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( soundService.play('misc/payment_sent.mp3'); } - var channel = "ga"; - if (platformInfo.isCordova) { - channel = "firebase"; + var channel = "firebase"; + if (platformInfo.isNW) { + channel = "ga"; } var log = new window.BitAnalytics.LogEvent("transfer_success", [{ "coin": $scope.wallet.coin, @@ -709,6 +655,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( }], [channel, "adjust"]); window.BitAnalytics.LogEventHandlers.postEvent(log); + // Should be removed + firebaseEventsService.logEvent('sent_bitcoin', { coin: $scope.wallet.coin }); $timeout(function() { $scope.$digest(); }, 100); diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index a21053e2d..a25300a4a 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('createController', - function($scope, $timeout, $log, lodash, $state, $ionicScrollDelegate, $ionicHistory, profileService, configService, gettextCatalog, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, popupService, appConfigService, pushNotificationsService, $ionicNavBarDelegate) { + function($scope, $rootScope, $timeout, $log, lodash, $state, $ionicScrollDelegate, $ionicHistory, profileService, configService, gettextCatalog, ledger, trezor, intelTEE, derivationPathHelper, ongoingProcess, walletService, storageService, popupService, appConfigService, pushNotificationsService, firebaseEventsService, $ionicNavBarDelegate) { /* For compressed keys, m*73 + n*34 <= 496 */ var COPAYER_PAIR_LIMITS = { @@ -268,7 +268,7 @@ angular.module('copayApp.controllers').controller('createController', }, 100); } else { - //firebaseEventsService.logEvent('wallet_created', { coin: opts.coin }); + firebaseEventsService.logEvent('wallet_created', { coin: opts.coin }); $state.go('tabs.home'); } } diff --git a/src/js/controllers/customAmount.js b/src/js/controllers/customAmount.js index 5d22d40fb..f6b96c22c 100644 --- a/src/js/controllers/customAmount.js +++ b/src/js/controllers/customAmount.js @@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('customAmountController', func } $scope.$on("$ionicView.beforeEnter", function(event, data) { - var walletId = data.stateParams.toWalletId; + var walletId = data.stateParams.id; if (!walletId) { showErrorAndBack('Error', 'No wallet selected'); @@ -53,26 +53,17 @@ angular.module('copayApp.controllers').controller('customAmountController', func $scope.address = bchAddresses[$scope.bchAddressType]; } - $scope.coin = $scope.wallet.coin; - var satoshis = parseInt(data.stateParams.amount, 10); + $scope.coin = data.stateParams.coin; var parsedAmount = txFormatService.parseAmount( $scope.wallet.coin, - satoshis, - 'sat'); + data.stateParams.amount, + data.stateParams.currency); // Amount in USD or BTC var amount = parsedAmount.amount; var currency = parsedAmount.currency; $scope.amountUnitStr = parsedAmount.amountUnitStr; - configService.whenAvailable(function (config) { - $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay; - - $timeout(function () { - $scope.$apply(); - }); - }); - if (currency != 'BTC' && currency != 'BCH') { // Convert to BTC or BCH var config = configService.getSync().wallet.settings; diff --git a/src/js/controllers/onboarding/tour.js b/src/js/controllers/onboarding/tour.js index f6cf0afe2..47261006b 100644 --- a/src/js/controllers/onboarding/tour.js +++ b/src/js/controllers/onboarding/tour.js @@ -1,6 +1,6 @@ 'use strict'; angular.module('copayApp.controllers').controller('tourController', - function ($scope, $state, $log, $timeout, $filter, ongoingProcess, configService, profileService, rateService, popupService, gettextCatalog, lodash, startupService, storageService, uxLanguage, walletService, $q) { + function($scope, $state, $log, $timeout, $filter, ongoingProcess, profileService, rateService, popupService, gettextCatalog, startupService, storageService, walletService, $q) { $scope.data = { index: 0 @@ -46,90 +46,62 @@ angular.module('copayApp.controllers').controller('tourController', creatingWallet = true; ongoingProcess.set('creatingWallet', true); $timeout(function() { - uxLanguage.init(function(lang) { - var rateCode = uxLanguage.getRateCode(lang); - console.log("When Available: rateService"); - rateService.whenAvailable(function() { - var alternatives = rateService.listAlternatives(true); + profileService.createDefaultWallet(function(err, walletClients) { + if (err) { + $log.warn(err); - var newAltCurrency = lodash.find(alternatives, { - 'isoCode': rateCode + return $timeout(function() { + $log.warn('Retrying to create default wallet.....:' + ++retryCount); + if (retryCount > 3) { + ongoingProcess.set('creatingWallet', false); + popupService.showAlert( + gettextCatalog.getString('Cannot Create Wallet'), err, + function() { + retryCount = 0; + return $scope.createDefaultWallet(); + }, gettextCatalog.getString('Retry')); + } else { + return $scope.createDefaultWallet(); + } + }, 2000); + }; + + ongoingProcess.set('creatingWallet', false); + var bchWallet = walletClients[0]; + var btcWallet = walletClients[1]; + var bchWalletId = bchWallet.credentials.walletId; + var btcWalletId = btcWallet.credentials.walletId; + + function createAddressPromise(wallet) { + return $q(function(resolve, reject) { + walletService.getAddress(wallet, true, function(e, addr) { + if (e) reject(e); + resolve(addr); }); - - configService.whenAvailable(function(config) { - var opts = { - wallet: { - settings: { - alternativeName: newAltCurrency.name, - alternativeIsoCode: newAltCurrency.isoCode, - } - } - }; - configService.set(opts, function(err) { - if (err) $log.warn(err); - - profileService.createDefaultWallet(function(err, walletClients) { - if (err) { - $log.warn(err); - - return $timeout(function() { - $log.warn('Retrying to create default wallet.....:' + ++retryCount); - if (retryCount > 3) { - ongoingProcess.set('creatingWallet', false); - popupService.showAlert( - gettextCatalog.getString('Cannot Create Wallet'), err, - function() { - retryCount = 0; - return $scope.createDefaultWallet(); - }, gettextCatalog.getString('Retry')); - } else { - return $scope.createDefaultWallet(); - } - }, 2000); - } - ; - - ongoingProcess.set('creatingWallet', false); - var bchWallet = walletClients[0]; - var btcWallet = walletClients[1]; - var bchWalletId = bchWallet.credentials.walletId; - var btcWalletId = btcWallet.credentials.walletId; - - function createAddressPromise(wallet) { - return $q(function (resolve, reject) { - walletService.getAddress(wallet, true, function (e, addr) { - if (e) reject(e); - resolve(addr); - }); - }); - } - - function goToCollectEmail() { - $state.go('onboarding.collectEmail', { - bchWalletId: bchWalletId, - btcWalletId: btcWalletId - }); - } - - var bchAddressPromise = createAddressPromise(bchWallet); - var btcAddressPromise = createAddressPromise(btcWallet); - ongoingProcess.set('generatingNewAddress', true); - - $q.all([bchAddressPromise, btcAddressPromise]).then(function (addresses) { - ongoingProcess.set('generatingNewAddress', false); - $state.go('tabs.home'); - }, function (e) { - ongoingProcess.set('generatingNewAddress', false); - $log.warn(e); - popupService.showAlert(gettextCatalog.getString('Error'), e); - $state.go('tabs.home'); - }); - }); - }); - }); - $log.debug('Setting default currency : ' + newAltCurrency); }); - }) - }, 300); - }; - }); + } + + function goToCollectEmail() { + $state.go('onboarding.collectEmail', { + bchWalletId: bchWalletId, + btcWalletId: btcWalletId + }); + } + + var bchAddressPromise = createAddressPromise(bchWallet); + var btcAddressPromise = createAddressPromise(btcWallet); + ongoingProcess.set('generatingNewAddress', true); + + $q.all([bchAddressPromise, btcAddressPromise]).then(function(addresses) { + ongoingProcess.set('generatingNewAddress', false); + $state.go('tabs.home'); + }, function(e) { + ongoingProcess.set('generatingNewAddress', false); + $log.warn(e); + popupService.showAlert(gettextCatalog.getString('Error'), e); + $state.go('tabs.home'); + }); + }); + }, 300); + }; + }); diff --git a/src/js/controllers/preferencesNotifications.js b/src/js/controllers/preferencesNotifications.js index a9a833ff7..edfb983b5 100644 --- a/src/js/controllers/preferencesNotifications.js +++ b/src/js/controllers/preferencesNotifications.js @@ -76,9 +76,9 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr emailService.updateEmail(opts); - var channel = "ga"; - if (platformInfo.isCordova) { - channel = "firebase"; + var channel = "firebase"; + if (platformInfo.isNW) { + channel = "ga"; } var log = new window.BitAnalytics.LogEvent("settings_email_notification_toggle", [{ "toggle": $scope.emailNotifications.value diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js deleted file mode 100644 index ae30382fb..000000000 --- a/src/js/controllers/review.controller.js +++ /dev/null @@ -1,974 +0,0 @@ -'use strict'; - -(function () { - -angular - .module('copayApp.controllers') - .controller('reviewController', reviewController); - - function reviewController(addressbookService, bitcoinCashJsService, bitcore, bitcoreCash, bwcError, clipboardService, configService, feeService, gettextCatalog, $interval, $ionicHistory, $ionicModal, ionicToast, lodash, $log, ongoingProcess, platformInfo, popupService, profileService, $scope, sendFlowService, shapeshiftService, soundService, $state, $timeout, txConfirmNotification, txFormatService, walletService) { - var vm = this; - - vm.buttonText = ''; - vm.destination = { - address: '', - balanceAmount: '', - balanceCurrency: '', - coin: '', - color: '', - currency: '', - currencyColor: '', - kind: '', // 'address', 'contact', 'wallet' - name: '' - }; - vm.displayAddress = ''; - vm.feeCrypto = ''; - vm.feeFiat = ''; - vm.fiatCurrency = ''; - vm.feeIsHigh = false; - vm.feeLessThanACent = false; - vm.isCordova = platformInfo.isCordova; - vm.memo = ''; - vm.notReadyMessage = ''; - vm.origin = { - balanceAmount: '', - balanceCurrency: '', - currency: '', - currencyColor: '', - }; - vm.originWallet = null; - vm.paymentExpired = false; - vm.personalNotePlaceholder = gettextCatalog.getString('Enter text here'); - vm.primaryAmount = ''; - vm.primaryCurrency = ''; - vm.usingMerchantFee = false; - vm.readyToSend = false; - vm.remainingTimeStr = ''; - vm.secondaryAmount = ''; - vm.secondaryCurrency = ''; - vm.sendingTitle = gettextCatalog.getString('You are sending'); - vm.sendStatus = ''; - vm.showAddress = true; - vm.thirdParty = false; - vm.wallet = null; - vm.memoExpanded = false; - - // Functions - vm.goBack = goBack; - vm.onSuccessConfirm = onSuccessConfirm; - vm.onShareTransaction = onShareTransaction; - - var sendFlowData; - var config = null; - var coin = ''; - var countDown = null; - var defaults = {}; - var usingCustomFee = false; - var usingMerchantFee = false; - var destinationWalletId = ''; - var lastTxId = ''; - var originWalletId = ''; - var priceDisplayIsFiat = true; - var satoshis = null; - var toAddress = ''; - var tx = {}; - var txPayproData = null; - var unitFromSat = 0; - - var FEE_TOO_HIGH_LIMIT_PERCENTAGE = 15; - - $scope.$on("$ionicView.beforeEnter", onBeforeEnter); - - - function onBeforeEnter(event, data) { - console.log('review onBeforeEnter sendflow ', sendFlowService.state); - // Reset from last time - vm.memo = ''; - - defaults = configService.getDefaults(); - sendFlowData = sendFlowService.state.getClone(); - originWalletId = sendFlowData.fromWalletId; - if (typeof sendFlowData.amount === 'string') { - satoshis = parseInt(sendFlowData.amount, 10); - } else { - satoshis = sendFlowData.amount; - } - toAddress = sendFlowData.toAddress; - destinationWalletId = sendFlowData.toWalletId; - - vm.displayAddress = sendFlowData.displayAddress; - vm.originWallet = profileService.getWallet(originWalletId); - vm.origin.currency = vm.originWallet.coin.toUpperCase(); - coin = vm.originWallet.coin; - - if (sendFlowData.thirdParty) { - vm.thirdParty = sendFlowData.thirdParty; - switch (vm.thirdParty.id) { - case 'shapeshift': - initShapeshift(function (err) { - if (err) { - // Error stop here - ongoingProcess.set('connectingShapeshift', false); - popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), err.toString(), function () { - $ionicHistory.goBack(); - }); - } else { - _next(data); - } - }); - break; - case 'bip70': - initBip70(); - default: - _next(data); - break; - } - } else { - _next(data); - } - - function _next() { - configService.get(function onConfig(err, configCache) { - if (err) { - $log.err('Error getting config.', err); - } else { - config = configCache; - priceDisplayIsFiat = config.wallet.settings.priceDisplay === 'fiat'; - vm.origin.currencyColor = (vm.originWallet.coin === 'btc' ? defaults.bitcoinWalletColor : defaults.bitcoinCashWalletColor); - console.log("coin", vm.originWallet.coin, vm.origin.currencyColor, config.bitcoinWalletColor, vm.originWallet.coin === 'btc'); - unitFromSat = 1 / config.wallet.settings.unitToSatoshi; - } - updateSendAmounts(); - getOriginWalletBalance(vm.originWallet); - handleDestinationAsAddress(toAddress, coin); - handleDestinationAsWallet(sendFlowData.toWalletId); - createVanityTransaction(data); - }); - } - } - - vm.approve = function() { - - if (!tx || !vm.originWallet) return; - - if (vm.paymentExpired) { - popupService.showAlert(null, gettextCatalog.getString('This bitcoin payment request has expired.', function () { - $ionicHistory.goBack(); - })); - vm.sendStatus = ''; - $timeout(function() { - $scope.$apply(); - }); - return; - } - - ongoingProcess.set('creatingTx', true, statusChangeHandler); - getTxp(lodash.clone(tx), vm.originWallet, false, function(err, txp) { - ongoingProcess.set('creatingTx', false, statusChangeHandler); - if (err) return; - - // confirm txs for more that 20usd, if not spending/touchid is enabled - function confirmTx(cb) { - if (walletService.isEncrypted(vm.originWallet)) - return cb(); - - var amountUsd = parseFloat(txFormatService.formatToUSD(vm.originWallet.coin, txp.amount)); - return cb(); - }; - - function publishAndSign() { - if (!vm.originWallet.canSign() && !vm.originWallet.isPrivKeyExternal()) { - $log.info('No signing proposal: No private key'); - - return walletService.onlyPublish(vm.originWallet, txp, function(err) { - if (err) setSendError(err); - }, statusChangeHandler); - } - - walletService.publishAndSign(vm.originWallet, txp, function(err, txp) { - if (err) return setSendError(err); - if (config.confirmedTxsNotifications && config.confirmedTxsNotifications.enabled) { - txConfirmNotification.subscribe(vm.originWallet, { - txid: txp.txid - }); - lastTxId = txp.txid; - } - }, statusChangeHandler); - }; - - confirmTx(function(nok) { - if (nok) { - vm.sendStatus = ''; - $timeout(function() { - $scope.$apply(); - }); - return; - } - publishAndSign(); - }); - }); - }; - - vm.chooseFeeLevel = function(tx, wallet) { - - if (wallet.coin == 'bch') return; - if (usingMerchantFee) return; - - var scope = $rootScope.$new(true); - scope.network = tx.network; - scope.feeLevel = tx.feeLevel; - scope.noSave = true; - scope.coin = vm.originWallet.coin; - - if (usingCustomFee) { - scope.customFeePerKB = tx.feeRate; - scope.feePerSatByte = tx.feeRate / 1000; - } - - $ionicModal.fromTemplateUrl('views/modals/chooseFeeLevel.html', { - scope: scope, - backdropClickToClose: false, - hardwareBackButtonClose: false - }).then(function(modal) { - scope.chooseFeeLevelModal = modal; - scope.openModal(); - }); - scope.openModal = function() { - scope.chooseFeeLevelModal.show(); - }; - - scope.hideModal = function(newFeeLevel, customFeePerKB) { - scope.chooseFeeLevelModal.hide(); - $log.debug('New fee level choosen:' + newFeeLevel + ' was:' + tx.feeLevel); - - usingCustomFee = newFeeLevel == 'custom' ? true : false; - - if (tx.feeLevel == newFeeLevel && !usingCustomFee) return; - - tx.feeLevel = newFeeLevel; - if (usingCustomFee) tx.feeRate = parseInt(customFeePerKB); - - updateTx(tx, vm.originWallet, { - clearCache: true, - dryRun: true - }, function() {}); - }; - }; - - function createVanityTransaction(data) { - console.log('createVanityTransaction()'); - var configFeeLevel = config.wallet.settings.feeLevel ? config.wallet.settings.feeLevel : 'normal'; - - // Grab stateParams - tx = { - amount: parseInt(sendFlowData.amount), - sendMax: sendFlowData.sendMax, - fromWalletId: sendFlowData.fromWalletId, - toAddress: sendFlowData.toAddress, - paypro: txPayproData, - - feeLevel: configFeeLevel, - spendUnconfirmed: config.wallet.spendUnconfirmed, - - // Vanity tx info (not in the real tx) - recipientType: vm.destination.kind || null, - toName: vm.destination.name || null, - toEmail: vm.destination.email || null, - toColor: vm.destination.color || null, - network: false, - coin: vm.originWallet.coin, - txp: {}, - }; - - - if (data.stateParams.requiredFeeRate) { - vm.usingMerchantFee = true; - tx.feeRate = parseInt(data.stateParams.requiredFeeRate); - } - - if (tx.coin && tx.coin === 'bch') { - tx.feeLevel = 'normal'; - } - - var B = tx.coin === 'bch' ? bitcoreCash : bitcore; - var networkName; - try { - if (vm.destination.kind === 'wallet') { // This is a wallet-to-wallet transfer - ongoingProcess.set('generatingNewAddress', true); - var toWallet = profileService.getWallet(destinationWalletId); - - // We need an address to send to, so we ask the walletService to create a new address for the toWallet. - console.log('Getting address for wallet...'); - walletService.getAddress(toWallet, true, function onWalletAddress(err, addr) { - console.log('getAddress cb called', err); - ongoingProcess.set('generatingNewAddress', false); - tx.toAddress = addr; - networkName = (new B.Address(tx.toAddress)).network.name; - tx.network = networkName; - console.log('calling setupTx() for wallet.'); - setupTx(tx); - }); - } else { // This is a Wallet-to-address transfer - networkName = (new B.Address(tx.toAddress)).network.name; - tx.network = networkName; - console.log('calling setupTx() for address.'); - setupTx(tx); - } - } catch (e) { - console.error('Error setting up tx', e); - var message = gettextCatalog.getString('Invalid address'); - popupService.showAlert(null, message, function () { - $ionicHistory.nextViewOptions({ - disableAnimate: true, - historyRoot: true - }); - $state.go('tabs.send').then(function () { - $ionicHistory.clearHistory(); - }); - }); - return; - } - } - function getOriginWalletBalance(originWallet) { - var balanceText = getWalletBalanceDisplayText(vm.originWallet); - vm.origin.balanceAmount = balanceText.amount; - vm.origin.balanceCurrency = balanceText.currency; - } - - function getSendMaxInfo(tx, wallet, cb) { - if (!tx.sendMax) return cb(); - - //ongoingProcess.set('retrievingInputs', true); - walletService.getSendMaxInfo(wallet, { - feePerKb: tx.feeRate, - excludeUnconfirmedUtxos: !tx.spendUnconfirmed, - returnInputs: true, - }, cb); - }; - - function getTxp(tx, wallet, dryRun, cb) { - - // ToDo: use a credential's (or fc's) function for this - if (tx.description && !wallet.credentials.sharedEncryptingKey) { - var msg = gettextCatalog.getString('Could not add message to imported wallet without shared encrypting key'); - $log.warn(msg); - return setSendError(msg); - } - - if (tx.amount > Number.MAX_SAFE_INTEGER) { - var msg = gettextCatalog.getString('Amount too big'); - $log.warn(msg); - return setSendError(msg); - } - - var txp = {}; - - txp.outputs = [{ - 'toAddress': tx.toAddress, - 'amount': tx.amount, - 'message': vm.memo - }]; - - if (tx.sendMaxInfo) { - txp.inputs = tx.sendMaxInfo.inputs; - txp.fee = tx.sendMaxInfo.fee; - } else { - if (usingCustomFee || usingMerchantFee) { - txp.feePerKb = tx.feeRate; - } else txp.feeLevel = tx.feeLevel; - } - - txp.message = vm.memo; - - if (tx.paypro) { - txp.payProUrl = tx.paypro.url; - } - txp.excludeUnconfirmedUtxos = !tx.spendUnconfirmed; - txp.dryRun = dryRun; - walletService.createTx(wallet, txp, function(err, ctxp) { - if (err) { - setSendError(err); - return cb(err); - } - return cb(null, ctxp); - }); - }; - - function getWalletBalanceDisplayText(wallet) { - var balanceCryptoAmount = ''; - var balanceCryptoCurrencyCode = ''; - var balanceFiatAmount = ''; - var balanceFiatCurrency = ''; - var displayAmount = ''; - var displayCurrency = ''; - - var walletStatus = null; - if (wallet.status && wallet.status.isValid) { - walletStatus = wallet.status; - } else if (wallet.cachedStatus.isValid) { - walletStatus = wallet.cachedStatus; - } - - if (walletStatus) { - var cryptoBalanceParts = walletStatus.spendableBalanceStr.split(' '); - balanceCryptoAmount = cryptoBalanceParts[0]; - balanceCryptoCurrencyCode = cryptoBalanceParts.length > 1 ? cryptoBalanceParts[1] : ''; - - if (walletStatus.alternativeBalanceAvailable) { - balanceFiatAmount = walletStatus.spendableBalanceAlternative; - balanceFiatCurrency = walletStatus.alternativeIsoCode; - } - } - - if (priceDisplayIsFiat) { - displayAmount = balanceFiatAmount ? balanceFiatAmount : balanceCryptoAmount; - displayCurrency = balanceFiatAmount ? balanceFiatCurrency : balanceCryptoCurrencyCode; - } else { - displayAmount = balanceCryptoAmount; - displayCurrency = balanceCryptoCurrencyCode; - } - - return { - amount: displayAmount, - currency: displayCurrency - }; - } - - function goBack() { - sendFlowService.router.goBack(); - } - - function handleDestinationAsAddress(address, originCoin) { - if (!address) { - return; - } - - // Check if the recipient is a contact - addressbookService.get(originCoin + address, function(err, contact) { - if (!err && contact) { - handleDestinationAsAddressOfContact(contact); - } else { - if (originCoin === 'bch') { - vm.destination.address = bitcoinCashJsService.readAddress(address).cashaddr; - } else { - vm.destination.address = address; - } - vm.destination.kind = 'address'; - } - }); - - } - - function handleDestinationAsAddressOfContact(contact) { - vm.destination.kind = 'contact'; - vm.destination.name = contact.name; - vm.destination.email = contact.email; - vm.destination.color = contact.coin === 'btc' ? defaults.bitcoinWalletColor : defaults.bitcoinCashWalletColor; - vm.destination.currency = contact.coin.toUpperCase(); - vm.destination.currencyColor = vm.destination.color; - } - - function handleDestinationAsWallet(walletId) { - destinationWalletId = walletId; - if (!destinationWalletId) { - return; - } - - var destinationWallet = profileService.getWallet(destinationWalletId); - vm.destination.coin = destinationWallet.coin; - vm.destination.color = destinationWallet.color; - vm.destination.currency = destinationWallet.coin.toUpperCase(); - vm.destination.kind = 'wallet'; - vm.destination.name = destinationWallet.name; - - if (defaults) { - vm.destination.currencyColor = vm.destination.coin === 'btc' ? defaults.bitcoinWalletColor : defaults.bitcoinCashWalletColor; - } - - var balanceText = getWalletBalanceDisplayText(destinationWallet); - vm.destination.balanceAmount = balanceText.amount; - vm.destination.balanceCurrency = balanceText.currency; - } - - function initBip70() { - vm.sendingTitle = gettextCatalog.getString('You are paying'); - vm.memo = vm.thirdParty.memo; - vm.memoExpanded = !!vm.memo; - vm.destination.name = vm.thirdParty.name; - - txPayproData = { - caTrusted: vm.thirdParty.caTrusted, - domain: vm.thirdParty.domain, - expires: vm.thirdParty.expires, - toAddress: toAddress, - url: vm.thirdParty.url, - verified: vm.thirdParty.verified, - }; - } - - function initShapeshift(cb) { - vm.sendingTitle = gettextCatalog.getString('You are shifting'); - if (!vm.thirdParty.data) { - vm.thirdParty.data = {}; - } - - var toWallet = profileService.getWallet(destinationWalletId); - vm.destination.name = toWallet.name; - vm.destination.color = toWallet.color; - vm.destination.currency = toWallet.coin.toUpperCase(); - - - ongoingProcess.set('connectingShapeshift', true); - walletService.getAddress(vm.originWallet, false, function onReturnWalletAddress(err, returnAddr) { - if (err) { - return cb(err); - } - walletService.getAddress(toWallet, false, function onWithdrawalWalletAddress(err, withdrawalAddr) { - if (err) { - return cb(err); - } - - // Need to use the correct service to do it. - var amount = parseFloat(satoshis / 100000000); - - shapeshiftService.shiftIt(vm.originWallet.coin, toWallet.coin, withdrawalAddr, returnAddr, amount, function onShiftIt(err, shapeshiftData) { - if (err) { - return cb(err); - } else { - vm.destination.kind = 'shapeshift'; - vm.destination.address = toAddress; - tx.toAddress = shapeshiftData.toAddress; - vm.memo = 'ShapeShift Order:\nhttps://www.shapeshift.io/#/status/' + shapeshiftData.orderId; - vm.memoExpanded = !!vm.memo; - ongoingProcess.set('connectingShapeshift', false); - cb(); - } - }); - }); - }); - } - - function onShareTransaction() { - var explorerTxUrl = 'https://explorer.bitcoin.com/' + tx.coin + '/tx/' + lastTxId; - if (platformInfo.isCordova) { - var text = gettextCatalog.getString('Take a look at this Bitcoin Cash transaction here: ') + explorerTxUrl; - if (coin === 'btc') { - text = gettextCatalog.getString('Take a look at this Bitcoin transaction here: ') + explorerTxUrl; - } - window.plugins.socialsharing.share(text, null, null, null); - } else { - ionicToast.show(gettextCatalog.getString('Copied to clipboard'), 'bottom', false, 3000); - clipboardService.copyToClipboard(explorerTxUrl); - } - - } - - function startExpirationTimer(expirationTime) { - vm.paymentExpired = false; - setExpirationTime(); - - countDown = $interval(function() { - setExpirationTime(); - }, 1000); - - function setExpirationTime() { - console.log('setExpirationTime()'); - var now = Math.floor(Date.now() / 1000); - - if (now > expirationTime) { - setExpiredValues(); - return; - } - - var totalSecs = expirationTime - now; - var m = Math.floor(totalSecs / 60); - var s = totalSecs % 60; - vm.remainingTimeStr = m + ":" + ('0' + s).slice(-2); - }; - - function setExpiredValues() { - vm.paymentExpired = true; - vm.remainingTimeStr = gettextCatalog.getString('Expired'); - vm.readyToSend = false; - if (countDown) $interval.cancel(countDown); - $timeout(function() { - $scope.$apply(); - }); - }; - }; - - function updateSendAmounts() { - if (typeof satoshis !== 'number') { - return; - } - - var cryptoAmount = ''; - var cryptoCurrencyCode = ''; - var amountStr = txFormatService.formatAmountStr(coin, satoshis); - if (amountStr) { - var amountParts = amountStr.split(' '); - cryptoAmount = amountParts[0]; - cryptoCurrencyCode = amountParts.length > 1 ? amountParts[1] : ''; - } - // Want to avoid flashing of amount strings so do all formatting after this has returned. - txFormatService.formatAlternativeStr(coin, satoshis, function(v) { - if (!v) { - vm.primaryAmount = cryptoAmount; - vm.primaryCurrency = cryptoCurrencyCode; - vm.secondaryAmount = ''; - vm.secondaryCurrency = ''; - return; - } - vm.secondaryAmount = vm.primaryAmount; - vm.secondaryCurrency = vm.primaryCurrency; - - var fiatParts = v.split(' '); - var fiatAmount = fiatParts[0]; - var fiatCurrency = fiatParts.length > 1 ? fiatParts[1] : ''; - - if (priceDisplayIsFiat) { - vm.primaryAmount = fiatAmount; - vm.primaryCurrency = fiatCurrency; - vm.secondaryAmount = cryptoAmount; - vm.secondaryCurrency = cryptoCurrencyCode; - } else { - vm.primaryAmount = cryptoAmount; - vm.primaryCurrency = cryptoCurrencyCode; - vm.secondaryAmount = fiatAmount; - vm.secondaryCurrency = fiatCurrency; - } - }); - } - - function onSuccessConfirm() { - vm.sendStatus = ''; - $ionicHistory.nextViewOptions({ - disableAnimate: true, - historyRoot: true - }); - $state.go('tabs.send').then(function() { - $ionicHistory.clearHistory(); - $state.transitionTo('tabs.home'); - }); - }; - - function setButtonText(isMultisig, isPayPro) { - if (isPayPro) { - if (vm.isCordova) { - vm.buttonText = gettextCatalog.getString('Slide to pay'); - } else { - vm.buttonText = gettextCatalog.getString('Click to pay'); - } - } else if (isMultisig) { - if (vm.isCordova) { - vm.buttonText = gettextCatalog.getString('Slide to accept'); - } else { - vm.buttonText = gettextCatalog.getString('Click to accept'); - } - } else { - if (vm.isCordova) { - vm.buttonText = gettextCatalog.getString('Slide to send'); - } else { - vm.buttonText = gettextCatalog.getString('Click to send'); - } - } - } - - function setNotReady(msg, criticalError) { - vn.readyToSend = false; - vm.notReadyMessage = msg; - $scope.criticalError = criticalError; - $log.warn('Not ready to make the payment:' + msg); - $timeout(function() { - $scope.$apply(); - }); - }; - - function setSendError(msg) { - $scope.sendStatus = ''; - vm.readyToSend = false; - $timeout(function() { - $scope.$apply(); - }); - popupService.showAlert(gettextCatalog.getString('Error at confirm'), bwcError.msg(msg), function () { - $ionicHistory.goBack(); - }); - }; - - function setupTx(tx) { - if (tx.coin === 'bch') { - tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr; - } else { - tx.displayAddress = tx.toAddress; - } - - addressbookService.get(tx.coin+tx.toAddress, function(err, addr) { // Check if the recipient is a contact - if (!err && addr) { - tx.toName = addr.name; - tx.toEmail = addr.email; - tx.recipientType = 'contact'; - } - }); - - vm.showAddress = false; - - - setButtonText(vm.originWallet.credentials.m > 1, !!tx.paypro); - - if (tx.paypro) - startExpirationTimer(tx.paypro.expires); - - popupService.showConfirm(null, 'Do you want this transaction to be sent without a fee?', 'Yes', 'No', function(ok) { - if(ok){ - tx.feeRate = 0; - // tx.feeLevel = 'free'; - usingCustomFee = true; - } - updateTx(tx, vm.originWallet, { - dryRun: true - }, function(err) { - $timeout(function() { - $scope.$apply(); - }, 10); - - }); - }); - - - - // setWalletSelector(tx.coin, tx.network, tx.amount, function(err) { - // if (err) { - // return exitWithError('Could not update wallets'); - // } - // - // if (vm.wallets.length > 1) { - // vm.showWalletSelector(); - // } else if (vm.wallets.length) { - // setWallet(vm.wallets[0], tx); - // } - // }); - } - - function showSendMaxWarning(wallet, sendMaxInfo) { - var feeAlternative = '', - msg = ''; - - function verifyExcludedUtxos() { - var warningMsg = []; - if (sendMaxInfo.utxosBelowFee > 0) { - warningMsg.push(gettextCatalog.getString("A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided.", { - amountBelowFeeStr: txFormatService.formatAmountStr(wallet.coin, sendMaxInfo.amountBelowFee) - })); - } - - if (sendMaxInfo.utxosAboveMaxSize > 0) { - warningMsg.push(gettextCatalog.getString("A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded.", { - amountAboveMaxSizeStr: txFormatService.formatAmountStr(vm.originWallet.coin, sendMaxInfo.amountAboveMaxSize) - })); - } - return warningMsg.join('\n'); - }; - - feeAlternative = txFormatService.formatAlternativeStr(vm.originWallet.coin, sendMaxInfo.fee); - if (feeAlternative) { - msg = gettextCatalog.getString("{{feeAlternative}} will be deducted for bitcoin networking fees ({{fee}}).", { - fee: txFormatService.formatAmountStr(vm.originWallet.coin, sendMaxInfo.fee), - feeAlternative: feeAlternative - }); - } else { - msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees).", { - fee: txFormatService.formatAmountStr(vm.originWallet.coin, sendMaxInfo.fee) - }); - } - - var warningMsg = verifyExcludedUtxos(); - - if (!lodash.isEmpty(warningMsg)) - msg += '\n' + warningMsg; - - popupService.showAlert(null, msg, function() {}); - //popupService.showConfirm(null, msg, null, null, function() {}); - }; - - function statusChangeHandler(processName, showName, isOn) { - $log.debug('statusChangeHandler: ', processName, showName, isOn); - if ( - ( - processName === 'broadcastingTx' || - ((processName === 'signingTx') && vm.originWallet.m > 1) || - (processName == 'sendingTx' && !vm.originWallet.canSign() && !vm.originWallet.isPrivKeyExternal()) - ) && !isOn) { - // Show the popup - vm.sendStatus = 'success'; - - // Clear the send flow service state - sendFlowService.state.clear(); - - if ($state.current.name === "tabs.send.review") { // XX SP: Otherwise all open wallets on other devices play this sound if you have been in a send flow before on that device. - soundService.play('misc/payment_sent.mp3'); - } - - var channel = "firebase"; - if (platformInfo.isNW) { - channel = "ga"; - } - // When displaying Fiat, if the formatting fails, the crypto will be the primary amount. - var amount = unitFromSat * satoshis; - var log = new window.BitAnalytics.LogEvent("transfer_success", [{ - "coin": vm.originWallet.coin, - "type": "outgoing", - "amount": amount, - "fees": vm.feeCrypto - }], [channel, "adjust"]); - window.BitAnalytics.LogEventHandlers.postEvent(log); - - $timeout(function() { - $scope.$digest(); - }, 100); - } else if (showName) { - vm.sendStatus = showName; - } - }; - - function updateTx(tx, wallet, opts, cb) { - ongoingProcess.set('calculatingFee', true); - - if (opts.clearCache) { - tx.txp = {}; - } - - // $scope.tx = tx; - - // function updateAmount() { - // if (!tx.amount) return; - // - // // Amount - // tx.amountStr = txFormatService.formatAmountStr(originWallet.coin, tx.amount); - // tx.amountValueStr = tx.amountStr.split(' ')[0]; - // tx.amountUnitStr = tx.amountStr.split(' ')[1]; - // txFormatService.formatAlternativeStr(wallet.coin, tx.amount, function(v) { - // var parts = v.split(' '); - // tx.alternativeAmountStr = v; - // tx.alternativeAmountValueStr = parts[0]; - // tx.alternativeAmountUnitStr = (parts.length > 0) ? parts[1] : ''; - // }); - // } - // - // updateAmount(); - // refresh(); - - var feeServiceLevel = usingMerchantFee && vm.originWallet.coin == 'btc' ? 'urgent' : tx.feeLevel; - feeService.getFeeRate(vm.originWallet.coin, tx.network, feeServiceLevel, function(err, feeRate) { - if (err) { - ongoingProcess.set('calculatingFee', false); - return cb(err); - } - - var msg; - // if (tx.feeLevel == 'free'){ - // tx.feeRate = 0; - // } - // else - if (usingCustomFee) { - msg = gettextCatalog.getString('Custom'); - tx.feeLevelName = msg; - } else if (usingMerchantFee) { - $log.info('Using Merchant Fee:' + tx.feeRate + ' vs. Urgent level:' + feeRate); - msg = gettextCatalog.getString('Suggested by Merchant'); - tx.feeLevelName = msg; - } else { - tx.feeLevelName = feeService.feeOpts[tx.feeLevel]; - tx.feeRate = feeRate; - - } - - - getSendMaxInfo(lodash.clone(tx), wallet, function(err, sendMaxInfo) { - if (err) { - ongoingProcess.set('calculatingFee', false); - var msg = gettextCatalog.getString('Error getting SendMax information'); - return setSendError(msg); - } - - if (sendMaxInfo) { - - $log.debug('Send max info', sendMaxInfo); - - if (tx.sendMax && sendMaxInfo.amount == 0) { - ongoingProcess.set('calculatingFee', false); - setNotReady(gettextCatalog.getString('Insufficient confirmed funds')); - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee'), function () { - $ionicHistory.goBack(); - }); - return cb('no_funds'); - } - - tx.sendMaxInfo = sendMaxInfo; - tx.amount = tx.sendMaxInfo.amount; - satoshis = tx.amount; - updateSendAmounts(); - ongoingProcess.set('calculatingFee', false); - $timeout(function() { - showSendMaxWarning(wallet, sendMaxInfo); - }, 200); - } - - // txp already generated for this wallet? - if (tx.txp[wallet.id]) { - ongoingProcess.set('calculatingFee', false); - vm.readyToSend = true; - updateSendAmounts(); - $scope.$apply(); - return cb(); - } - - console.log('calling getTxp() from getSendMaxInfo cb.'); - getTxp(lodash.clone(tx), wallet, opts.dryRun, function(err, txp) { - ongoingProcess.set('calculatingFee', false); - if (err) { - if (err.message == 'Insufficient funds') { - setNotReady(gettextCatalog.getString('Insufficient funds')); - popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Not enough funds for fee')); - return cb('no_funds'); - } else - return cb(err); - } - - txp.feeStr = txFormatService.formatAmountStr(wallet.coin, txp.fee); - txFormatService.formatAlternativeStr(wallet.coin, txp.fee, function(v) { - // txp.alternativeFeeStr = v; - // if (txp.alternativeFeeStr.substring(0, 4) == '0.00') - // txp.alternativeFeeStr = '< ' + txp.alternativeFeeStr; - vm.feeFiat = v; - vm.fiatCurrency = config.wallet.settings.alternativeIsoCode; - if (v.substring(0, 1) === "<") { - vm.feeLessThanACent = true; - } - - console.log("fiat", vm.feeFiat); - - }); - - var per = (txp.fee / (txp.amount + txp.fee) * 100); - var perString = per.toFixed(2); - txp.feeRatePerStr = (perString == '0.00' ? '< ' : '') + perString + '%'; - txp.feeToHigh = per > FEE_TOO_HIGH_LIMIT_PERCENTAGE; - vm.feeCrypto = (unitFromSat * txp.fee).toFixed(8); - vm.feeIsHigh = txp.feeToHigh; - console.log("crypto", vm.feeCrypto); - - - tx.txp[wallet.id] = txp; - $log.debug('Confirm. TX Fully Updated for wallet:' + wallet.id, tx); - vm.readyToSend = true; - updateSendAmounts(); - console.log('readyToSend:', vm.readyToSend); - $scope.$apply(); - - return cb(); - }); - }); - }); - } - } -})(); diff --git a/src/js/controllers/servicesController.js b/src/js/controllers/servicesController.js index 0f9b6d4f8..62b13c041 100644 --- a/src/js/controllers/servicesController.js +++ b/src/js/controllers/servicesController.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('servicesController', function(externalLinkService, $scope, $ionicScrollDelegate, $timeout, servicesService, configService) { +angular.module('copayApp.controllers').controller('servicesController', function($scope, $ionicScrollDelegate, $timeout, servicesService, configService) { $scope.hide = false; configService.whenAvailable(function(config) { @@ -20,8 +20,4 @@ angular.module('copayApp.controllers').controller('servicesController', function }, 10); }; - $scope.open = function(url) { - externalLinkService.open(url, false); - } - }); diff --git a/src/js/controllers/shapeshift.js b/src/js/controllers/shapeshift.js index 652f54c34..a58fc20b6 100644 --- a/src/js/controllers/shapeshift.js +++ b/src/js/controllers/shapeshift.js @@ -1,58 +1,67 @@ 'use strict'; -angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, sendFlowService, $state, $timeout, $ionicHistory, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) { +angular.module('copayApp.controllers').controller('shapeshiftController', function($scope, $interval, profileService, walletService, popupService, lodash, $ionicNavBarDelegate) { + var walletsBtc = []; var walletsBch = []; - $scope.showMyAddress = showMyAddress; + function generateAddress(wallet, cb) { + if (!wallet) return; + walletService.getAddress(wallet, false, function(err, addr) { + if (err) { + popupService.showAlert(err); + } + return cb(addr); + }); + } + + function showToWallets() { + $scope.toWallets = $scope.fromWallet.coin == 'btc' ? walletsBch : walletsBtc; + $scope.onToWalletSelect($scope.toWallets[0]); + $scope.singleToWallet = $scope.toWallets.length == 1; + } + + $scope.onFromWalletSelect = function(wallet) { + $scope.fromWallet = wallet; + showToWallets(); + generateAddress(wallet, function(addr) { + $scope.fromWalletAddress = addr; + }); + }; + + $scope.onToWalletSelect = function(wallet) { + $scope.toWallet = wallet; + generateAddress(wallet, function(addr) { + $scope.toWalletAddress = addr; + }); + } $scope.$on("$ionicView.beforeEnter", function(event, data) { walletsBtc = profileService.getWallets({coin: 'btc'}); walletsBch = profileService.getWallets({coin: 'bch'}); $scope.fromWallets = lodash.filter(walletsBtc.concat(walletsBch), function(w) { - return (w.status && w.status.balance && w.status.balance.availableAmount > 0); + return w.status.balance.availableAmount > 0; }); - - $scope.singleFromWallet = $scope.fromWallets.length === 1; + if ($scope.fromWallets.length == 0) return; + $scope.onFromWalletSelect($scope.fromWallets[0]); + $scope.onToWalletSelect($scope.toWallets[0]); + $scope.singleFromWallet = $scope.fromWallets.length == 1; + $scope.singleToWallet = $scope.toWallets.length == 1; $scope.fromWalletSelectorTitle = 'From'; $scope.toWalletSelectorTitle = 'To'; $scope.showFromWallets = false; $scope.showToWallets = false; - $scope.walletsWithFunds = profileService.getWallets({onlyComplete: true, hasFunds: true}); - $scope.wallets = profileService.getWallets({onlyComplete: true}); - $scope.hasWallets = !lodash.isEmpty($scope.wallets); }); $scope.$on("$ionicView.enter", function(event, data) { $ionicNavBarDelegate.showBar(true); }); - // This could probably be enhanced refactoring the routes abstract states - $scope.createWallet = function() { - $state.go('tabs.home').then(function() { - $state.go('tabs.add.create-personal'); - }); - }; - - $scope.buyBitcoin = function() { - $state.go('tabs.home').then(function() { - $state.go('tabs.buyandsell'); - }); - }; - - $scope.shapeshift = function() { - var stateParams = { - thirdParty: { - id: 'shapeshift' - } - }; - sendFlowService.start(stateParams); + $scope.showFromWalletSelector = function() { + $scope.showFromWallets = true; } - function showMyAddress() { - $state.go('tabs.home').then(function() { - $state.go('tabs.receive'); - }); + $scope.showToWalletSelector = function() { + $scope.showToWallets = true; } - }); diff --git a/src/js/controllers/tab-home.controller.js b/src/js/controllers/tab-home.js similarity index 79% rename from src/js/controllers/tab-home.controller.js rename to src/js/controllers/tab-home.js index f78f156f1..a04820ebd 100644 --- a/src/js/controllers/tab-home.controller.js +++ b/src/js/controllers/tab-home.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('tabHomeController', - function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, $window, gettextCatalog, lodash, popupService, ongoingProcess, bannerService, communityService, externalLinkService, latestReleaseService, profileService, walletService, configService, $log, platformInfo, sendFlowService, storageService, txpModalService, appConfigService, startupService, addressbookService, bwcError, nextStepsService, buyAndSellService, homeIntegrationsService, bitpayCardService, pushNotificationsService, timeService, bitcoincomService, pricechartService, firebaseEventsService, servicesService, shapeshiftService, $ionicNavBarDelegate, signVerifyMessageService) { + function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, $window, gettextCatalog, lodash, popupService, ongoingProcess, bannerService, externalLinkService, latestReleaseService, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, appConfigService, startupService, addressbookService, bwcError, nextStepsService, buyAndSellService, homeIntegrationsService, bitpayCardService, pushNotificationsService, timeService, bitcoincomService, pricechartService, firebaseEventsService, servicesService, shapeshiftService, $ionicNavBarDelegate, signVerifyMessageService) { var wallet; var listeners = []; var notifications = []; @@ -20,12 +20,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.bannerUrl = ''; - $scope.$on("$ionicView.beforeEnter", onBeforeEnter); - $scope.$on("$ionicView.enter", onEnter); - $scope.$on("$ionicView.afterEnter", onAfterEnter); - $scope.$on("$ionicView.leave", onLeave); - - function onAfterEnter () { + $scope.$on("$ionicView.afterEnter", function() { startupService.ready(); bannerService.getBanner(function (banner) { @@ -33,32 +28,32 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.bannerUrl = banner.url; $scope.bannerIsLoading = false; }); - }; - - function onBeforeEnter (event, data) { + }); + $scope.$on("$ionicView.beforeEnter", function(event, data) { if (!$scope.homeTip) { storageService.getHomeTipAccepted(function(error, value) { $scope.homeTip = (value == 'accepted') ? false : true; }); } - latestReleaseService.checkLatestRelease(function(err, newReleaseData) { - if (err) { - $log.warn(err); - return; - } - if (newReleaseData) { - $scope.newRelease = true; - $scope.newReleaseText = gettextCatalog.getString('There is a new version of {{appName}} available', { - appName: $scope.name - }); - $scope.newReleaseNotes = newReleaseData.releaseNotes; - } - }); - } + if ($scope.isNW) { + latestReleaseService.checkLatestRelease(function(err, newRelease) { + if (err) { + $log.warn(err); + return; + } + if (newRelease) { + $scope.newRelease = true; + $scope.updateText = gettextCatalog.getString('There is a new version of {{appName}} available', { + appName: $scope.name + }); + } + }); + } + }); - function onEnter(event, data) { + $scope.$on("$ionicView.enter", function(event, data) { $ionicNavBarDelegate.showBar(true); updateAllWallets(); @@ -102,30 +97,34 @@ angular.module('copayApp.controllers').controller('tabHomeController', } $scope.showServices = true; + pushNotificationsService.init(); + firebaseEventsService.init(); $timeout(function() { $ionicScrollDelegate.resize(); $scope.$apply(); }, 10); }); - } + }); - function onLeave (event, data) { + $scope.$on("$ionicView.leave", function(event, data) { lodash.each(listeners, function(x) { x(); }); - } + }); $scope.createdWithinPastDay = function(time) { return timeService.withinPastDay(time); }; - $scope.startFreshSend = function() { - sendFlowService.start(); - } - - $scope.showUpdatePopup = function() { - latestReleaseService.showUpdatePopup(); + $scope.openExternalLink = function() { + var url = 'https://github.com/Bitcoin-com/Wallet/releases/latest'; + var optIn = true; + var title = gettextCatalog.getString('Update Available'); + var message = gettextCatalog.getString('An update to this app is available. For your security, please update to the latest version.'); + var okText = gettextCatalog.getString('View Update'); + var cancelText = gettextCatalog.getString('Go Back'); + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; $scope.openBannerUrl = function() { @@ -206,7 +205,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', var j = 0; lodash.each(wallets, function(wallet) { - walletService.invalidateCache(wallet); // Temporary solution, to have the good balance, when we ask to reload the wallets. walletService.getStatus(wallet, {}, function(err, status) { if (err) { @@ -226,7 +224,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', cb(); } } - $scope.walletsWithFunds = profileService.getWallets({hasFunds: true}); }); }); }; diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js index 645e46739..8f25412ec 100644 --- a/src/js/controllers/tab-receive.js +++ b/src/js/controllers/tab-receive.js @@ -1,8 +1,7 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabReceiveController', function($rootScope, $scope, $timeout, $log, $ionicModal, $state, $ionicHistory, $ionicPopover, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService, bwcError, bitcoinCashJsService, $ionicNavBarDelegate, sendFlowService, txFormatService, soundService, clipboardService) { +angular.module('copayApp.controllers').controller('tabReceiveController', function($rootScope, $scope, $timeout, $log, $ionicModal, $state, $ionicHistory, $ionicPopover, storageService, platformInfo, walletService, profileService, configService, lodash, gettextCatalog, popupService, bwcError, bitcoinCashJsService, $ionicNavBarDelegate, txFormatService, soundService, clipboardService) { - var CLOSE_NORMAL = 1000; var listeners = []; $scope.bchAddressType = { type: 'cashaddr' }; var bchAddresses = {}; @@ -11,63 +10,20 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.isCordova = platformInfo.isCordova; $scope.isNW = platformInfo.isNW; - var currentAddressSocket = null; - var paymentSubscriptionObj = { op:'addr_sub' }; + var currentAddressSocket = {}; + var paymentSubscriptionObj = { op:"addr_sub" } + + var config; $scope.displayBalanceAsFiat = true; - $scope.$on('$ionicView.beforeLeave', onBeforeLeave); $scope.requestSpecificAmount = function() { - sendFlowService.start({ - toWalletId: $scope.wallet.credentials.walletId, - isRequestAmount: true + $state.go('tabs.paymentRequest.amount', { + id: $scope.wallet.credentials.walletId, + coin: $scope.wallet.coin }); }; - - function connectSocket() { - // Close existing socket if not connected with current address - if (currentAddressSocket) { - currentAddressSocket.close([CLOSE_NORMAL]); - } - - if ($scope.wallet.coin === 'bch') { - // listen to bch address - currentAddressSocket = new WebSocket('wss://ws.blockchain.info/bch/inv'); - paymentSubscriptionObj.addr = $scope.addrBchLegacy; - } else { - // listen to btc address - currentAddressSocket = new WebSocket('wss://ws.blockchain.info/inv'); - paymentSubscriptionObj.addr = $scope.addr; - } - - // create subscription to address - var msg = JSON.stringify(paymentSubscriptionObj); - currentAddressSocket.onopen = function (event) { - currentAddressSocket.send(msg); - }; - - // listen for response - currentAddressSocket.onmessage = function (event) { - //console.log("message received:" + event.data); - receivedPayment(event.data); - }; - - currentAddressSocket.onclose = function(event) { - if (event.code !== CLOSE_NORMAL) { - $log.debug('Socket was closed abnormally. Reconnect will be attempted in 1 second.'); - $timeout(function() { - connectSocket(); - }, 1000); - } - }; - - currentAddressSocket.onerror = function(err) { - console.error('Socket encountered error: ', err, 'Closing socket'); - currentAddressSocket.close(); - }; - } - $scope.setAddress = function(newAddr, copyAddress) { $scope.addr = null; if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return; @@ -80,24 +36,49 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi popupService.showAlert(err); } - if ($scope.wallet.coin === 'bch') { - bchAddresses = bitcoinCashJsService.translateAddresses(addr); - $scope.addr = bchAddresses[$scope.bchAddressType.type]; - $scope.addrBchLegacy = bchAddresses['legacy']; - } else { - $scope.addr = addr; + //close existing socket + if (currentAddressSocket.close === 'function') { + currentAddressSocket.close(); } - connectSocket(); + if ($scope.wallet.coin == 'bch') { + bchAddresses = bitcoinCashJsService.translateAddresses(addr); + $scope.addr = bchAddresses[$scope.bchAddressType.type]; + $scope.addrBchLegacy = bchAddresses['legacy']; + + // listen to bch address + currentAddressSocket = new WebSocket("wss://ws.blockchain.info/bch/inv"); + paymentSubscriptionObj.addr = bchAddresses['legacy']; + + } else { + $scope.addr = addr; + + // listen to btc address + currentAddressSocket = new WebSocket("wss://ws.blockchain.info/inv"); + paymentSubscriptionObj.addr = $scope.addr + } if (copyAddress === true) { try { clipboardService.copyToClipboard($scope.wallet.coin == 'bch' && $scope.bchAddressType.type == 'cashaddr' ? 'bitcoincash:' + $scope.addr : $scope.addr); } catch (error) { - $log.debug('Error copying to clipboard:'); + $log.debug("Error copying to clipboard:"); $log.debug(error); } } + // create subscription + var msg = JSON.stringify(paymentSubscriptionObj); + currentAddressSocket.onopen = function (event) { + //console.log("message sent: " + msg); + currentAddressSocket.send(msg); + } + + + // listen for response + currentAddressSocket.onmessage = function (event) { + //console.log("message received:" + event.data); + receivedPayment(event.data); + } $timeout(function() { $scope.$apply(); @@ -157,18 +138,16 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi $scope.paymentReceivedAlternativeAmount = ''; // For when a subsequent payment is received. txFormatService.formatAlternativeStr($scope.wallet.coin, data.x.out[i].value, function(alternativeStr){ if (alternativeStr) { - $scope.$apply(function () { - $scope.paymentReceivedAlternativeAmount = alternativeStr; - }); + $scope.paymentReceivedAlternativeAmount = alternativeStr; } }); } } $scope.paymentReceivedCoin = $scope.wallet.coin; - var channel = "ga"; - if (platformInfo.isCordova) { - channel = "firebase"; + var channel = "firebase"; + if (platformInfo.isNW) { + channel = "ga"; } var log = new window.BitAnalytics.LogEvent("transfer_success", [{ "coin": $scope.wallet.coin, @@ -180,9 +159,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi soundService.play('misc/payment_received.mp3'); } - // Notify new tx - $scope.$emit('bwsEvent', $scope.wallet.id); - $scope.$apply(function () { $scope.showingPaymentReceived = true; }); @@ -251,24 +227,16 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi } }; - function onBeforeLeave() { - currentAddressSocket.close([CLOSE_NORMAL]); - } - $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.wallets = profileService.getWallets(); $scope.singleWallet = $scope.wallets.length == 1; if (!$scope.wallets[0]) return; - var selectedWallet = null; - if (data.stateParams.walletId) { // from walletDetails - selectedWallet = checkSelectedWallet(profileService.getWallet(data.stateParams.walletId), $scope.wallets); - } else { - // select first wallet if no wallet selected previously - selectedWallet = checkSelectedWallet($scope.wallet, $scope.wallets); - } + // select first wallet if no wallet selected previously + var selectedWallet = checkSelectedWallet($scope.wallet, $scope.wallets); $scope.onWalletSelect(selectedWallet); + $scope.showShareButton = platformInfo.isCordova ? (platformInfo.isIOS ? 'iOS' : 'Android') : null; listeners = [ @@ -280,6 +248,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi configService.whenAvailable(function(_config) { $scope.displayBalanceAsFiat = _config.wallet.settings.priceDisplay === 'fiat'; + config = _config; }); }); diff --git a/src/js/controllers/tab-scan.controller.js b/src/js/controllers/tab-scan.js similarity index 89% rename from src/js/controllers/tab-scan.controller.js rename to src/js/controllers/tab-scan.js index 14368ee1c..4a654d91d 100644 --- a/src/js/controllers/tab-scan.controller.js +++ b/src/js/controllers/tab-scan.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabScanController', function(gettextCatalog, popupService, $scope, $log, $timeout, scannerService, incomingDataService, $state, $ionicHistory, $rootScope, $ionicNavBarDelegate) { +angular.module('copayApp.controllers').controller('tabScanController', function($scope, $log, $timeout, scannerService, incomingData, $state, $ionicHistory, $rootScope, $ionicNavBarDelegate) { var scannerStates = { unauthorized: 'unauthorized', @@ -111,18 +111,7 @@ angular.module('copayApp.controllers').controller('tabScanController', function( // Sometimes (testing in Chrome, when reading QR Code) data is an object // that has a string data.result. contents = contents.result || contents; - incomingDataService.redir(contents, function onError(err) { - if (err) { - var title = gettextCatalog.getString('Scan Failed'); - popupService.showAlert(title, err.message, function onAlertShown() { - // Enable another scan since we won't receive incomingDataMenu.menuHidden - activate(); - }); - } else { - scannerService.resumePreview(); - - } - }); + incomingData.redir(contents); } $rootScope.$on('incomingDataMenu.menuHidden', function() { diff --git a/src/js/controllers/tab-send.controller.js b/src/js/controllers/tab-send.js similarity index 64% rename from src/js/controllers/tab-send.controller.js rename to src/js/controllers/tab-send.js index 03a9562e8..99265457d 100644 --- a/src/js/controllers/tab-send.controller.js +++ b/src/js/controllers/tab-send.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabSendController', function(bitcoinUriService, $scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, platformInfo, sendFlowService, gettextCatalog, configService, $ionicPopup, $ionicNavBarDelegate, clipboardService, incomingDataService) { +angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, $ionicLoading, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService, configService, bitcoinCashJsService, $ionicPopup, $ionicNavBarDelegate, clipboardService) { var clipboardHasAddress = false; var clipboardHasContent = false; var originalList; @@ -28,10 +28,6 @@ angular.module('copayApp.controllers').controller('tabSendController', function( }; $scope.$on("$ionicView.enter", function(event, data) { - - var stateParams = sendFlowService.state.getClone(); - $scope.fromWallet = profileService.getWallet(stateParams.fromWalletId); - clipboardService.readFromClipboard(function(text) { if (text.length > 200) { text = text.substring(0, 200); @@ -39,9 +35,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( $scope.clipboardHasAddress = false; $scope.clipboardHasContent = false; - var parsed = bitcoinUriService.parse(text); - console.log('parsed', parsed); - if (parsed.isValid && parsed.publicAddress && parsed.coin === 'bch' && !parsed.testnet) { // CashAddr + if ((text.indexOf('bitcoincash:') === 0 || text[0] === 'C' || text[0] === 'H' || text[0] === 'p' || text[0] === 'q') && text.replace('bitcoincash:', '').length === 42) { // CashAddr $scope.clipboardHasAddress = true; } else if ((text[0] === "1" || text[0] === "3" || text.substring(0, 3) === "bc1") && text.length >= 26 && text.length <= 35) { // Legacy Addresses $scope.clipboardHasAddress = true; @@ -61,7 +55,48 @@ angular.module('copayApp.controllers').controller('tabSendController', function( }); }); + var wallets; + var walletsBch; + var walletsBtc; + var walletToWalletFrom = false; + + $scope.onWalletSelect = function(wallet) { + if (!$scope.walletToWalletFrom) { + $scope.walletToWalletFrom = wallet; + if (wallet.coin === 'bch') { + $scope.showWalletsBch = true; + } else if (wallet.coin === 'btc') { + $scope.showWalletsBtc = true; + } + $scope.walletSelectorTitleTo = gettextCatalog.getString('Send to'); + } else { + $ionicLoading.show(); + walletService.getAddress(wallet, true, function(err, addr) { + $ionicLoading.hide(); + return $state.transitionTo('tabs.send.amount', { + displayAddress: $scope.walletToWalletFrom.coin === 'bch' ? bitcoinCashJsService.translateAddresses(addr).cashaddr : addr, + recipientType: 'wallet', + fromWalletId: $scope.walletToWalletFrom.id, + toAddress: addr, + coin: $scope.walletToWalletFrom.coin + }); + }); + + } + }; + + $scope.showWalletSelector = function() { + $scope.walletToWalletFrom = false; + $scope.walletSelectorTitleFrom = gettextCatalog.getString('Send from'); + $scope.showWallets = true; + }; + $scope.findContact = function(search) { + + if (incomingData.redir(search)) { + return; + } + if (!search || search.length < 1) { $scope.list = originalList; $timeout(function() { @@ -70,16 +105,12 @@ angular.module('copayApp.controllers').controller('tabSendController', function( return; } - var params = sendFlowService.state.getClone(); - params.data = search; - sendFlowService.start(params, function onError() { - var result = lodash.filter(originalList, function(item) { - var val = item.name; - return lodash.startsWith(val.toLowerCase(), search.toLowerCase()); - }); - - $scope.list = result; + var result = lodash.filter(originalList, function(item) { + var val = item.name; + return lodash.startsWith(val.toLowerCase(), search.toLowerCase()); }); + + $scope.list = result; }; var hasWallets = function() { @@ -102,6 +133,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( }; var updateHasFunds = function() { + $scope.hasFunds = false; var index = 0; lodash.each($scope.wallets, function(w) { @@ -147,7 +179,10 @@ angular.module('copayApp.controllers').controller('tabSendController', function( coin: v.coin, displayCoin: (v.coin == 'bch' ? (config.bitcoinCashAlias || defaults.bitcoinCashAlias) - : (config.bitcoinAlias || defaults.bitcoinAlias)).toUpperCase() + : (config.bitcoinAlias || defaults.bitcoinAlias)).toUpperCase(), + getAddress: function(cb) { + return cb(null, k); + }, }); }); originalList = completeContacts; @@ -168,37 +203,39 @@ angular.module('copayApp.controllers').controller('tabSendController', function( }; $scope.searchBlurred = function() { - if ($scope.formData.search == null || $scope.formData.search.length === 0) { + if ($scope.formData.search == null || $scope.formData.search.length == 0) { $scope.searchFocus = false; } }; - $scope.sendToContact = function (item) { - $timeout(function () { - var toAddress = item.address; - - if (item.recipientType && item.recipientType === 'contact') { - if (toAddress.indexOf('bch') === 0 || toAddress.indexOf('btc') === 0) { - toAddress = toAddress.substring(3); + $scope.goToAmount = function(item) { + $timeout(function() { + item.getAddress(function(err, addr) { + if (err || !addr) { + //Error is already formated + return popupService.showAlert(err); } - } - $log.debug('Got toAddress:' + toAddress + ' | ' + item.name); - - var stateParams = sendFlowService.state.getClone(); - stateParams.toAddress = toAddress; - stateParams.coin = item.coin; - sendFlowService.start(stateParams); + if (item.recipientType && item.recipientType == 'contact') { + if (addr.indexOf('bch') == 0 || addr.indexOf('btc') == 0) { + addr = addr.substring(3); + } + } + + $log.debug('Got toAddress:' + addr + ' | ' + item.name); + return $state.transitionTo('tabs.send.amount', { + recipientType: item.recipientType, + displayAddress: item.coin == 'bch' ? bitcoinCashJsService.translateAddresses(addr).cashaddr : addr, + toAddress: addr, + toName: item.name, + toEmail: item.email, + toColor: item.color, + coin: item.coin + }); + }); }); }; - $scope.startWalletToWalletTransfer = function() { - console.log('startWalletToWalletTransfer()'); - var params = sendFlowService.state.getClone(); - params.isWalletTransfer = true; - sendFlowService.start(params); - } - // This could probably be enhanced refactoring the routes abstract states $scope.createWallet = function() { $state.go('tabs.home').then(function() { @@ -213,8 +250,6 @@ angular.module('copayApp.controllers').controller('tabSendController', function( }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - console.log(data); - console.log('tab-send onBeforeEnter sendflow ', sendFlowService.state); $scope.isIOS = platformInfo.isIOS && platformInfo.isCordova; $scope.showWalletsBch = $scope.showWalletsBtc = $scope.showWallets = false; @@ -229,9 +264,5 @@ angular.module('copayApp.controllers').controller('tabSendController', function( $scope.displayBalanceAsFiat = _config.wallet.settings.priceDisplay === 'fiat'; }); - if (data.direction == "back") { - sendFlowService.state.clear(); - } - }); -}); \ No newline at end of file +}); diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index 494d63cc5..4d0636d53 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -16,7 +16,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct isoCode: config.wallet.settings.alternativeIsoCode }; - $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay === 'crypto' ? gettextCatalog.getString('Cryptocurrency') : gettextCatalog.getString('Fiat'); + $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay; // TODO move this to a generic service bitpayAccountService.getAccounts(function(err, data) { diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js index b78274ecb..a186879e3 100644 --- a/src/js/controllers/tabsController.js +++ b/src/js/controllers/tabsController.js @@ -1,13 +1,11 @@ 'use strict'; -angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, platformInfo, incomingDataService, lodash, popupService, gettextCatalog, scannerService, sendFlowService) { +angular.module('copayApp.controllers').controller('tabsController', function($rootScope, $log, $scope, $state, $stateParams, $timeout, platformInfo, incomingData, lodash, popupService, gettextCatalog, scannerService) { $scope.onScan = function(data) { - incomingDataService.redir(data, function onError(err) { - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), err.message); - } - }); + if (!incomingData.redir(data)) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Invalid data')); + } }; $scope.setScanFn = function(scanFn) { @@ -17,10 +15,6 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro }; }; - $scope.startFreshSend = function() { - sendFlowService.start(); - }; - $scope.importInit = function() { $scope.fromOnboarding = $stateParams.fromOnboarding; $timeout(function() { @@ -29,6 +23,7 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro }; $scope.chooseScanner = function() { + var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; if (!isWindowsPhoneApp) { @@ -38,14 +33,10 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro scannerService.useOldScanner(function(err, contents) { if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), err.message); - } else { - incomingDataService.redir(contents, function onError(err) { - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), err.message); - } - }); + popupService.showAlert(gettextCatalog.getString('Error'), err); + return; } + incomingData.redir(contents); }); }; diff --git a/src/js/controllers/wallet-selector.controller.js b/src/js/controllers/wallet-selector.controller.js deleted file mode 100644 index 036727333..000000000 --- a/src/js/controllers/wallet-selector.controller.js +++ /dev/null @@ -1,204 +0,0 @@ -'use strict'; - -(function () { - -angular - .module('copayApp.controllers') - .controller('walletSelectorController', walletSelectorController); - - function walletSelectorController ($scope, $state, sendFlowService, configService, gettextCatalog, ongoingProcess, profileService, walletService, txFormatService) { - var fromWalletId = ''; - var priceDisplayAsFiat = false; - var unitDecimals = 0; - var unitsFromSatoshis = 0; - - $scope.$on("$ionicView.beforeEnter", onBeforeEnter); - $scope.$on("$ionicView.enter", onEnter); - - function onBeforeEnter(event, data) { - if (data.direction == "back") { - sendFlowService.state.pop(); - } - - $scope.params = sendFlowService.state.getClone(); - - console.log('walletSelector onBeforeEnter after back sendflow', $scope.params); - - var config = configService.getSync().wallet.settings; - priceDisplayAsFiat = config.priceDisplay === 'fiat'; - unitDecimals = config.unitDecimals; - unitsFromSatoshis = 1 / config.unitToSatoshi; - - if ($scope.params.isWalletTransfer) { - $scope.sendFlowTitle = gettextCatalog.getString('Transfer between wallets'); - } else if (!$scope.params.thirdParty) { - $scope.sendFlowTitle = gettextCatalog.getString('Send'); - } - - $scope.coin = false; // Wallets to show (for destination screen or contacts) - $scope.type = $scope.params['fromWalletId'] ? 'destination' : 'origin'; // origin || destination - fromWalletId = $scope.params['fromWalletId']; - - if ($scope.type === 'destination' && $scope.params.toAddress) { - $state.transitionTo(getNextStep($scope.params)); - } - - if ($scope.params.coin) { - $scope.coin = $scope.params.coin; // Contacts have a coin embedded - } - - if ($scope.params.amount) { // There is an amount, so presume that it is a payment request - $scope.sendFlowTitle = gettextCatalog.getString('Payment Request'); - $scope.specificAmount = $scope.specificAlternativeAmount = ''; - $scope.isPaymentRequest = true; - } - if ($scope.params.thirdParty) { - $scope.thirdParty = $scope.params.thirdParty; - } - }; - - function onEnter (event, data) { - configService.whenAvailable(function(config) { - $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay; - }); - - if ($scope.thirdParty) { - // Third party services specific logic - handleThirdPartyIfShapeshift(); - } - - prepareWalletLists(); - formatRequestedAmount(); - }; - - function formatRequestedAmount() { - if ($scope.params.amount) { - var cryptoAmount = (unitsFromSatoshis * $scope.params.amount).toFixed(unitDecimals); - var cryptoCoin = $scope.coin.toUpperCase(); - - txFormatService.formatAlternativeStr($scope.coin, $scope.params.amount, function onFormatAlternativeStr(formatted){ - if (formatted) { - var fiatParts = formatted.split(' '); - var fiatAmount = fiatParts[0]; - var fiatCurrrency = fiatParts.length > 1 ? fiatParts[1] : ''; - - if (priceDisplayAsFiat) { - $scope.requestAmount = fiatAmount; - $scope.requestCurrency = fiatCurrrency; - - $scope.requestAmountSecondary = cryptoAmount; - $scope.requestCurrencySecondary = cryptoCoin; - } else { - $scope.requestAmount = cryptoAmount; - $scope.requestCurrency = cryptoCoin; - - $scope.requestAmountSecondary = fiatAmount; - $scope.requestCurrencySecondary = fiatCurrrency; - } - $scope.$apply(); - } - }); - } - } - - function handleThirdPartyIfShapeshift() { - console.log($scope.thirdParty, $scope.coin); - if ($scope.thirdParty.id === 'shapeshift' && $scope.type === 'destination') { // Shapeshift wants to know the - $scope.coin = profileService.getWallet(fromWalletId).coin; - if ($scope.coin === 'bch') { - $scope.coin = 'btc'; - } else { - $scope.coin = 'bch'; - } - } - } - - function prepareWalletLists() { - var walletsAll = []; - var walletsSufficientFunds = []; - $scope.walletsInsufficientFunds = []; // For origin screen - - if ($scope.type === 'origin') { - $scope.headerTitle = gettextCatalog.getString('Choose a wallet to send from'); - - if ($scope.params.amount || $scope.coin) { - - walletsAll = profileService.getWallets({coin: $scope.coin}); - ongoingProcess.set('scanning', true); - walletsAll.forEach(function forWallet(wallet) { - if (!wallet.status && !wallet.cachedStatus) { - walletService.getStatus(wallet, {}, function(err, status) { - wallet.status = status; - if (status.availableBalanceSat > ($scope.params.amount ? $scope.params.amount : 0)) { - walletsSufficientFunds.push(wallet); - } else { - $scope.walletsInsufficientFunds.push(wallet); - } - if ($scope.coin === 'btc') { // As this is a promise - $scope.walletsBtc = walletsSufficientFunds; - } else { - $scope.walletsBch = walletsSufficientFunds; - } - ongoingProcess.set('scanning', false); - }); - } else { - var walletStatus = null; - if (wallet.status && wallet.status.isValid) { - walletStatus = wallet.status; - } else if (wallet.cachedStatus && wallet.status.isValid) { - walletStatus = wallet.cachedStatus; - } - - if (walletStatus && walletStatus.availableBalanceSat > ($scope.params.amount ? $scope.params.amount : 0)) { - walletsSufficientFunds.push(wallet); - } else { - $scope.walletsInsufficientFunds.push(wallet); - } - ongoingProcess.set('scanning', false); - } - }); - - if ($scope.coin === 'btc') { - $scope.walletsBtc = walletsSufficientFunds; - } else { - $scope.walletsBch = walletsSufficientFunds; - } - } else { - $scope.walletsBch = profileService.getWallets({coin: 'bch', hasFunds: true}); - $scope.walletsBtc = profileService.getWallets({coin: 'btc', hasFunds: true}); - $scope.walletsInsufficientFunds = profileService.getWallets({coin: $scope.coin, hasNoFunds: true}); - } - - } else if ($scope.type === 'destination') { - if (!$scope.coin) { // Allow for the coin to be set by a third party - $scope.fromWallet = profileService.getWallet(fromWalletId); - $scope.coin = $scope.fromWallet.coin; // Only show wallets with the select origin wallet coin - } - $scope.headerTitle = gettextCatalog.getString('Choose a wallet to send to'); - - if ($scope.coin === 'btc') { // if no specific coin is set or coin is set btc - $scope.walletsBtc = profileService.getWallets({coin: $scope.coin}); - } else { - $scope.walletsBch = profileService.getWallets({coin: $scope.coin}); - } - } - } - - - - $scope.useWallet = function(wallet) { - var params = sendFlowService.state.getClone(); - if ($scope.type === 'origin') { // we're on the origin screen, set wallet to send from - params.fromWalletId = wallet.id; - } else { // we're on the destination screen, set wallet to send to - params.toWalletId = wallet.id; - } - sendFlowService.goNext(params); - }; - - $scope.goBack = function() { - sendFlowService.router.goBack(); - } - - } -})(); \ No newline at end of file diff --git a/src/js/controllers/wallet-details.controller.js b/src/js/controllers/walletDetails.js similarity index 60% rename from src/js/controllers/wallet-details.controller.js rename to src/js/controllers/walletDetails.js index 429420741..24237f6c9 100644 --- a/src/js/controllers/wallet-details.controller.js +++ b/src/js/controllers/walletDetails.js @@ -1,65 +1,52 @@ 'use strict'; -angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, sendFlowService, storageService, $ionicScrollDelegate, $window, bwcError, gettextCatalog, timeService, feeService, appConfigService, rateService, walletHistoryService) { - // Desktop can display 13 rows of transactions, bump it up to a nice round 15. - var DISPLAY_PAGE_SIZE = 15; - var currentTxHistoryDisplayPage = 0; - var completeTxHistory = [] +angular.module('copayApp.controllers').controller('walletDetailsController', function($scope, $rootScope, $interval, $timeout, $filter, $log, $ionicModal, $ionicPopover, $state, $stateParams, $ionicHistory, profileService, lodash, configService, platformInfo, walletService, txpModalService, externalLinkService, popupService, addressbookService, storageService, $ionicScrollDelegate, $window, bwcError, gettextCatalog, timeService, feeService, appConfigService, rateService) { + + var HISTORY_SHOW_LIMIT = 10; + var currentTxHistoryPage = 0; var listeners = []; - - // For gradual migration for doing it properly - $scope.vm = { - allowInfiniteScroll: false, - gettingCachedHistory: true, - gettingInitialHistory: true, - updatingTxHistory: false, - fetchedAllTxHistory: false, - //updateTxHistoryError: false - updateTxHistoryFailed: false - }; - - // Need flag for when to allow infinite scroll at bottom - // - ie not when loading initial data and there is no more cached data - - $scope.amountIsCollapsible = false; - $scope.color = '#888888'; - - $scope.filteredTxHistory = []; + $scope.txps = []; + $scope.completeTxHistory = []; + $scope.openTxpModal = txpModalService.open; $scope.isCordova = platformInfo.isCordova; $scope.isAndroid = platformInfo.isAndroid; $scope.isIOS = platformInfo.isIOS; - $scope.isSearching = false; - $scope.openTxpModal = txpModalService.open; - $scope.requiresMultipleSignatures = false; - $scope.showBalanceButton = false; - $scope.status = null; - // Displaying 50 transactions when entering the screen takes a while, so only display a subset - // of everything we have, not the complete history. - $scope.txHistory = []; // This is what is displayed - $scope.txHistorySearchResults = []; - $scope.txps = []; - $scope.updatingStatus = false; - $scope.updateStatusError = null; - $scope.updatingTxHistoryProgress = 0; - $scope.wallet = null; - $scope.walletId = ''; - $scope.walletNotRegistered = false; - - - - var channel = "ga"; - if (platformInfo.isCordova) { - channel = "firebase"; + var channel = "firebase"; + if (platformInfo.isNW) { + channel = "ga"; } var log = new window.BitAnalytics.LogEvent("wallet_details_open", [], [channel]); window.BitAnalytics.LogEventHandlers.postEvent(log); + $scope.amountIsCollapsible = !$scope.isAndroid; + $scope.openExternalLink = function(url, target) { externalLinkService.open(url, target); }; var setPendingTxps = function(txps) { + + /* Uncomment to test multiple outputs */ + + // var txp = { + // message: 'test multi-output', + // fee: 1000, + // createdOn: new Date() / 1000, + // outputs: [], + // wallet: $scope.wallet + // }; + // + // function addOutput(n) { + // txp.outputs.push({ + // amount: 600, + // toAddress: '2N8bhEwbKtMvR2jqMRcTCQqzHP6zXGToXcK', + // message: 'output #' + (Number(n) + 1) + // }); + // }; + // lodash.times(15, addOutput); + // txps.push(txp); + if (!txps) { $scope.txps = []; return; @@ -86,7 +73,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun $scope.updatingStatus = true; $scope.updateStatusError = null; $scope.walletNotRegistered = false; - $scope.vm.fetchedAllTxHistory = false; walletService.getStatus($scope.wallet, { force: !!force, @@ -170,97 +156,68 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun if (err) return; $timeout(function() { walletService.startScan($scope.wallet, function() { - $scope.updateAll(true, true); + $scope.updateAll(); $scope.$apply(); }); }); }); }; + var updateTxHistory = function(cb) { + if (!cb) cb = function() {}; + $scope.updateTxHistoryError = false; + $scope.updatingTxHistoryProgress = 0; + + feeService.getFeeLevels($scope.wallet.coin, function(err, levels) { + walletService.getTxHistory($scope.wallet, { + feeLevels: levels + }, function(err, txHistory) { + $scope.updatingTxHistory = false; + if (err) { + $scope.txHistory = null; + $scope.updateTxHistoryError = true; + return; + } + + applyCurrencyAliases(txHistory); + + var config = configService.getSync(); + var fiatCode = config.wallet.settings.alternativeIsoCode; + lodash.each(txHistory, function(t) { + var r = rateService.toFiat(t.amount, fiatCode, $scope.wallet.coin); + t.alternativeAmountStr = r.toFixed(2) + ' ' + fiatCode; + }); + + $scope.completeTxHistory = txHistory; + + $scope.showHistory(); + $timeout(function() { + $scope.$apply(); + }); + return cb(); + }); + }); + }; + function applyCurrencyAliases(txHistory) { var defaults = configService.getDefaults(); var configCache = configService.getSync(); - lodash.each(txHistory, function onTx(tx) { - tx.amountUnitStr = $scope.wallet.coin == 'btc' + lodash.each(txHistory, function(t) { + t.amountUnitStr = $scope.wallet.coin == 'btc' ? (configCache.bitcoinAlias || defaults.bitcoinAlias) : (configCache.bitcoinCashAlias || defaults.bitcoinCashAlias); - tx.amountUnitStr = tx.amountUnitStr.toUpperCase(); + t.amountUnitStr = t.amountUnitStr.toUpperCase(); }); } - function formatTxHistoryForDisplay(txHistory) { - applyCurrencyAliases(txHistory); - - var config = configService.getSync(); - var fiatCode = config.wallet.settings.alternativeIsoCode; - lodash.each(txHistory, function(t) { - var r = rateService.toFiat(t.amount, fiatCode, $scope.wallet.coin); - t.alternativeAmountStr = r.toFixed(2) + ' ' + fiatCode; - }); - } - - - function updateTxHistoryFromCachedData() { - $scope.vm.gettingCachedHistory = true; - walletHistoryService.getCachedTxHistory($scope.wallet.id, function onGetCachedTxHistory(err, txHistory){ - $scope.vm.gettingCachedHistory = false; - if (err) { - // Don't display an error because we are also requesting the history. - $log.error('Error getting cached tx history.', err); - return; - } - - if (!txHistory) { - $log.debug('No cached tx history.'); - return; - } - - formatTxHistoryForDisplay(txHistory); - - completeTxHistory = txHistory; - showHistory(false); - $scope.$apply(); - }); - } - - function fetchAndShowTxHistory(getLatest, flushCacheOnNew) { - $scope.vm.updatingTxHistory = true; - - walletHistoryService.updateLocalTxHistoryByPage($scope.wallet, getLatest, flushCacheOnNew, function onUpdateLocalTxHistoryByPage(err, txHistory, fetchedAllTransactions) { - $scope.vm.gettingInitialHistory = false; - $scope.vm.updatingTxHistory = false; - $scope.$broadcast('scroll.infiniteScrollComplete'); - - if (err) { - console.error('pagination Failed to get history.', err); - $scope.vm.updateTxHistoryFailed = true; - return; - } - - if (fetchedAllTransactions) { - $scope.vm.fetchedAllTxHistory = true; - } - - formatTxHistoryForDisplay(txHistory); - - completeTxHistory = txHistory; - showHistory(true); - $scope.$apply(); - }); - } - - - function showHistory(showAll) { - if (completeTxHistory) { - $scope.txHistory = showAll ? completeTxHistory : completeTxHistory.slice(0, (currentTxHistoryDisplayPage + 1) * DISPLAY_PAGE_SIZE); - $scope.vm.allowInfiniteScroll = !$scope.vm.fetchedAllTxHistory && !(completeTxHistory.length === $scope.txHistory.length && $scope.vm.gettingInitialHistory); - } else { - $scope.vm.allowInfiniteScroll = false; + $scope.showHistory = function() { + if ($scope.completeTxHistory) { + $scope.txHistory = $scope.completeTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT); + $scope.txHistoryShowMore = $scope.completeTxHistory.length > $scope.txHistory.length; } - } - + }; $scope.getDate = function(txCreated) { var date = new Date(txCreated * 1000); @@ -299,35 +256,24 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun return !tx.confirmations || tx.confirmations === 0; }; - // on-infinite="showMore()" $scope.showMore = function() { - // Check if we have more than we are displaying - if (completeTxHistory.length > $scope.txHistory.length) { - currentTxHistoryDisplayPage++; - showHistory(false); + $timeout(function() { + currentTxHistoryPage++; + $scope.showHistory(); $scope.$broadcast('scroll.infiniteScrollComplete'); - return; - } - - if ($scope.vm.updatingTxHistory) { - return; - } - - fetchAndShowTxHistory(false, false); + }, 100); }; - // on-refresh="onRefresh()" $scope.onRefresh = function() { $timeout(function() { $scope.$broadcast('scroll.refreshComplete'); }, 300); - $scope.updateAll(true, false); + $scope.updateAll(true); }; - $scope.updateAll = function(forceStatusUpdate, flushTxCacheOnNew)  { - updateStatus(forceStatusUpdate); - //updateTxHistory(cb); - fetchAndShowTxHistory(true, flushTxCacheOnNew); + $scope.updateAll = function(force, cb)  { + updateStatus(force); + updateTxHistory(cb); }; $scope.hideToggle = function() { @@ -337,36 +283,97 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun }; var prevPos; - $scope.txHistoryPaddingBottom = 0; + function getScrollPosition() { var scrollPosition = $ionicScrollDelegate.getScrollPosition(); - - $timeout(function() { - getScrollPosition(); - }, 200); - if (!scrollPosition) { + $window.requestAnimationFrame(function() { + getScrollPosition(); + }); return; } var pos = scrollPosition.top; - if (pos > 0) { - $scope.txHistoryPaddingBottom = "200px"; - } if (pos === prevPos) { + $window.requestAnimationFrame(function() { + getScrollPosition(); + }); return; } prevPos = pos; - $scope.scrollPosition = pos; + refreshAmountSection(pos); + }; + + function refreshAmountSection(scrollPos) { + $scope.showBalanceButton = false; + if ($scope.status) { + $scope.showBalanceButton = ($scope.status.totalBalanceSat != $scope.status.spendableAmount); + } + if (!$scope.amountIsCollapsible) { + var t = ($scope.showBalanceButton ? 15 : 45); + $scope.amountScale = 'translateY(' + t + 'px)'; + return; + } + + scrollPos = scrollPos || 0; + var amountHeight = 210 - scrollPos; + if (amountHeight < 80) { + amountHeight = 80; + } + var contentMargin = amountHeight; + if (contentMargin > 210) { + contentMargin = 210; + } + + var amountScale = (amountHeight / 210); + if (amountScale < 0.5) { + amountScale = 0.5; + } + if (amountScale > 1.1) { + amountScale = 1.1; + } + + var s = amountScale; + + // Make space for the balance button when it needs to display. + var TOP_NO_BALANCE_BUTTON = 115; + var TOP_BALANCE_BUTTON = 30; + var top = TOP_NO_BALANCE_BUTTON; + if ($scope.showBalanceButton) { + top = TOP_BALANCE_BUTTON; + } + + var amountTop = ((amountScale - 0.7) / 0.7) * top; + if (amountTop < -10) { + amountTop = -10; + } + if (amountTop > top) { + amountTop = top; + } + + var t = amountTop; + + $scope.altAmountOpacity = (amountHeight - 100) / 80; + $window.requestAnimationFrame(function() { + $scope.amountHeight = amountHeight + 'px'; + $scope.contentMargin = contentMargin + 'px'; + $scope.amountScale = 'scale3d(' + s + ',' + s + ',' + s + ') translateY(' + t + 'px)'; + $scope.$digest(); + getScrollPosition(); + }); } var scrollWatcherInitialized; $scope.$on("$ionicView.enter", function(event, data) { if ($scope.isCordova && $scope.isAndroid) setAndroidStatusBarColor(); + if (scrollWatcherInitialized || !$scope.amountIsCollapsible) { + return; + } scrollWatcherInitialized = true; }); $scope.$on("$ionicView.beforeEnter", function(event, data) { + configService.whenAvailable(function (config) { $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay; @@ -380,7 +387,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun if (!$scope.wallet) return; $scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1; - $scope.vm.gettingInitialHistory = true; + $scope.updatingTxHistory = true; addressbookService.list(function(err, ab) { if (err) $log.error(err); @@ -390,25 +397,21 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun listeners = [ $rootScope.$on('bwsEvent', function(e, walletId) { if (walletId == $scope.wallet.id && e.type != 'NewAddress') - $scope.updateAll(false, false); + $scope.updateAll(); }), $rootScope.$on('Local/TxAction', function(e, walletId) { if (walletId == $scope.wallet.id) - $scope.updateAll(false, false); + $scope.updateAll(); }), ]; }); var refreshInterval; - $scope.$on("$ionicView.afterEnter", function onAfterEnter(event, data) { - updateTxHistoryFromCachedData(); - $scope.updateAll(true, true); - // refreshAmountSection(); + $scope.$on("$ionicView.afterEnter", function(event, data) { + $scope.updateAll(); + refreshAmountSection(); refreshInterval = $interval($scope.onRefresh, 10 * 1000); - $timeout(function() { - getScrollPosition(); - }, 1000); }); $scope.$on("$ionicView.afterLeave", function(event, data) { @@ -466,30 +469,4 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun function rgbToHex(r, g, b) { return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b); } - - $scope.goToSend = function() { - sendFlowService.start({ - fromWalletId: $scope.wallet.id - }); - - }; - $scope.goToReceive = function() { - $state.go('tabs.home', { - walletId: $scope.wallet.id - }).then(function () { - $ionicHistory.clearHistory(); - $state.go('tabs.receive', { - walletId: $scope.wallet.id - }); - }); - }; - - $scope.goToBuy = function() { - $state.go('tabs.home', { - walletId: $scope.wallet.id - }).then(function () { - $ionicHistory.clearHistory(); - $state.go('tabs.buyandsell'); - }); - }; }); diff --git a/src/js/directives/formattedAmount.js b/src/js/directives/formattedAmount.js deleted file mode 100644 index 5ee9be050..000000000 --- a/src/js/directives/formattedAmount.js +++ /dev/null @@ -1,198 +0,0 @@ -'use strict'; - -(function(){ -/** - * @desc amount directive that can be used to display formatted financial values - * size-equal attribute is optional, defaults to false. - * @example fee = { - * value: 12.49382901, - * currency: 'BCH' - * } - * @example - * @example - */ - angular - .module('bitcoincom.directives') - .directive('formattedAmount', function() { - return { - restrict: 'E', - scope: { - value: '@', - currency: '@', - sizeEqual: '@' - }, - templateUrl: 'views/includes/formatted-amount.html', - controller: formattedAmountController - } - }); - - function formattedAmountController($scope, uxLanguage) { - $scope.vm = {}; - var vm = $scope.vm; - - vm.currency = ''; - vm.value = ''; - - $scope.canShow = false - $scope.displaySizeEqual = !!$scope.sizeEqual; - - var decimalPlaces = { - '0': ['BIF', 'CLP', 'DJF', 'GNF', 'ILS', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'], - '3': ['BHD', 'IQD', 'JOD', 'KWD', 'OMR', 'TND'], - '8': ['BCH', 'BTC'] - }; - - $scope.$watch('value', function onFormattedAmountWatch() { - formatNumbers(); - }); - - function buildAmount(start, middle, end) { - $scope.start = start; - $scope.middle = middle; - $scope.end = end; - }; - - /** - * On Android 4.4, toLocaleString() only returns 3 fractional digits when 8 is specified. - */ - function ensureEnoughFractionDigits(localizedString, number, desiredFractionDigits) { - if (desiredFractionDigits === 0) { - // Assume it is OK - return localizedString; - } - var fractionalRe = /^-*(\d*\D)(\d+)$/; - var match = fractionalRe.exec(localizedString); - if (!match || match.length !== 3) { - // Don't know what's happening, just return what we have - return localizedString; - } - - var decimals = match[2]; - var decimalCount = decimals.length; - if (decimalCount >= desiredFractionDigits) { - // Everything is OK. - return localizedString; - } - - if (typeof number !== 'number') { - number = parseFloat(number); - } - - var fixed = number.toFixed(desiredFractionDigits); - var fixedMatch = fractionalRe.exec(fixed); - if (!fixedMatch || fixedMatch.length !== 3) { - // Don't know what's happening, just return what we have - return localizedString; - } - - // Keeps locale decimal separator. - var enough = match[1] + fixedMatch[2]; - return enough; - } - - function formatNumbers() { - // Might get "< 0.01 USD" being passed in. - // During watch, may be changed from having a separate currency value, - // to both being in value. Don't want to use previous currency value. - // Try to extract currency from value.. - if (!$scope.currency || $scope.currency.length === 0) { - var currencySplit = $scope.value.split(" "); - if (currencySplit.length >= 2) { - vm.currency = currencySplit[currencySplit.length - 1]; - } - } else { - vm.currency = $scope.currency; - } - - // Redo this when we have proper formatting for low fees - if ($scope.value.indexOf("<") === 0) { - buildAmount($scope.value, '', ''); - vm.currency = ''; - $scope.canShow = true; - return; - } - - // Remove thousands separators for parseFloat() - $scope.value = $scope.value.replace(',', ''); - - var parsed = parseFloat($scope.value); - var valueFormatted = ''; - var valueProcessing = ''; - switch (getDecimalPlaces(vm.currency)) { - case '0': - if (isNaN(parsed)) { - buildAmount('-', '', ''); - } else { - valueFormatted = localizeNumbers(Math.round(parsed), 0); - buildAmount(valueFormatted, '', ''); - } - break; - - case '3': - if (isNaN(parsed)) { - buildAmount('-' + getDecimalSeparator() + '---', '', ''); - } else { - valueProcessing = parsed.toFixed(3); - valueFormatted = localizeNumbers(valueProcessing, 3); - buildAmount(valueFormatted, '', ''); - } - break; - - case '8': - if (isNaN(parsed)) { - buildAmount('-' + getDecimalSeparator() + '---', '', ''); - } else if (parsed === 0) { - buildAmount('0', '', ''); - } else { - valueFormatted = parsed.toFixed(8); - valueFormatted = localizeNumbers(valueFormatted, 8); - var start = valueFormatted.slice(0, -5); - var middle = valueFormatted.slice(-5, -2); - var end = valueFormatted.substr(valueFormatted.length - 2); - buildAmount(start, middle, end); - - } - break; - - default: // 2 - if (isNaN(parsed)) { - buildAmount('-' + getDecimalSeparator() + '--', '', ''); - } else { - valueProcessing = parseFloat(parsed.toFixed(2)); - valueFormatted = localizeNumbers(valueProcessing, 2); - buildAmount(valueFormatted, '', ''); - } - break; - } - $scope.canShow = true; - }; - - function getDecimalPlaces(currency) { - if (decimalPlaces['0'].indexOf(currency.toUpperCase()) > -1) return '0'; - if (decimalPlaces['3'].indexOf(currency.toUpperCase()) > -1) return '3'; - if (decimalPlaces['8'].indexOf(currency.toUpperCase()) > -1) return '8'; - return '2'; - }; - - function getDecimalSeparator() { - var testNum = 1.5; - var testString = testNum.toLocaleString(uxLanguage.getCurrentLanguage()); - // Some environments let you set decimal separators that are more than one character - var separator = /^1(.+)5$/.exec(testString)[1] - return separator; - }; - - function localizeNumbers(x, minimumFractionDigits) { - var parsed = parseFloat(x); - var opts = { - minimumFractionDigits: minimumFractionDigits, - useGrouping: true - }; - var lang = uxLanguage.getCurrentLanguage(); - var localized = parsed.toLocaleString(lang, opts); - var corrected = ensureEnoughFractionDigits(localized, x, minimumFractionDigits); - return corrected; - }; - } - -})(); \ No newline at end of file diff --git a/src/js/directives/incomingDataMenu.js b/src/js/directives/incomingDataMenu.js index 78856e62f..21478102b 100644 --- a/src/js/directives/incomingDataMenu.js +++ b/src/js/directives/incomingDataMenu.js @@ -1,28 +1,23 @@ 'use strict'; angular.module('copayApp.directives') - .directive('incomingDataMenu', function($timeout, $rootScope, $state, externalLinkService, sendFlowService, bitcoinCashJsService) { + .directive('incomingDataMenu', function($timeout, $rootScope, $state, externalLinkService) { return { restrict: 'E', templateUrl: 'views/includes/incomingDataMenu.html', link: function(scope, element, attrs) { $rootScope.$on('incomingDataMenu.showMenu', function(event, data) { $timeout(function() { - scope.data = data; - - if (scope.data.parsed.privateKey) { - scope.type = "privateKey"; - } else if (scope.data.parsed.url) { - scope.type = "url"; - } else if (scope.data.parsed.publicAddress) { - scope.type = "bitcoinAddress"; - var prefix = scope.data.parsed.isTestnet ? 'bchtest:' : 'bitcoincash:'; - scope.data.toAddress = (prefix + scope.data.parsed.publicAddress.cashAddr) || scope.data.parsed.publicAddress.legacy || scope.data.parsed.publicAddress.bitpay; - } else { - scope.type = "text"; - } - + scope.data = data.data; + scope.type = data.type; scope.showMenu = true; + scope.https = false; + + if (scope.type === 'url') { + if (scope.data.indexOf('https://') === 0) { + scope.https = true; + } + } }); }); scope.hide = function() { @@ -33,9 +28,18 @@ angular.module('copayApp.directives') externalLinkService.open(url); }; scope.sendPaymentToAddress = function(bitcoinAddress) { + var noPrefixInAddress = 0; + if (bitcoinAddress.toLowerCase().indexOf('bitcoin') < 0) { + noPrefixInAddress = 1; + } scope.showMenu = false; - sendFlowService.start({ - data: bitcoinAddress + $state.go('tabs.send').then(function() { + $timeout(function() { + $state.transitionTo('tabs.send.amount', { + toAddress: bitcoinAddress, + noPrefix: noPrefixInAddress + }); + }, 50); }); }; scope.addToAddressBook = function(bitcoinAddress) { diff --git a/src/js/directives/shapeshiftCoinTrader.js b/src/js/directives/shapeshiftCoinTrader.js index 793f380fb..d5c62f431 100644 --- a/src/js/directives/shapeshiftCoinTrader.js +++ b/src/js/directives/shapeshiftCoinTrader.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function($interval, shapeshiftApiService, profileService, incomingDataService, ongoingProcess) { +angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function($interval, shapeshiftApiService, profileService, incomingData, ongoingProcess) { return { restrict: 'E', transclude: true, @@ -111,8 +111,7 @@ angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function orderId: $scope.depositInfo.orderId }; - // How to handle this - if (incomingDataService.redir(sendAddress, 'shapeshift', shapeshiftData)) { + if (incomingData.redir(sendAddress, shapeshiftData)) { ongoingProcess.set('connectingShapeshift', false); return; } diff --git a/src/js/directives/slideToAccept.js b/src/js/directives/slideToAccept.js index 830bed677..3f4db0ef9 100644 --- a/src/js/directives/slideToAccept.js +++ b/src/js/directives/slideToAccept.js @@ -116,8 +116,7 @@ angular.module('copayApp.directives') function getTransformStyle(translatePct) { return { - 'transform': 'translateX(' + translatePct + '%)', - '-webkit-transform': 'translateX(' + translatePct + '%)' + 'transform': 'translateX(' + translatePct + '%)' }; } diff --git a/src/js/directives/slideToAcceptSuccess.js b/src/js/directives/slideToAcceptSuccess.js index ec6321b95..fbd588bfe 100644 --- a/src/js/directives/slideToAcceptSuccess.js +++ b/src/js/directives/slideToAcceptSuccess.js @@ -9,12 +9,12 @@ angular.module('copayApp.directives') scope: { isShown: '=slideSuccessShow', onConfirm: '&slideSuccessOnConfirm', - hideOnConfirm: '=slideSuccessHideOnConfirm', - onShare: '=slideSuccessOnShare', + hideOnConfirm: '=slideSuccessHideOnConfirm' }, link: function(scope, element, attrs) { - scope.isCordova = platformInfo.isCordova; - scope.hasShareFunction = typeof scope.onShare === 'function'; + + scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP; + var elm = element[0]; elm.style.display = 'none'; scope.$watch('isShown', function() { @@ -32,9 +32,6 @@ angular.module('copayApp.directives') elm.style.display = 'none'; } }; - scope.onShareButtonClick = function() { - scope.onShare(); - } } }; }); diff --git a/src/js/directives/wallet-balance.directive.js b/src/js/directives/wallet-balance.directive.js deleted file mode 100644 index 4d8ca2875..000000000 --- a/src/js/directives/wallet-balance.directive.js +++ /dev/null @@ -1,131 +0,0 @@ -'use strict'; - -(function(){ - - angular - .module('bitcoincom.directives') - .directive('walletBalance', function() { - return { - restrict: 'E', - scope: { - displayAsFiat: '@', - totalBalanceSat: '@', - // The Wallet object is sometimes not stringify()-able, so not interpolatable, - // so can't be passed to a directive. - walletCoin: '@', - walletStatus: '@', - walletCachedBalance: '@', - walletCachedBalanceUpdatedOn: '@', - walletCachedStatus: '@' - }, - templateUrl: 'views/includes/wallet-balance.html', - controller: walletBalanceController - } - }); - - function walletBalanceController($log, $scope, txFormatService) { - var cryptoBalanceHasBeenDisplayed = false; - - formatBalance(); - $scope.$watchGroup(['displayAsFiat', 'totalBalanceSat'], function onWalletBalanceWatch() { - formatBalance(); - }); - - function displayCryptoBalance(walletStatus, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatus) { - - if (walletStatus && walletStatus.isValid && walletStatus.totalBalanceStr) { - setDisplay(walletStatus.totalBalanceStr, ''); - cryptoBalanceHasBeenDisplayed = true; - return; - } - - if (walletCachedBalance) { - setDisplay(walletCachedBalance, walletCachedBalanceUpdatedOn); - return; - } - - if (walletCachedStatus && walletCachedStatus.isValid && walletCachedStatus.totalBalanceStr) { - setDisplay(walletCachedStatus.totalBalanceStr, ''); - return; - } - - setDisplay('', ''); - } - - function displayFiatBalance(walletStatus, walletCachedStatus, walletCoin) { - var displayAmount = ''; - if (walletStatus && walletStatus.isValid && walletStatus.alternativeBalanceAvailable) { - displayAmount = walletStatus.totalBalanceAlternative + ' ' + walletStatus.alternativeIsoCode; - setDisplay(displayAmount, ''); - return; - } - - if (walletCachedStatus && walletCachedStatus.isValid && walletCachedStatus.alternativeBalanceAvailable) { - displayAmount = walletCachedStatus.totalBalanceAlternative + ' ' + walletCachedStatus.alternativeIsoCode; - setDisplay(displayAmount, ''); - return; - } - - getFiatBalance(walletStatus, walletCachedStatus, walletCoin); - } - - function formatBalance() { - var displayAsFiat = $scope.displayAsFiat === 'true'; - - var walletStatusObj = null; - var walletCachedBalance = null; - var walletCachedBalanceUpdatedOn = null; - var walletCachedStatusObj = null; - - try { - walletStatusObj = JSON.parse($scope.walletStatus); - } catch (e) { - $log.warn('Failed to parse walletStatus.', e); - } - - try { - walletCachedStatusObj = JSON.parse($scope.walletCachedStatus); - } catch (e) { - $log.warn('Failed to parse walletCachedStatus.', e); - } - - if (!displayAsFiat || displayAsFiat && !cryptoBalanceHasBeenDisplayed) { - displayCryptoBalance(walletStatusObj, walletCachedBalance, walletCachedBalanceUpdatedOn, walletCachedStatusObj); - } - - if (displayAsFiat) { - displayFiatBalance(walletStatusObj, walletCachedStatusObj, $scope.walletCoin); - } - } - - function getFiatBalance(walletStatus, walletCachedStatus, walletCoin) { - var totalBalanceSat = null; - - if (walletStatus && walletStatus.isValid) { - totalBalanceSat = walletStatus.totalBalanceSat - } else if (walletCachedStatus && walletCachedStatus.isValid) { - totalBalanceSat = walletCachedStatus.totalBalanceSat - } - - // 0 is valid - if (totalBalanceSat === null) { - $log.warn('Abandoning call to get fiat balance, because no valid wallet status (cached or otherwise).'); - return; - } - - txFormatService.formatAlternativeStr(walletCoin, totalBalanceSat, function onFormatAlernativeStr(formatted) { - if (formatted) { - setDisplay(formatted, ''); - } else { - $log.error('Failed to format fiat balance of wallet.'); - } - }); - } - - function setDisplay(amount, cachedBalanceUpdatedOn) { - $scope.displayAmount = amount; - $scope.cachedBalanceUpdatedOn = cachedBalanceUpdatedOn; - } - } -})(); - diff --git a/src/js/routes.js b/src/js/routes.js index d2b78aac3..8277314e5 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -236,7 +236,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.receive', { - url: '/receive/:walletId', + url: '/receive', views: { 'tab-receive': { controller: 'tabReceiveController', @@ -287,44 +287,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr */ .state('tabs.send.amount', { - url: '/amount', + url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor/:coin/:fixedUnit/:fromWalletId/:minShapeshiftAmount/:maxShapeshiftAmount/:shapeshiftOrderId/:displayAddress/:noPrefix', views: { 'tab-send@tabs': { controller: 'amountController', - controllerAs: 'vm', templateUrl: 'views/amount.html' } } }) - .state('tabs.send.wallet-to-wallet', { - url: '/wallet-to-wallet', - views: { - 'tab-send@tabs': { - controller: 'walletSelectorController', - templateUrl: 'views/walletSelector.html' - } - } - }) - .state('tabs.send.origin', { - url: '/origin', - views: { - 'tab-send@tabs': { - controller: 'walletSelectorController', - templateUrl: 'views/walletSelector.html', - } - } - }) - .state('tabs.send.destination', { - url: '/destination', - views: { - 'tab-send@tabs': { - controller: 'walletSelectorController', - templateUrl: 'views/walletSelector.html', - } - } - }) .state('tabs.send.confirm', { - url: '/confirm', + url: '/confirm/:recipientType/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:coin/:useSendMax/:fromWalletId/:displayAddress/:requiredFeeRate', views: { 'tab-send@tabs': { controller: 'confirmController', @@ -344,19 +316,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) - .state('tabs.send.review', { - url: '/review/:thirdParty/:amount/:fromWalletId/:sendMax/:toAddress/:toWalletId', - views: { - 'tab-send@tabs': { - controller: 'reviewController', - controllerAs: 'vm', - templateUrl: 'views/review.html' - } - }, - params: { - paypro: null - } - }) /* * @@ -736,17 +695,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('tabs.paymentRequest.amount', { - url: '/amount/:toWalletId', + url: '/amount/:coin', views: { 'tab-receive@tabs': { controller: 'amountController', - controllerAs: 'vm', templateUrl: 'views/amount.html' } } }) .state('tabs.paymentRequest.confirm', { - url: '/confirm/:amount/:toWalletId', + url: '/confirm/:amount/:currency/:coin', views: { 'tab-receive@tabs': { controller: 'customAmountController', @@ -887,7 +845,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr views: { 'tab-home@tabs': { controller: 'amountController', - controllerAs: 'vm', templateUrl: 'views/amount.html' } } @@ -953,7 +910,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr views: { 'tab-home@tabs': { controller: 'amountController', - controllerAs: 'vm', templateUrl: 'views/amount.html' } } @@ -1012,7 +968,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr /* Shapeshift */ .state('tabs.shapeshift', { - url: '/shapeshift/:fromWalletId/:toWalletId', + url: '/shapeshift', views: { 'tab-home@tabs': { controller: 'shapeshiftController', @@ -1073,7 +1029,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr views: { 'tab-home@tabs': { controller: 'amountController', - controllerAs: 'vm', templateUrl: 'views/amount.html' } }, @@ -1126,7 +1081,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr views: { 'tab-home@tabs': { controller: 'amountController', - controllerAs: 'vm', templateUrl: 'views/amount.html' } }, @@ -1183,7 +1137,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr views: { 'tab-home@tabs': { controller: 'amountController', - controllerAs: 'vm', templateUrl: 'views/amount.html' } } @@ -1207,7 +1160,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }); }) - .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buydotbitcoindotcomService, pushNotificationsService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService, rateService) { + .run(function($rootScope, $state, $location, $log, $timeout, startupService, ionicToast, fingerprintService, $ionicHistory, $ionicPlatform, $window, appConfigService, lodash, platformInfo, profileService, uxLanguage, gettextCatalog, openURLService, storageService, scannerService, configService, emailService, /* plugins START HERE => */ buydotbitcoindotcomService, glideraService, amazonService, bitpayCardService, applicationService, mercadoLibreService, rateService) { $ionicPlatform.ready(function() { @@ -1231,14 +1184,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }); - configService.whenAvailable(function(config) { - pushNotificationsService.init(); - }); - //firebaseEventsService.init(); - - var channel = "ga"; - if (platformInfo.isCordova) { - channel = "firebase"; + var channel = "firebase"; + if (platformInfo.isNW) { + channel = "ga"; } // Send a log to test @@ -1277,13 +1225,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }); window.BitAnalytics.ActionHandlers.trackAction(actionTabOpen); - var actionShapeShiftStart = new window.BitAnalytics.ActionFactory.createAction('click', { - name: 'shapeshift_start_click', - class: 'track_shapeshift_start_click', - channels: [channel] - }); - window.BitAnalytics.ActionHandlers.trackAction(actionShapeShiftStart); - // Init language uxLanguage.init(function (lang) { @@ -1323,7 +1264,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr if (screen.width < 768 && platformInfo.isCordova) screen.lockOrientation('portrait'); - if (ionic.Platform.isAndroid() && platformInfo.isCordova && StatusBar) { + if (ionic.Platform.isAndroid() && StatusBar) { StatusBar.backgroundColorByHexString('#000000'); } diff --git a/src/js/services/bitcoin-uri.service.js b/src/js/services/bitcoin-uri.service.js deleted file mode 100644 index 3da84f3da..000000000 --- a/src/js/services/bitcoin-uri.service.js +++ /dev/null @@ -1,416 +0,0 @@ -'use strict'; - -// https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki -// https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki - -(function(){ - - angular - .module('bitcoincom.services') - .factory('bitcoinUriService', bitcoinUriService); - - function bitcoinUriService(bitcoinCashJsService, bwcService, $log) { - var bch = bitcoinCashJsService.getBitcoinCashJs(); - var bitcore = bwcService.getBitcore(); - - var service = { - parse: parse - }; - - return service; - - function bitpayAddrOnMainnet(address) { - var Address = bch.Address; - var BitpayFormat = Address.BitpayFormat; - - var mainnet = bch.Networks.mainnet; - - var result = null; - if (address[0] == 'C') { - try { - result = Address.fromString(address, mainnet, 'pubkeyhash', BitpayFormat); - } catch (e) {}; - - } else if (address[0] == 'H') { - try { - result = Address.fromString(address, mainnet, 'scripthash', BitpayFormat); - } catch (e) {}; - - } - return result; - } - - function cashAddrOnMainnet(address) { - var Address = bch.Address; - var CashAddrFormat = Address.CashAddrFormat; - - var mainnet = bch.Networks.mainnet; - - var prefixed = 'bitcoincash:' + address; - var result = null; - if (address[0] == 'q') { - try { - result = Address.fromString(prefixed, mainnet, 'pubkeyhash', CashAddrFormat); - } catch (e) {}; - - } else if (address[0] == 'p') { - try { - result = Address.fromString(prefixed, mainnet, 'scripthash', CashAddrFormat); - } catch (e) {}; - - } - return result; - } - - function cashAddrOnTestnet(address) { - var Address = bch.Address; - var CashAddrFormat = Address.CashAddrFormat; - - var testnet = bch.Networks.testnet; - - var prefixed = 'bchtest:' + address; - var result = null; - if (address[0] == 'q') { - try { - result = Address.fromString(prefixed, testnet, 'pubkeyhash', CashAddrFormat); - } catch (e) {}; - - } else if (address[0] == 'p') { - try { - result = Address.fromString(prefixed, testnet, 'scripthash', CashAddrFormat); - } catch (e) {}; - - } - return result; - } - - function infoFromWalletImportText(data) { - var split = data.split('|'); - // Copay seems to use extra parameter for coin. - if (split.length < 5 || split.length > 6) { - return null; - } - - var type = parseInt(split[0], 10); - if (isNaN(type)) { - return null; - } - - var data = split[1]; - var network = split[2]; - if (!(network === 'livenet' || network === 'testnet')) { - return null; - } - var isTestnet = network === 'testnet'; - - var derivationPath = split[3]; - if (!/^m\/\d+'\/\d+'\/\d+'$/.test(derivationPath)) { - return null; - } - - var hasPassphraseText = split[4]; - if (!(hasPassphraseText === 'true' || hasPassphraseText === 'false')) { - return null; - } - var hasPassphrase = hasPassphraseText === 'true'; - - var coin; // Intentionally undefined as may not be present - if (split.length > 5) { - var coinText = split[5]; - if (!(coinText === 'bch' || coinText === 'btc')) { - return null; - } - coin = coinText; - } - - return { - type: type, - data: data, - isTestnet: isTestnet, - derivationPath: derivationPath, - hasPassphrase: hasPassphrase, - coin: coin - }; - } - - /* - For parsing: - BIP21 - BIP72 - - returns: - { - amount: '', - amountInSatoshis: 0, - bareUrl: '', - coin: '', - copayInvitation: '', - import: { // testnet info in root, coin info in root if available - data: '', - derivationPath: '', - hasPassphrase: false, - type: 1, - }, - isValid: false, - label: '', - message: '', - other: { - somethingIDontUnderstand: 'Its value' - }, - privateKey: { - encrypted: '', - wif: '' - }'', - publicAddress: { - bitpay: '', - cashAddr: '', - legacy: '', - }, - req: { - "req-param0": '', - "req-param1": '' - }, - testnet: false, - url: '' // For BIP70 - } - - Only fields that are present in the data are defined in the returned object. Both privateKey and publicAddress only have 1 field defined, if they exist at all. - The exception to this is the coin property, which is determined from other data, such as the prefix or address type. - - */ - - function parse(data) { - var parsed = { - isValid: false - }; - - if (typeof data !== 'string') { - return parsed; - } - - // Identify prefix - var trimmed = data.trim(); - var colonSplit = /^([\w-]*):?(.*)$/.exec(trimmed); - if (!colonSplit) { - return parsed; - } - - var addressAndParams = ''; - var preColonLower = colonSplit[1].toLowerCase(); - if (preColonLower === 'bitcoin') { - parsed.coin = 'btc'; - addressAndParams = colonSplit[2].trim(); - console.log('Is btc'); - - } else if (/^(?:bitcoincash)|(?:bitcoin-cash)$/.test(preColonLower)) { - parsed.coin = 'bch'; - parsed.test = false; - addressAndParams = colonSplit[2].trim(); - console.log('Is bch'); - - } else if (/^(?:bchtest)$/.test(preColonLower)) { - parsed.coin = 'bch'; - parsed.isTestnet = true; - addressAndParams = colonSplit[2].trim(); - console.log('Is bch'); - - } else if (colonSplit[2] === '') { - // No colon and no coin specifier. - addressAndParams = colonSplit[1].trim(); - console.log('No prefix.'); - - } else if (/^https?$/.test(colonSplit[1])) { // Plain URL - addressAndParams = trimmed; - - } else if (colonSplit[2].indexOf('|') == 0) { // Import - addressAndParams = trimmed - } else { - // Something we don't recognise - return parsed; - } - - // Remove erroneous leading slashes - //var leadingSlashes = /^\/*([^\/]+(?:.*))$/.exec(addressAndParams); - var leadingSlashes = /^\/*(.*)$/.exec(addressAndParams); - if (!leadingSlashes) { - return parsed; - } - addressAndParams = leadingSlashes[1]; - - var questionMarkSplit = /^([^\?]*)\??([^\?]*)$/.exec(addressAndParams); - if (!questionMarkSplit) { - return parsed; - } - - var address = questionMarkSplit[1]; - var params = questionMarkSplit[2]; - - if (params.length > 0) { - var paramsSplit = params.split('&'); - var others; - var req; - var paramCount = paramsSplit.length; - for(var i = 0; i < paramCount; i++) { - var param = paramsSplit[i]; - var valueSplit = param.split('='); - if (valueSplit.length !== 2) { - return parsed; - } - - var key = valueSplit[0]; - var value = valueSplit[1]; - var decodedValue = decodeURIComponent(value); - switch(key) { - case 'amount': - var amount = parseFloat(decodedValue); - if (amount) { // Checking for NaN, or no numbers at all etc. & convert to satoshi - parsed.amount = decodedValue; // Need to check if a currency is precised - parsed.amountInSatoshis = amount * 100000000 - } else { - return parsed; - } - break; - - case 'label': - parsed.label = decodedValue; - break; - - case 'message': - parsed.message = decodedValue; - break; - - case 'r': - // Could use a more comprehesive regex to test URL validity, but then how would we know - // which part of the validation it failed? - if (decodedValue.startsWith('https://')) { - parsed.url = decodedValue; - } else { - return parsed; - } - break; - - default: - if (key.startsWith('req-')) { - req = req || {}; - req[key] = decodedValue; - } else { - others = others || {}; - others[key] = decodedValue; - } - } - - }; - } - - parsed.others = others; - parsed.req = req; - - - if (address) { - var addressLowerCase = address.toLowerCase(); - var copayInvitationRe = /^[0-9A-HJ-NP-Za-km-z]{70,80}$/; - //var legacyRe = /^[13][a-km-zA-HJ-NP-Z1-9]{25,34}$/; - //var legacyTestnetRe = /^[mn][a-km-zA-HJ-NP-Z1-9]{25,34}$/; - var privateKeyEncryptedRe = /^6P[1-9A-HJ-NP-Za-km-z]{56}$/; - var privateKeyForUncompressedPublicKeyRe = /^5[1-9A-HJ-NP-Za-km-z]{50}$/; - var privateKeyForUncompressedPublicKeyTestnetRe = /^9[1-9A-HJ-NP-Za-km-z]{50}$/; - var privateKeyForCompressedPublicKeyRe = /^[KL][1-9A-HJ-NP-Za-km-z]{51}$/; - var privateKeyForCompressedPublicKeyTestnetRe = /^[c][1-9A-HJ-NP-Za-km-z]{51}$/; - var urlRe = /^https?:\/\/.+/; - - var bitpayAddrMainnet = bitpayAddrOnMainnet(address); - var cashAddrTestnet = cashAddrOnTestnet(addressLowerCase); - var cashAddrMainnet = cashAddrOnMainnet(addressLowerCase); - var importInfo = infoFromWalletImportText(address); - var privateKey = ''; - - if (parsed.isTestnet && cashAddrTestnet) { - parsed.address = addressLowerCase; - parsed.coin = 'bch'; - parsed.publicAddress = { - cashAddr: addressLowerCase - }; - parsed.isValid = true; - - } else if (cashAddrMainnet) { - parsed.coin = 'bch'; - parsed.publicAddress = { - cashAddr: addressLowerCase - }; - parsed.isTestnet = false; - parsed.isValid = true; - - } else if (bitcore.Address.isValid(address, 'livenet')) { - parsed.publicAddress = { - legacy: address - }; - parsed.isTestnet = false; - parsed.isValid = true; - - } else if (bitcore.Address.isValid(address, 'testnet')) { - parsed.publicAddress = { - legacy: address - }; - parsed.isTestnet = true; - parsed.isValid = true; - - } else if (bitpayAddrMainnet) { - parsed.coin = 'bch'; - parsed.publicAddress = { - bitpay: address - }; - parsed.isTestnet = false; - parsed.isValid = true; - - } else if (copayInvitationRe.test(address) ) { - parsed.copayInvitation = address; - parsed.isValid = true; - - } else if (privateKeyForUncompressedPublicKeyRe.test(address) || privateKeyForCompressedPublicKeyRe.test(address)) { - privateKey = address; - try { - new bitcore.PrivateKey(privateKey, 'livenet'); - parsed.privateKey = { wif: privateKey }; - parsed.isTestnet = false; - parsed.isValid = true; - } catch (e) {} - - } else if (privateKeyForUncompressedPublicKeyTestnetRe.test(address) || privateKeyForCompressedPublicKeyTestnetRe.test(address)) { - privateKey = address; - try { - new bitcore.PrivateKey(privateKey, 'testnet'); - parsed.privateKey = { wif: privateKey }; - parsed.isTestnet = true; - parsed.isValid = true; - } catch (e) {} - - } else if (privateKeyEncryptedRe.test(address)) { - parsed.privateKey = { encrypted: address }; - parsed.isValid = true; - - } else if (urlRe.test(address)) { - parsed.bareUrl = trimmed; - parsed.isValid = true; - - } else if (importInfo) { - parsed.import = { - type: importInfo.type, - data: importInfo.data, - derivationPath: importInfo.derivationPath, - hasPassphrase: importInfo.hasPassphrase - }; - parsed.coin = importInfo.coin; - parsed.isTestnet = importInfo.isTestnet; - parsed.isValid = true; - } - - } else { - parsed.isValid = !!parsed.url; // BIP72 - } - - return parsed; - } - - } - -})(); diff --git a/src/js/services/bitcoin-uri.service.spec.js b/src/js/services/bitcoin-uri.service.spec.js deleted file mode 100644 index 2ddbd0d2e..000000000 --- a/src/js/services/bitcoin-uri.service.spec.js +++ /dev/null @@ -1,429 +0,0 @@ -describe('bitcoinUriService', function() { - var bitcoinUriService; - - beforeEach(function() { - module('bitcoinCashJsModule'); - module('bitcoincom.services'); - module('bwcModule'); - - inject(function($injector){ - bitcoinUriService = $injector.get('bitcoinUriService'); - }); - }); - - - it('Bitcoin BIP72', function() { - - var parsed = bitcoinUriService.parse('bitcoin:?r=https://bitpay.com/i/CwzbKP3k3JNgXJBfuoerDr'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('btc'); - expect(parsed.isTestnet).toBeUndefined(); - expect(parsed.publicAddress).toBeUndefined(); - expect(parsed.url).toBe('https://bitpay.com/i/CwzbKP3k3JNgXJBfuoerDr'); - }); - - it('Bitcoin Cash BIP72', function() { - - var parsed = bitcoinUriService.parse('bitcoincash:?r=https://bitpay.com/i/SmHdie5dvBnG5kouZzEPzu'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress).toBeUndefined(); - expect(parsed.isTestnet).toBeUndefined(); - expect(parsed.url).toBe('https://bitpay.com/i/SmHdie5dvBnG5kouZzEPzu'); - }); - - it('Bitcoin Cash prefix with legacy address', function() { - - var parsed = bitcoinUriService.parse('bitcoincash:1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.legacy).toBe('1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j'); - expect(parsed.isTestnet).toBe(false); - }); - - it('Bitcoin Cash prefix with legacy address on testnet', function() { - - var parsed = bitcoinUriService.parse('bitcoincash:mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.legacy).toBe('mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn'); - expect(parsed.isTestnet).toBe(true); - }); - - it('Bitcoin Cash uri with extended params', function() { - - var parsed = bitcoinUriService.parse('bitcoincash:qr8v2vqnzntykakht43rqmxq8cdjzjp795fc3vsjgc?unknown=something&mystery=Melton%20probang&req-one=ichi&req-beta=Ni%20san'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.others.mystery).toBe('Melton probang'); - expect(parsed.others.unknown).toBe('something'); - expect(parsed.publicAddress.cashAddr).toBe('qr8v2vqnzntykakht43rqmxq8cdjzjp795fc3vsjgc'); - expect(parsed.req['req-beta']).toBe('Ni san'); - expect(parsed.req['req-one']).toBe('ichi'); - expect(parsed.isTestnet).toBe(false); - }); - - it('Bitcoin Cash uri with invalid amount', function() { - - var parsed = bitcoinUriService.parse('bitcoincash:qq0knhwj4d5zy3kdph24w6etq58vwzua6sm7lhcmuk?amount=three'); - - expect(parsed.isValid).toBe(false); - }); - - - it('Bitcoin testnet address', function() { - - var parsed = bitcoinUriService.parse('mtWcoToWhbtPoCby5fvs8xdBujT5GGenD4'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBeUndefined(); - expect(parsed.publicAddress.legacy).toBe('mtWcoToWhbtPoCby5fvs8xdBujT5GGenD4'); - expect(parsed.isTestnet).toBe(true); - }); - - it('Bitcoin uri', function() { - - var parsed = bitcoinUriService.parse('bitcoin:15yCdKWVKRvfXMJpPYZBqMhiGKwjKzZdLN'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('btc'); - expect(parsed.publicAddress.legacy).toBe('15yCdKWVKRvfXMJpPYZBqMhiGKwjKzZdLN'); - expect(parsed.isTestnet).toBe(false); - }); - - it('Bitcoin uri with encoded label', function() { - - var parsed = bitcoinUriService.parse('bitcoin:1MxudKDEBWZ1yjizUSf6htacenNtb3DWbT?label=Mr.%20Smith'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('btc'); - expect(parsed.label).toBe('Mr. Smith'); - expect(parsed.publicAddress.legacy).toBe('1MxudKDEBWZ1yjizUSf6htacenNtb3DWbT'); - expect(parsed.isTestnet).toBe(false); - }); - - it('Bitcoin uri with params', function() { - - var parsed = bitcoinUriService.parse('bitcoin:12nCRhMDfxVnuF3uYMXv2fNxBohNmacfWu?amount=20.3&label=Luke-Jr&message=Donation%20for%20project%20xyz'); - - expect(parsed.isValid).toBe(true); - expect(parsed.amount).toBe('20.3'); - expect(parsed.amountInSatoshis).toBe(2030000000); - expect(parsed.coin).toBe('btc'); - expect(parsed.label).toBe('Luke-Jr'); - expect(parsed.publicAddress.legacy).toBe('12nCRhMDfxVnuF3uYMXv2fNxBohNmacfWu'); - expect(parsed.message).toBe('Donation for project xyz'); - expect(parsed.isTestnet).toBe(false); - }); - - it('Bitcoin uri with slash', function() { - - var parsed = bitcoinUriService.parse('bitcoin:/1GhpYmbRaf73AZRxDwAGr6653iZBGzdgeA'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('btc'); - expect(parsed.publicAddress.legacy).toBe('1GhpYmbRaf73AZRxDwAGr6653iZBGzdgeA'); - expect(parsed.isTestnet).toBe(false); - }); - - it('Bitcoin uri with slashes', function() { - - var parsed = bitcoinUriService.parse('bitcoin://18PCPhgZJjLxe9g3Q1BXLpL5aVut1fW3aX'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('btc'); - expect(parsed.publicAddress.legacy).toBe('18PCPhgZJjLxe9g3Q1BXLpL5aVut1fW3aX'); - expect(parsed.isTestnet).toBe(false); - }); - - it('Bitcoin uri with space', function() { - - var parsed = bitcoinUriService.parse('bitcoin: 19cPoKU5ZazY8NkLEsxK7drBqJnpGkax3d'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('btc'); - expect(parsed.publicAddress.legacy).toBe('19cPoKU5ZazY8NkLEsxK7drBqJnpGkax3d'); - expect(parsed.isTestnet).toBe(false); - }); - - it('Bitpay without prefix', function() { - - var parsed = bitcoinUriService.parse('CJoRov8TirekvajiimQpb5Hk95evA7H2Yz'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.bitpay).toBe('CJoRov8TirekvajiimQpb5Hk95evA7H2Yz'); - expect(parsed.isTestnet).toBe(false); - }); - - it('legacy address', function() { - - var parsed = bitcoinUriService.parse('1JXeGEu7bNEAYu6URT6dU6g1Ys6ffSAWYW'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBeUndefined(); - expect(parsed.publicAddress.legacy).toBe('1JXeGEu7bNEAYu6URT6dU6g1Ys6ffSAWYW'); - expect(parsed.isTestnet).toBe(false); - }); - - it('cashAddr testnet with prefix', function() { - - var parsed = bitcoinUriService.parse('bchtest:qpcz6pmurq9ctg5848trzz9zmuuygj4q5qam7ph3gt'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qpcz6pmurq9ctg5848trzz9zmuuygj4q5qam7ph3gt'); - expect(parsed.isTestnet).toBe(true); - }); - - it('cashAddr uppercase', function() { - - var parsed = bitcoinUriService.parse('BITCOINCASH:QZZG9NMC5VX8GAP6XFATX3TWNSDN2YRMCSSULSMY44'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qzzg9nmc5vx8gap6xfatx3twnsdn2yrmcssulsmy44'); - expect(parsed.isTestnet).toBe(false); - }); - - it('cashAddr with dash', function() { - - var parsed = bitcoinUriService.parse('bitcoin-cash:qpshfu3dk5s3e7zdcgdcun6xgxtra6uyxs7g580js0'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qpshfu3dk5s3e7zdcgdcun6xgxtra6uyxs7g580js0'); - expect(parsed.isTestnet).toBe(false); - }); - - it('cashAddr with prefix', function() { - - var parsed = bitcoinUriService.parse('bitcoincash:qrq9p82a247lecv08ldk5p5h6ahtnjzpqcnh8yhq92'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qrq9p82a247lecv08ldk5p5h6ahtnjzpqcnh8yhq92'); - expect(parsed.isTestnet).toBe(false); - }); - - it('cashAddr with slash', function() { - - var parsed = bitcoinUriService.parse('bitcoincash:/qzdectfmuw0xxztfx7mh045830dqcshj85hr44l35a'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qzdectfmuw0xxztfx7mh045830dqcshj85hr44l35a'); - expect(parsed.isTestnet).toBe(false); - }); - - it('cashAddr with slashes', function() { - - var parsed = bitcoinUriService.parse('bitcoincash://qpj966w8utue75lqqq3rlgh20zkz3rmydqpq8syv9c'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qpj966w8utue75lqqq3rlgh20zkz3rmydqpq8syv9c'); - expect(parsed.isTestnet).toBe(false); - }); - - it('cashAddr with space', function() { - - var parsed = bitcoinUriService.parse('bitcoincash: qpar9ldle8z6alcwgclejdhc24ha2xrg0szs5802ce'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qpar9ldle8z6alcwgclejdhc24ha2xrg0szs5802ce'); - expect(parsed.isTestnet).toBe(false); - }); - - - it('cashAddr with space on testnet', function() { - - var parsed = bitcoinUriService.parse('bchtest: qqjxkmtaxk4nv6w9h5ht2fjcj9c7ruh0fu7cnxsx5j'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qqjxkmtaxk4nv6w9h5ht2fjcj9c7ruh0fu7cnxsx5j'); - expect(parsed.isTestnet).toBe(true); - }); - - it('cashAddr without prefix', function() { - - var parsed = bitcoinUriService.parse('qqen2y3l28dpk0dzsag8w027ds96u7z4pc0uxtl0nq'); - - expect(parsed.isValid).toBe(true); - expect(parsed.coin).toBe('bch'); - expect(parsed.publicAddress.cashAddr).toBe('qqen2y3l28dpk0dzsag8w027ds96u7z4pc0uxtl0nq'); - expect(parsed.isTestnet).toBe(false); - }); - - it('copay invitation', function() { - - var parsed = bitcoinUriService.parse('PD5B7rEEj72st9d5nFszyuKxJP6FAGS7idVC2SMqiMxUcWVd8JifZDJw1UgjUctxefUFE3Sz6qLbch'); - - expect(parsed.isValid).toBe(true); - expect(parsed.copayInvitation).toBe('PD5B7rEEj72st9d5nFszyuKxJP6FAGS7idVC2SMqiMxUcWVd8JifZDJw1UgjUctxefUFE3Sz6qLbch'); - }); - - - it ('import BCH wallet no password', function() { - var parsed = bitcoinUriService.parse("1|suggest route obvious broccoli good position hidden tone history around final lobster|livenet|m/44'/0'/0'|false"); - - expect(parsed.isValid).toBe(true); - expect(parsed.import.type).toBe(1); - expect(parsed.import.data).toBe('suggest route obvious broccoli good position hidden tone history around final lobster'); - expect(parsed.isTestnet).toBe(false); - expect(parsed.import.derivationPath).toBe("m/44'/0'/0'"); - expect(parsed.import.hasPassphrase).toBe(false); - }); - - it ('import BCH wallet with passphrase', function() { - var parsed = bitcoinUriService.parse("1|fringe hazard all hobby trap myth fire stand sock empty soon east|livenet|m/44'/0'/0'|true"); - - expect(parsed.isValid).toBe(true); - expect(parsed.import.type).toBe(1); - expect(parsed.import.data).toBe('fringe hazard all hobby trap myth fire stand sock empty soon east'); - expect(parsed.isTestnet).toBe(false); - expect(parsed.import.derivationPath).toBe("m/44'/0'/0'"); - expect(parsed.import.hasPassphrase).toBe(true); - }); - - it ('import BTC wallet testnet', function() { - // From copay - var parsed = bitcoinUriService.parse("1|cat wealth column firm wet sauce tornado era feature monster click eyebrow|testnet|m/44'/1'/0'|false|btc"); - - expect(parsed.isValid).toBe(true); - expect(parsed.import.type).toBe(1); - expect(parsed.import.data).toBe('cat wealth column firm wet sauce tornado era feature monster click eyebrow'); - expect(parsed.isTestnet).toBe(true); - expect(parsed.import.derivationPath).toBe("m/44'/1'/0'"); - expect(parsed.import.hasPassphrase).toBe(false); - }); - - // Invalid addresses from https://github.com/bitcoincashorg/bitcoincash.org/blob/master/spec/cashaddr.md - it('invalid cashAddr style 1', function() { - var parsed = bitcoinUriService.parse('prefix:x64nx6hz'); - expect(parsed.isValid).toBe(false); - }); - - it('invalid cashAddr style 2', function() { - var parsed = bitcoinUriService.parse('p:gpf8m4h7'); - expect(parsed.isValid).toBe(false); - }); - - it('invalid cashAddr style 3', function() { - var parsed = bitcoinUriService.parse('bitcoincash:qpzry9x8gf2tvdw0s3jn54khce6mua7lcw20ayyn'); - expect(parsed.isValid).toBe(false); - }); - - it('invalid cashAddr style 4', function() { - var parsed = bitcoinUriService.parse('bchtest:testnetaddress4d6njnut'); - expect(parsed.isValid).toBe(false); - }); - - it('invalid cashAddr style 5', function() { - var parsed = bitcoinUriService.parse('bchreg:555555555555555555555555555555555555555555555udxmlmrz'); - expect(parsed.isValid).toBe(false); - }); - - it('non-string', function() { - - var parsed = bitcoinUriService.parse([1, 2, 3, 4]); - - expect(parsed.isValid).toBe(false); - }); - - it('private key encrypted with BIP38', function() { - - var parsed = bitcoinUriService.parse('6PRN5nEDmX842gsBzJryPu8Tw5kcsaQq1GPLcjVQPcEStvbFAtz11JX9pX'); - - expect(parsed.isValid).toBe(true); - expect(parsed.privateKey.encrypted).toBe('6PRN5nEDmX842gsBzJryPu8Tw5kcsaQq1GPLcjVQPcEStvbFAtz11JX9pX'); - }); - - it('private key for compressed pubkey mainnet', function() { - - var parsed = bitcoinUriService.parse('5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTJ'); - - expect(parsed.isValid).toBe(true); - expect(parsed.privateKey.wif).toBe('5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTJ'); - expect(parsed.isTestnet).toBe(false); - }); - - it('private key for compressed pubkey mainnet with wrong checksum', function() { - - var parsed = bitcoinUriService.parse('5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTu'); - - expect(parsed.isValid).toBe(false); - }); - - it('private key for compressed pubkey testnet', function() { - - var parsed = bitcoinUriService.parse('cNJFgo1driFnPcBdBX8BrJrpxchBWXwXCvNH5SoSkdcF6JXXwHMm'); - - expect(parsed.isValid).toBe(true); - expect(parsed.privateKey.wif).toBe('cNJFgo1driFnPcBdBX8BrJrpxchBWXwXCvNH5SoSkdcF6JXXwHMm'); - expect(parsed.isTestnet).toBe(true); - }); - - it('private key for compressed pubkey testnet with wrong checksum', function() { - - var parsed = bitcoinUriService.parse('cNJFgo1driFnPcBdBX8BrJrpxchBWXwXCvNH5SoSkdcF6JXXwHMM'); - - expect(parsed.isValid).toBe(false); - }); - - it('private key for uncompressed pubkey mainnet', function() { - - var parsed = bitcoinUriService.parse('L18V3rAhCKEioPnJ4BHLCCsaYa8eSNFrMjNQ2EdwgeAdmBSnTMwx'); - - expect(parsed.isValid).toBe(true); - expect(parsed.privateKey.wif).toBe('L18V3rAhCKEioPnJ4BHLCCsaYa8eSNFrMjNQ2EdwgeAdmBSnTMwx'); - expect(parsed.isTestnet).toBe(false); - }); - - it('private key for uncompressed pubkey mainnet with wrong checksum', function() { - - var parsed = bitcoinUriService.parse('L18V3rAhCKEioPnJ4BHLCCsaYa8eSNFrMjNQ2EdwgeAdmBSnTTwx'); - - expect(parsed.isValid).toBe(false); - }); - - it('private key for uncompressed pubkey testnet', function() { - - var parsed = bitcoinUriService.parse('92Pg46rUhgTT7romnV7iGW6W1gbGdeezqdbJCzShkCsYNzyyNcc'); - - expect(parsed.isValid).toBe(true); - expect(parsed.privateKey.wif).toBe('92Pg46rUhgTT7romnV7iGW6W1gbGdeezqdbJCzShkCsYNzyyNcc'); - expect(parsed.isTestnet).toBe(true); - }); - - it('private key for uncompressed pubkey testnet with wrong checksum', function() { - - var parsed = bitcoinUriService.parse('92Pg46rUhgTT7romnV7iGW6W1gbGdeezqdbJCzShkCsYNzyyNcC'); - - expect(parsed.isValid).toBe(false); - }); - - it('URL only, http', function() { - - var parsed = bitcoinUriService.parse('http://paperwallet.bitcoin.com'); - - expect(parsed.isValid).toBe(true); - expect(parsed.bareUrl).toBe('http://paperwallet.bitcoin.com'); - }); - - it('URL only, https with query', function() { - - var parsed = bitcoinUriService.parse('https://purse.io/?one=two&three=four'); - - expect(parsed.isValid).toBe(true); - expect(parsed.bareUrl).toBe('https://purse.io/?one=two&three=four'); - }); - -}); \ No newline at end of file diff --git a/src/js/services/bitcoincomService.js b/src/js/services/bitcoincomService.js index 62a75b4d1..051123111 100644 --- a/src/js/services/bitcoincomService.js +++ b/src/js/services/bitcoincomService.js @@ -1,5 +1,5 @@ 'use strict'; -angular.module('copayApp.services').factory('bitcoincomService', function(gettextCatalog, nextStepsService, platformInfo) { +angular.module('copayApp.services').factory('bitcoincomService', function(platformInfo, nextStepsService) { var root = {}; var credentials = {}; @@ -19,42 +19,42 @@ angular.module('copayApp.services').factory('bitcoincomService', function(gettex var cashGamesItem = { name: 'games', - title: gettextCatalog.getString('Bitcoin Cash Games'), + title: 'Bitcoin Cash Games', icon: 'icon-games', href: 'https://cashgames.bitcoin.com' }; var newsItem = { name: 'news', - title: gettextCatalog.getString('News'), + title: 'News', icon: 'icon-news', href: 'https://news.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=News' }; var poolItem = { name: 'pool', - title: gettextCatalog.getString('Mining Pool'), + title: 'Mining Pool', icon: 'icon-mining', href: 'https://pool.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Pool' }; var toolsItem = { name: 'tools', - title: gettextCatalog.getString('Tools'), + title: 'Tools', icon: 'icon-tools', href: 'https://tools.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Tools' }; var priceChartItem = { name: 'pricechart', - title: gettextCatalog.getString('Bitcoin Price Charts'), + title: 'Bitcoin Price Charts', icon: 'icon-chart', sref: 'tabs.pricechart', }; var faucetItem = { name: 'faucet', - title: gettextCatalog.getString('Free Bitcoin Cash'), + title: 'Free Bitcoin Cash', icon: 'icon-faucet', href: 'https://free.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Faucet' }; @@ -85,9 +85,7 @@ angular.module('copayApp.services').factory('bitcoincomService', function(gettex }; var register = function() { - if (!platformInfo.isAndroid) { // To comply with Google Play policies - nextStepsService.register(cashGamesItem); - } + nextStepsService.register(cashGamesItem); nextStepsService.register(newsItem); nextStepsService.register(poolItem); nextStepsService.register(toolsItem); diff --git a/src/js/services/buyAndSellService.js b/src/js/services/buyAndSellService.js index e35403131..65a9a93c7 100644 --- a/src/js/services/buyAndSellService.js +++ b/src/js/services/buyAndSellService.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('buyAndSellService', function(gettextCatalog, $log, servicesService, lodash, $ionicScrollDelegate, $timeout) { +angular.module('copayApp.services').factory('buyAndSellService', function($log, servicesService, lodash, $ionicScrollDelegate, $timeout) { var root = {}; var services = []; var linkedServices = []; @@ -23,7 +23,7 @@ angular.module('copayApp.services').factory('buyAndSellService', function(gettex if (linkedServices.length == 0) { servicesService.register({ - title: gettextCatalog.getString('Buy Bitcoin'), + title: 'Buy Bitcoin', name: 'buyandsell', icon: 'icon-buy-bitcoin2', sref: 'tabs.buyandsell', diff --git a/src/js/services/clipboardService.js b/src/js/services/clipboardService.js index 9b1a61fbe..b9851d626 100644 --- a/src/js/services/clipboardService.js +++ b/src/js/services/clipboardService.js @@ -11,15 +11,10 @@ angular.module('copayApp.services').factory('clipboardService', function ($http, cordova.plugins.clipboard.copy(data); } else if (platformInfo.isNW) { nodeWebkitService.writeToClipboard(data); - } else if (navigator && navigator.clipboard) { - $log.debug("Use navigator clipboard.") - navigator.clipboard.writeText(data).catch(function onClipboardError(err) { - $log.debug("Clipboard writing is not supported in your browser.."); - }); } else if (clipboard.supported) { clipboard.copyText(data); } else { - // Not supported + // No supported return; } }; diff --git a/src/js/services/communityService.js b/src/js/services/communityService.js index 93a4afe5e..24cc99474 100644 --- a/src/js/services/communityService.js +++ b/src/js/services/communityService.js @@ -1,5 +1,5 @@ 'use strict' -angular.module('copayApp.services').factory('communityService', function(configService, gettextCatalog, $log, lodash) { +angular.module('copayApp.services').factory('communityService', function(configService, $log, lodash) { var root = {}; var services = []; @@ -37,14 +37,14 @@ angular.module('copayApp.services').factory('communityService', function(configS var bchRedditItem = { name: 'bchreddit', - title: gettextCatalog.getString('Bitcoin Cash Reddit'), + title: 'Bitcoin Cash Reddit', icon: 'icon-reddit-white', href: 'http://reddit.com/r/btc' }; var bitcoincomTwitterItem = { name: 'bitcoincomTwitter', - title: gettextCatalog.getString('Bitcoin.com Twitter'), + title: 'Bitcoin.com Twitter', icon: 'icon-twitter-white', href: 'https://twitter.com/BTCTN' }; diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 6f2c0ec67..72cc4825f 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -18,7 +18,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer }, bwscash: { - url: 'https://bws.freepages.dk/bws/api' + url: 'https://bwscash.bitcoin.com/bws/api' }, download: { diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index 5189527b2..bba972b81 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -12,7 +12,6 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou normal: gettext('Normal'), economy: gettext('Economy'), superEconomy: gettext('Super Economy'), -// free: gettext('No fee (works only for BCH)'), custom: gettext('Custom') }; @@ -32,7 +31,6 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou root.getFeeRate = function(coin, network, feeLevel, cb) { if (feeLevel == 'custom') return cb(); -// if (feeLevel == 'free') return cb(null, 0); network = network || 'livenet'; @@ -50,8 +48,8 @@ angular.module('copayApp.services').factory('feeService', function($log, $timeou }) }); } - var feeRate = feeLevelRate.feePerKb; + var feeRate = feeLevelRate.feePerKb; if (!fromCache) $log.debug('Dynamic fee: ' + feeLevel + '/' + network + ' ' + (feeLevelRate.feePerKb / 1000).toFixed() + ' SAT/B'); diff --git a/src/js/services/firebaseEventsService.js b/src/js/services/firebaseEventsService.js index d6ce6f1cc..d81e682d7 100644 --- a/src/js/services/firebaseEventsService.js +++ b/src/js/services/firebaseEventsService.js @@ -1,5 +1,5 @@ 'use strict'; -angular.module('copayApp.services').factory('firebaseEventsService', function firebaseEventsService($log, platformInfo) { +angular.module('copayApp.services').factory('firebaseEventsService', function firebaseEventsService($log, $state, $ionicHistory, sjcl, platformInfo, lodash, appConfigService, profileService, configService) { var root = {}; var useEvents = platformInfo.isCordova && !platformInfo.isWP; diff --git a/src/js/services/incoming-data.service.js b/src/js/services/incoming-data.service.js deleted file mode 100644 index eece6d17c..000000000 --- a/src/js/services/incoming-data.service.js +++ /dev/null @@ -1,79 +0,0 @@ -'use strict'; - -/** - * incomingDataService is an intermediate to redirect either to the sendFlow - * or to import/join a wallet. - */ -angular.module('copayApp.services').factory('incomingDataService', function(bitcoinUriService, $log, $state, $rootScope, scannerService, sendFlowService, gettextCatalog) { - - var root = {}; - - root.showMenu = function(data) { - $rootScope.$broadcast('incomingDataMenu.showMenu', data); - }; - - root.redir = function(data, cbError) { - var parsed = bitcoinUriService.parse(data); - - console.log(parsed); - $log.debug(parsed); - - - if (parsed.isValid) { - if (parsed.isTestnet) { - if (cbError) { - var errorMessage = gettextCatalog.getString('Testnet is not supported.'); - cbError(new Error(errorMessage)); - } - } else { - scannerService.pausePreview(); - - /** - * Strategy for the action - */ - if (parsed.copayInvitation) { - $state.go('tabs.home').then(function() { - $state.transitionTo('tabs.add.join', { - url: data - }); - }); - } else if (parsed.import) { - $state.go('tabs.home').then(function() { - $state.transitionTo('tabs.add.import', { - code: data - }); - }); - } else if ( - !parsed.isValid - || parsed.privateKey - || (sendFlowService.state.isEmpty() && !parsed.url && !parsed.amount) - ) { - root.showMenu({ - original: data, - parsed: parsed - }); - } else { - var state = sendFlowService.state.getClone(); - state.data = data; - - sendFlowService.start(state, function onError(err) { - /** - * OnError, open the menu (link not validated) - */ - root.showMenu({ - original: data, - parsed: parsed - }); - }); - } - } - } else { - if (cbError) { - var errorMessage = gettextCatalog.getString('Data not recognised.'); - cbError(new Error(errorMessage)); - } - } - }; - - return root; -}); diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js new file mode 100644 index 000000000..1bb87b49c --- /dev/null +++ b/src/js/services/incomingData.js @@ -0,0 +1,434 @@ +'use strict'; + +angular.module('copayApp.services').factory('incomingData', function($log, $state, $timeout, $ionicHistory, bitcore, bitcoreCash, $rootScope, payproService, scannerService, appConfigService, popupService, gettextCatalog, bitcoinCashJsService) { + + var root = {}; + + root.showMenu = function(data) { + $rootScope.$broadcast('incomingDataMenu.showMenu', data); + }; + + root.redir = function(data, shapeshiftData) { + var originalAddress = null; + var noPrefixInAddress = 0; + + if (data.toLowerCase().indexOf('bitcoin') < 0) { + noPrefixInAddress = 1; + } + + if (typeof(data) == 'string' && !(/^bitcoin(cash)?:\?r=[\w+]/).exec(data) && (data.toLowerCase().indexOf('bitcoincash:') >= 0 || data[0] == 'q' || data[0] == 'p' || data[0] == 'C' || data[0] == 'H')) { + try { + noPrefixInAddress = 0; + + if (data[0] == 'p' || data[0] == 'q') { + data = 'bitcoincash:' + data; + } + var paramString = ''; + if (data.indexOf('?') >= 0) { + paramString = data.substring(data.indexOf('?')); + data = data.substring(0, data.indexOf('?')); + } + + if (data.indexOf('BITCOINCASH:') >= 0) { + data = data.toLowerCase(); + } + originalAddress = data.replace('bitcoincash:', ''); + var legacyAddress = bitcoinCashJsService.readAddress(data).legacy; + data = 'bitcoincash:' + legacyAddress + paramString; + } catch (ex) {} + } + + $log.debug('Processing incoming data: ' + data); + + function sanitizeUri(data) { + // Fixes when a region uses comma to separate decimals + var regex = /[\?\&]amount=(\d+([\,\.]\d+)?)/i; + var match = regex.exec(data); + if (!match || match.length === 0) { + return data; + } + var value = match[0].replace(',', '.'); + var newUri = data.replace(regex, value); + + // mobile devices, uris like copay://glidera + newUri.replace('://', ':'); + + return newUri; + } + + function getParameterByName(name, url) { + if (!url) return; + name = name.replace(/[\[\]]/g, "\\$&"); + var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), + results = regex.exec(url); + if (!results) return null; + if (!results[2]) return ''; + return decodeURIComponent(results[2].replace(/\+/g, " ")); + } + + function checkPrivateKey(privateKey) { + try { + new bitcore.PrivateKey(privateKey, 'livenet'); + } catch (err) { + return false; + } + return true; + } + + function goSend(addr, amount, message, coin, shapeshiftData) { + $state.go('tabs.send', {}, { + 'reload': true, + 'notify': $state.current.name == 'tabs.send' ? false : true + }); + // Timeout is required to enable the "Back" button + $timeout(function() { + if (amount) { + $state.transitionTo('tabs.send.confirm', { + toAmount: amount, + toAddress: addr, + displayAddress: originalAddress ? originalAddress : addr, + description: message, + coin: coin + }); + } else { + var params = { + toAddress: addr, + coin: coin, + displayAddress: originalAddress ? originalAddress : addr, + noPrefix: noPrefixInAddress + }; + if (shapeshiftData) { + params['fromWalletId'] = shapeshiftData.fromWalletId; + params['minShapeshiftAmount'] = shapeshiftData.minAmount; + params['maxShapeshiftAmount'] = shapeshiftData.maxAmount; + params['shapeshiftOrderId'] = shapeshiftData.orderId; + } + $state.transitionTo('tabs.send.amount', params); + } + }, 100); + } + // data extensions for Payment Protocol with non-backwards-compatible request + if ((/^bitcoin(cash)?:\?r=[\w+]/).exec(data)) { + var coin = data.indexOf('bitcoincash') >= 0 ? 'bch' : 'btc'; + data = decodeURIComponent(data.replace(/bitcoin(cash)?:\?r=/, '')); + if (coin == 'bch') { + payproService.getPayProDetailsViaHttp(data, function(err, details) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err) + } else { + handlePayPro(createBchPayProObject(details), coin); + } + }); + } else { + payproService.getPayProDetails(data, coin, function(err, details) { + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), err); + } else { + handlePayPro(details, coin); + } + }); + } + return true; + } + + data = sanitizeUri(data); + + // Bitcoin URL + if (bitcore.URI.isValid(data)) { + var coin = 'btc'; + var parsed = new bitcore.URI(data); + + var addr = parsed.address ? parsed.address.toString() : ''; + var message = parsed.message; + + var amount = parsed.amount ? parsed.amount : ''; + + if (parsed.r) { + payproService.getPayProDetails(parsed.r, coin, function(err, details) { + if (err) { + if (addr && amount) goSend(addr, amount, message, coin, shapeshiftData); + else popupService.showAlert(gettextCatalog.getString('Error'), err); + } else handlePayPro(details, coin); + }); + } else { + goSend(addr, amount, message, coin, shapeshiftData); + } + return true; + // Cash URI + } else if (bitcoreCash.URI.isValid(data)) { + var coin = 'bch'; + var parsed = new bitcoreCash.URI(data); + + var addr = parsed.address ? parsed.address.toString() : ''; + var message = parsed.message; + + var amount = parsed.amount ? parsed.amount : ''; + + // paypro not yet supported on cash + if (parsed.r) { + payproService.getPayProDetails(parsed.r, coin, function(err, details) { + if (err) { + if (addr && amount) + goSend(addr, amount, message, coin, shapeshiftData); + else + popupService.showAlert(gettextCatalog.getString('Error'), err); + } + handlePayPro(details, coin); + }); + } else { + goSend(addr, amount, message, coin, shapeshiftData); + } + return true; + + // Cash URI with bitcoin (btc) address version number? + } else if (bitcore.URI.isValid(data.replace(/^bitcoincash:/,'bitcoin:'))) { + $log.debug('Handling bitcoincash URI with legacy address'); + var coin = 'bch'; + var parsed = new bitcore.URI(data.replace(/^bitcoincash:/,'bitcoin:')); + + var oldAddr = parsed.address ? parsed.address.toString() : ''; + if (!oldAddr) return false; + + var addr = ''; + + var a = bitcore.Address(oldAddr).toObject(); + addr = bitcoreCash.Address.fromObject(a).toString(); + + // Translate address + $log.debug('address transalated to:' + addr); + popupService.showConfirm( + gettextCatalog.getString('Bitcoin cash Payment'), + gettextCatalog.getString('Payment address was translated to new Bitcoin Cash address format: ' + addr), + gettextCatalog.getString('OK'), + gettextCatalog.getString('Cancel'), + function(ret) { + if (!ret) return false; + + var message = parsed.message; + var amount = parsed.amount ? parsed.amount : ''; + + // paypro not yet supported on cash + if (parsed.r) { + payproService.getPayProDetails(parsed.r, coin, function(err, details) { + if (err) { + if (addr && amount) + goSend(addr, amount, message, coin, shapeshiftData); + else + popupService.showAlert(gettextCatalog.getString('Error'), err); + } + handlePayPro(details, coin); + }); + } else { + goSend(addr, amount, message, coin, shapeshiftData); + } + } + ); + return true; + // Plain URL + } else if (/^https?:\/\//.test(data)) { + payproService.getPayProDetails(data, coin, function(err, details) { + if (err) { + if ($state.includes('tabs.scan')) { + root.showMenu({ + data: data, + type: 'url' + }); + } + return; + } + handlePayPro(details); + return true; + }); + // Plain Address + } else if (bitcore.Address.isValid(data, 'livenet') || bitcore.Address.isValid(data, 'testnet')) { + if ($state.includes('tabs.scan')) { + root.showMenu({ + data: data, + type: 'bitcoinAddress' + }); + } else { + goToAmountPage(data); + } + } else if (bitcoreCash.Address.isValid(data, 'livenet')) { + if ($state.includes('tabs.scan')) { + root.showMenu({ + data: data, + type: 'bitcoinAddress', + coin: 'bch', + }); + } else { + goToAmountPage(data, 'bch'); + } + } else if (data && data.indexOf(appConfigService.name + '://glidera') === 0) { + var code = getParameterByName('code', data); + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.go('tabs.home', {}, { + 'reload': true, + 'notify': $state.current.name == 'tabs.home' ? false : true + }).then(function() { + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.transitionTo('tabs.buyandsell.glidera', { + code: code + }); + }); + return true; + + } else if (data && data.indexOf(appConfigService.name + '://coinbase') === 0) { + var code = getParameterByName('code', data); + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.go('tabs.home', {}, { + 'reload': true, + 'notify': $state.current.name == 'tabs.home' ? false : true + }).then(function() { + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.transitionTo('tabs.buyandsell.coinbase', { + code: code + }); + }); + return true; + + // BitPayCard Authentication + } else if (data && data.indexOf(appConfigService.name + '://') === 0) { + + // Disable BitPay Card + if (!appConfigService._enabledExtensions.debitcard) return false; + + var secret = getParameterByName('secret', data); + var email = getParameterByName('email', data); + var otp = getParameterByName('otp', data); + var reason = getParameterByName('r', data); + + $state.go('tabs.home', {}, { + 'reload': true, + 'notify': $state.current.name == 'tabs.home' ? false : true + }).then(function() { + switch (reason) { + default: + case '0': + /* For BitPay card binding */ + $state.transitionTo('tabs.bitpayCardIntro', { + secret: secret, + email: email, + otp: otp + }); + break; + } + }); + return true; + + // Join + } else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { + $state.go('tabs.home', {}, { + 'reload': true, + 'notify': $state.current.name == 'tabs.home' ? false : true + }).then(function() { + $state.transitionTo('tabs.add.join', { + url: data + }); + }); + return true; + + // Old join + } else if (data && data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { + $state.go('tabs.home', {}, { + 'reload': true, + 'notify': $state.current.name == 'tabs.home' ? false : true + }).then(function() { + $state.transitionTo('tabs.add.join', { + url: data + }); + }); + return true; + } else if (data && (data.substring(0, 2) == '6P' || checkPrivateKey(data))) { + root.showMenu({ + data: data, + type: 'privateKey' + }); + } else if (data && ((data.substring(0, 2) == '1|') || (data.substring(0, 2) == '2|') || (data.substring(0, 2) == '3|'))) { + $state.go('tabs.home').then(function() { + $state.transitionTo('tabs.add.import', { + code: data + }); + }); + return true; + + } else { + if ($state.includes('tabs.scan')) { + root.showMenu({ + data: data, + type: 'text' + }); + } + } + return false; + }; + + function goToAmountPage(toAddress, coin) { + $state.go('tabs.send', {}, { + 'reload': true, + 'notify': $state.current.name == 'tabs.send' ? false : true + }); + $timeout(function() { + $state.transitionTo('tabs.send.amount', { + toAddress: toAddress, + coin: coin, + noPrefix: 1 + }); + }, 100); + } + + function createBchPayProObject(payProData) { + var displayAddr = payProData.outputs[0].address; + var toAddr = bitcoinCashJsService.readAddress('bitcoincash:' + displayAddr).legacy; + return { + amount: payProData.outputs[0].amount, + caTrusted: true, + domain: 'bitpay.com', + expires: Math.floor(new Date(payProData.expires).getTime() / 1000), + memo: payProData.memo, + network: 'livenet', + requiredFeeRate: payProData.requiredFeeRate, + selfSigned: 0, + time: Math.ceil(new Date(payProData.time).getTime() / 1000), + displayAddress: displayAddr, + toAddress: toAddr, + url: payProData.paymentUrl, + verified: true + }; + } + + function handlePayPro(payProDetails, coin) { + var stateParams = { + toAmount: payProDetails.amount, + toAddress: payProDetails.toAddress, + description: payProDetails.memo, + paypro: payProDetails, + coin: coin, + }; + + // fee + if (payProDetails.requiredFeeRate) { + stateParams.requiredFeeRate = payProDetails.requiredFeeRate * 1024; + } + + scannerService.pausePreview(); + $state.go('tabs.send', {}, { + 'reload': true, + 'notify': $state.current.name == 'tabs.send' ? false : true + }).then(function() { + $timeout(function() { + $state.transitionTo('tabs.send.confirm', stateParams); + }); + }); + } + + return root; +}); diff --git a/src/js/services/latest-release.service.js b/src/js/services/latest-release.service.js deleted file mode 100644 index 85c50bb03..000000000 --- a/src/js/services/latest-release.service.js +++ /dev/null @@ -1,180 +0,0 @@ -'use strict'; - -(function() { - - angular - .module('bitcoincom.services') - .factory('latestReleaseService', latestReleaseService); - - function latestReleaseService($log, $http, $ionicPopup, configService, externalLinkService, gettextCatalog, platformInfo) { - - var service = { - // Functions - checkLatestRelease: checkLatestRelease, - requestLatestRelease: requestLatestRelease, - showUpdatePopup: showUpdatePopup - }; - - return service; - - function checkLatestRelease(cb) { - var releaseURL = configService.getDefaults().release.url; - - requestLatestRelease(releaseURL, function (err, releaseData) { - if (err) return cb(err); - var currentVersion = window.version; - var latestVersion = releaseData.tag_name; - - if (!verifyTagFormat(currentVersion)) - return cb('Cannot verify the format of version tag: ' + currentVersion); - if (!verifyTagFormat(latestVersion)) - return cb('Cannot verify the format of latest release tag: ' + latestVersion); - - var current = formatTagNumber(currentVersion); - var latest = formatTagNumber(latestVersion); - - if (latest.major < current.major || (latest.major === current.major && latest.minor <= current.minor)) { - return cb(null, false); - } - - var releaseSearchTerm = ""; - if (platformInfo.isNW) { // XX SP: DESKTOP: Check if the latest release is already available for current OS - var platform = process.platform; - if (platform === "darwin") { - releaseSearchTerm = "osx"; - } else if (platform === "win32") { - releaseSearchTerm = "win"; - } else if (platform === "linux") { - releaseSearchTerm = "linux"; - } - var foundNewVersion = false; - for (var i in releaseData.assets) { - if (releaseData.assets[i].name.indexOf(releaseSearchTerm) !== -1) { - foundNewVersion = true; - break; - } - } - } - - $log.debug('A new version is available: ' + latestVersion); - - var releaseNotes = false; - if (releaseData.body) { - var releaseLines = releaseData.body.split('\n'); - for (var lineNum in releaseLines) { - if (releaseLines[lineNum].substring(0, 2) === "# ") { - releaseLines[lineNum] = "" + releaseLines[lineNum].substring(2) + ""; - } else if (releaseLines[lineNum].substring(0, 2) === "- ") { - releaseLines[lineNum] = "• " + releaseLines[lineNum].substring(2); - } - } - releaseNotes = releaseLines.join('\n'); - } - - return cb(null, {latestVersion: latestVersion, releaseNotes: releaseNotes}); - }); - - function verifyTagFormat(tag) { - var regex = /^v?\d+\.\d+(\.\d+)?(-rc\d)?$/i; - return regex.exec(tag); - } - - function formatTagNumber(tag) { - var label = false; - if (tag.split("-")[1]) { // Move postfixes like "-rc2" to a variable - label = tag.split("-")[1]; - tag = tag.split("-")[0]; - } - - var formattedNumber = tag.replace(/^v/i, '').split('.'); - return { - major: +(formattedNumber[0] ? +formattedNumber[0] : 0), - minor: +(formattedNumber[1] ? +formattedNumber[1] : 0), - patch: +(formattedNumber[2] ? +formattedNumber[2] : 0), - label: label /* XX SP: Maybe we can use this in a later stage (with for example 1.0.0-rc2 the value will be "rc2" and false if there is no label) */ - }; - } - } - - function requestLatestRelease(releaseURL, cb) { - $log.debug('Retrieving latest release information...'); - - var request = { - url: releaseURL, - method: 'GET', - json: true - }; - - $http(request).then(function (release) { - $log.debug('Latest release: ' + release.data.name); - return cb(null, release.data); - }, function (err) { - return cb('Cannot get the release information: ' + err); - }); - } - - function showUpdatePopup() { - var buttons = []; - - if (!platformInfo.isIOS) { // There is no GitHub-release for iPhone - buttons.push({ - text: "GitHub", - type: 'button-positive', - onTap: function () { - var url = 'https://github.com/Bitcoin-com/Wallet/releases/latest'; - externalLinkService.open(url, false); - } - }); - } - if (platformInfo.isAndroid) { - buttons.unshift({ - text: "Google Play Store", - type: 'button-positive', - onTap: function () { - var url = 'https://play.google.com/store/apps/details?id=com.bitcoin.mwallet'; - externalLinkService.open(url, false); - } - }); - } - if (platformInfo.isIOS) { - buttons.unshift({ - text: "App Store", - type: 'button-positive', - onTap: function () { - var url = 'https://itunes.apple.com/app/id1252903728'; - externalLinkService.open(url, false); - } - }); - } else if (platformInfo.isNW) { - if (process.platform === 'darwin') { - buttons.unshift({ - text: "Mac App Store", - type: 'button-positive', - onTap: function () { - var url = 'https://itunes.apple.com/app/bitcoin-com-wallet/id1383072453'; - externalLinkService.open(url, false); - } - }); - } - } - - if (buttons.length === 1) { // There is only one source to download (probably on desktop, so open GitHub release page..) - buttons[0].onTap(); - } else { - buttons.push({ - text: gettextCatalog.getString('Go Back'), - type: 'button-positive', - onTap: function () { - return true; - } - }); - $ionicPopup.show({ - title: gettextCatalog.getString('Update Available'), - subTitle: gettextCatalog.getString('An update to this app is available. For your security, please update to the latest version.'), - cssClass: 'popup-update', - buttons: buttons - }); - } - } - } -})(); \ No newline at end of file diff --git a/src/js/services/latestReleaseService.js b/src/js/services/latestReleaseService.js new file mode 100644 index 000000000..87aace87f --- /dev/null +++ b/src/js/services/latestReleaseService.js @@ -0,0 +1,63 @@ +'use strict'; +angular.module('copayApp.services') + .factory('latestReleaseService', function latestReleaseServiceFactory($log, $http, configService) { + + var root = {}; + + root.checkLatestRelease = function(cb) { + var releaseURL = configService.getDefaults().release.url; + + requestLatestRelease(releaseURL, function(err, release) { + if (err) return cb(err); + var currentVersion = window.version; + var latestVersion = release.data.tag_name; + + if (!verifyTagFormat(currentVersion)) + return cb('Cannot verify the format of version tag: ' + currentVersion); + if (!verifyTagFormat(latestVersion)) + return cb('Cannot verify the format of latest release tag: ' + latestVersion); + + var current = formatTagNumber(currentVersion); + var latest = formatTagNumber(latestVersion); + + if (latest.major < current.major || (latest.major == current.major && latest.minor <= current.minor)) + return cb(null, false); + + $log.debug('A new version is available: ' + latestVersion); + return cb(null, true); + }); + + function verifyTagFormat(tag) { + var regex = /^v?\d+\.\d+\.\d+$/i; + return regex.exec(tag); + }; + + function formatTagNumber(tag) { + var formattedNumber = tag.replace(/^v/i, '').split('.'); + return { + major: +formattedNumber[0], + minor: +formattedNumber[1], + patch: +formattedNumber[2] + }; + }; + }; + + function requestLatestRelease(releaseURL, cb) { + $log.debug('Retrieving latest relsease information...'); + + var request = { + url: releaseURL, + method: 'GET', + json: true + }; + + $http(request).then(function(release) { + $log.debug('Latest release: ' + release.data.name); + return cb(null, release); + }, function(err) { + return cb('Cannot get the release information: ' + err); + }); + }; + + return root; + }); diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index 422be070f..147985dbb 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -52,7 +52,11 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti root.clear = function() { ongoingProcess = {}; - $ionicLoading.hide(); + if (isCordova && !isWindowsPhoneApp) { + window.plugins.spinnerDialog.hide(); + } else { + $ionicLoading.hide(); + } }; root.get = function(processName) { @@ -74,21 +78,28 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti root.onGoingProcessName = name; var showName = $filter('translate')(processNames[name] || name); - - if (root.onGoingProcessName) { - var tmpl; - if (isWindowsPhoneApp) tmpl = '
' + showName + '
'; - else tmpl = '
' + showName + '
'; - $ionicLoading.show({ - template: tmpl, - }); - } else { - $ionicLoading.hide(); - } if (customHandler) { customHandler(processName, showName, isOn); - } + } else if (root.onGoingProcessName) { + if (isCordova && !isWindowsPhoneApp) { + window.plugins.spinnerDialog.show(null, showName, root.clear); + } else { + + var tmpl; + if (isWindowsPhoneApp) tmpl = '
' + showName + '
'; + else tmpl = '
' + showName + '
'; + $ionicLoading.show({ + template: tmpl + }); + } + } else { + if (isCordova && !isWindowsPhoneApp) { + window.plugins.spinnerDialog.hide(); + } else { + $ionicLoading.hide(); + } + } }; return root; diff --git a/src/js/services/openURL.js b/src/js/services/openURL.js index 2cf8d95a5..0f4d6c666 100644 --- a/src/js/services/openURL.js +++ b/src/js/services/openURL.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('openURLService', function($rootScope, $ionicHistory, $document, $log, $state, platformInfo, lodash, profileService, incomingDataService, appConfigService) { +angular.module('copayApp.services').factory('openURLService', function($rootScope, $ionicHistory, $document, $log, $state, platformInfo, lodash, profileService, incomingData, appConfigService) { var root = {}; var handleOpenURL = function(args) { @@ -23,12 +23,9 @@ angular.module('copayApp.services').factory('openURLService', function($rootScop document.addEventListener('handleopenurl', handleOpenURL, false); - incomingDataService.redir(url, function onError(err) { - if (err) { - $log.warn('Unknown URL! : ' + url); - popupService.showAlert(gettextCatalog.getString('Error'), err.message); - } - }); + if (!incomingData.redir(url)) { + $log.warn('Unknown URL! : ' + url); + } }; var handleResume = function() { diff --git a/src/js/services/paypro.service.js b/src/js/services/paypro.service.js deleted file mode 100644 index 8f8db5f5b..000000000 --- a/src/js/services/paypro.service.js +++ /dev/null @@ -1,78 +0,0 @@ -'use strict'; - -// For BIP70 Payment Protocol - -angular - .module('copayApp.services') - .factory('payproService', payproService); - -function payproService(gettextCatalog, $http, $log, ongoingProcess, platformInfo, profileService) { - - var service = { - getPayProDetails: getPayProDetails, - getPayProDetailsViaHttp: getPayProDetailsViaHttp, - broadcastBchTx: broadcastBchTx - }; - - return service; - - function getPayProDetails(uri, coin, cb, disableLoader) { - if (!cb) cb = function() {}; - - var wallet = profileService.getWallets({ - onlyComplete: true, - coin: coin - })[0]; - - if (!wallet) return cb(); - - if (platformInfo.isChromeApp) { - return cb(gettextCatalog.getString('Payment Protocol not supported on Chrome App')); - } - - $log.debug('Fetch PayPro Request...', uri); - - if (!disableLoader) ongoingProcess.set('fetchingPayPro', true); - - wallet.fetchPayPro({ - payProUrl: uri, - }, function(err, paypro) { - if (!disableLoader) ongoingProcess.set('fetchingPayPro', false); - if (err) return cb(gettextCatalog.getString('Could Not Fetch Payment: Check if it is still valid')); - else if (!paypro.verified) { - $log.warn('Failed to verify payment protocol signatures'); - return cb(gettextCatalog.getString('Payment Protocol Invalid')); - } - return cb(null, paypro); - }); - } - - function getPayProDetailsViaHttp(uri, cb) { - var config = { - headers: {'Accept': 'application/payment-request'} - }; - $http.get(uri, config).then(function onGetPayProDetailsSuccess(response) { - return cb(null, response.data); - }, function onGetPayProDetailsError(error) { - return cb(error, null); - }); - } - - function broadcastBchTx(signedTxp, cb) { - var config = { - headers: {'Content-Type': 'application/payment'} - }; - - var data = { - currency: 'BCH', - transactions: [signedTxp.raw] - }; - - $http.post(signedTxp.payProUrl, data, config).then(function(response) { - signedTxp.response = response.data; - return cb(null, signedTxp); - }, function(error) { - return cb(error.data, null); - }); - } -} diff --git a/src/js/services/payproService.js b/src/js/services/payproService.js new file mode 100644 index 000000000..f0814cc0f --- /dev/null +++ b/src/js/services/payproService.js @@ -0,0 +1,69 @@ +'use strict'; + +angular.module('copayApp.services').factory('payproService', + function(profileService, platformInfo, gettextCatalog, ongoingProcess, $log, $http) { + + var ret = {}; + + ret.getPayProDetails = function(uri, coin, cb, disableLoader) { + if (!cb) cb = function() {}; + + var wallet = profileService.getWallets({ + onlyComplete: true, + coin: coin + })[0]; + + if (!wallet) return cb(); + + if (platformInfo.isChromeApp) { + return cb(gettextCatalog.getString('Payment Protocol not supported on Chrome App')); + } + + $log.debug('Fetch PayPro Request...', uri); + + if (!disableLoader) ongoingProcess.set('fetchingPayPro', true); + + wallet.fetchPayPro({ + payProUrl: uri, + }, function(err, paypro) { + if (!disableLoader) ongoingProcess.set('fetchingPayPro', false); + if (err) return cb(gettextCatalog.getString('Could Not Fetch Payment: Check if it is still valid')); + else if (!paypro.verified) { + $log.warn('Failed to verify payment protocol signatures'); + return cb(gettextCatalog.getString('Payment Protocol Invalid')); + } + return cb(null, paypro); + }); + }; + + ret.getPayProDetailsViaHttp = function(uri, cb) { + var config = { + headers: {'Accept': 'application/payment-request'} + }; + $http.get(uri, config).then(function(response) { + return cb(null, response.data); + }, function(error) { + return cb(error, null); + }); + } + + ret.broadcastBchTx = function(signedTxp, cb) { + var config = { + headers: {'Content-Type': 'application/payment'} + }; + + var data = { + currency: 'BCH', + transactions: [signedTxp.raw] + }; + + $http.post(signedTxp.payProUrl, data, config).then(function(response) { + signedTxp.response = response.data; + return cb(null, signedTxp); + }, function(error) { + return cb(error.data, null); + }); + } + + return ret; + }); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 113289104..4f8710c28 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -427,9 +427,9 @@ angular.module('copayApp.services') }, function(err, secret) { if (err) return bwcError.cb(err, gettextCatalog.getString('Error creating wallet'), cb); - var channel = "ga"; - if (platformInfo.isCordova) { - channel = "firebase"; + var channel = "firebase"; + if (platformInfo.isNW) { + channel = "ga"; } var log = new window.BitAnalytics.LogEvent("wallet_created", [{ "coin": opts.coin @@ -847,13 +847,6 @@ angular.module('copayApp.services') }); } - if (opts.hasNoFunds) { - ret = lodash.filter(ret, function(w) { - if (!w.status) return; - return (w.status.availableBalanceSat === 0); - }); - } - if (opts.minAmount) { ret = lodash.filter(ret, function(w) { if (!w.status) return; diff --git a/src/js/services/secureStorageService.spec.js b/src/js/services/secureStorageService.spec.js index 8d2842a6a..abfa5d947 100644 --- a/src/js/services/secureStorageService.spec.js +++ b/src/js/services/secureStorageService.spec.js @@ -1,4 +1,4 @@ -xdescribe('secureStorageService in browser', function(){ +describe('secureStorageService in browser', function(){ var localStorage, sss; @@ -100,7 +100,7 @@ xdescribe('secureStorageService in browser', function(){ }); -xdescribe('secureStorageService on desktop', function(){ +describe('secureStorageService on desktop', function(){ var desktopSss, sss; @@ -202,7 +202,7 @@ xdescribe('secureStorageService on desktop', function(){ }); -xdescribe('secureStorageService on mobile', function(){ +describe('secureStorageService on mobile', function(){ var mobileSss, sss; diff --git a/src/js/services/send-flow-router.service.js b/src/js/services/send-flow-router.service.js deleted file mode 100644 index 32aa8420b..000000000 --- a/src/js/services/send-flow-router.service.js +++ /dev/null @@ -1,85 +0,0 @@ -'use strict'; - -(function(){ - -angular - .module('bitcoincom.services') - .factory('sendFlowRouterService', sendFlowRouterService); - - function sendFlowRouterService( - sendFlowStateService - , $state, $ionicHistory, $timeout - ) { - - var service = { - // Functions - start: start, - goNext: goNext, - goBack: goBack, - }; - - return service; - - /** - * Start new send flow - */ - function start() { - var state = sendFlowStateService.state; - - if (state.isRequestAmount) { - $state.go('tabs.paymentRequest.amount'); - } else { - if ($state.current.name != 'tabs.send') { - $state.go('tabs.home').then(function () { - $ionicHistory.clearHistory(); - $state.go('tabs.send').then(function () { - $timeout(function () { - goNext(); - }, 60); - }); - }); - } else { - goNext(); - } - } - } - - /** - * Go to the next page - * Routing strategy : https://bitcoindotcom.atlassian.net/wiki/x/BQDWKQ - */ - function goNext() { - var state = sendFlowStateService.state; - - var needsDestination = !state.toWalletId && !state.toAddress; - var needsOrigin = !state.fromWalletId; - var needsAmount = !state.amount && !state.sendMax; - - if (needsDestination) { - if (!state.isWalletTransfer && !state.thirdParty) { - $state.go('tabs.send'); - return; - } else if (!needsOrigin) { - $state.go('tabs.send.destination'); - return; - } - } - - if (needsOrigin) { - $state.go('tabs.send.origin'); - } else if (needsAmount) { - $state.go('tabs.send.amount'); - } else { - $state.go('tabs.send.review'); - } - } - - /** - * Go to the previous page - */ - function goBack() { - $ionicHistory.goBack(); - } - }; - -})(); \ No newline at end of file diff --git a/src/js/services/send-flow-state.service.js b/src/js/services/send-flow-state.service.js deleted file mode 100644 index 960e6f306..000000000 --- a/src/js/services/send-flow-state.service.js +++ /dev/null @@ -1,142 +0,0 @@ -'use strict'; - -(function(){ - -angular - .module('bitcoincom.services') - .factory('sendFlowStateService', sendFlowStateService); - - function sendFlowStateService($log) { - - var service = { - // Variables - state: { - amount: 0, - displayAddress: null, - fromWalletId: '', - sendMax: false, - thirdParty: null, - toAddress: '', - toWalletId: '', - coin: '', - isRequestAmount: false, - isWalletTransfer: false - }, - previousStates: [], - - // Functions - init: init, - clear: clear, - getClone: getClone, - map: map, - pop: pop, - push: push, - isEmpty: isEmpty - }; - - return service; - - /** - * Init state & stack - * @param {Object} params - */ - function init(params) { - $log.debug("send-flow-state init()"); - - clear(); - - if (params) { - push(params); - } - } - - /** - * Clear a state & stack - */ - function clear() { - $log.debug("send-flow-state clear()"); - - clearCurrent(); - service.previousStates = []; - } - - /** - * Clear current state only - */ - function clearCurrent() { - $log.debug("send-flow-state clearCurrent()"); - - service.state = { - amount: 0, - displayAddress: null, - fromWalletId: '', - sendMax: false, - thirdParty: null, - toAddress: '', - toWalletId: '', - coin: '', - isRequestAmount: false, - isWalletTransfer: false - } - } - - /** - * Get a clone of the current state - */ - function getClone() { - var currentState = {}; - Object.keys(service.state).forEach(function forCurrentParam(key) { - if (typeof service.state[key] !== 'function' && key !== 'previousStates') { - currentState[key] = service.state[key]; - } - }); - return currentState; - } - - /** - * Fill in the current state from the params - * @param {Object} params - */ - function map(params) { - Object.keys(params).forEach(function forNewParam(key) { - service.state[key] = params[key]; - }); - } - - /** - * Pop state - */ - function pop() { - $log.debug('send-flow-state pop'); - - if (service.previousStates.length) { - var params = service.previousStates.pop(); - clearCurrent(); - map(params); - } else { - clear(); - } - } - - /** - * Push state - * @param {Object} params - */ - function push(params) { - $log.debug('send-flow-state push'); - - var currentParams = getClone(); - service.previousStates.push(currentParams); - clearCurrent(); - map(params); - } - - /** - * Is empty stack - */ - function isEmpty() { - return service.previousStates.length == 0; - } - }; - -})(); \ No newline at end of file diff --git a/src/js/services/send-flow.service.js b/src/js/services/send-flow.service.js deleted file mode 100644 index e8be2e487..000000000 --- a/src/js/services/send-flow.service.js +++ /dev/null @@ -1,148 +0,0 @@ -'use strict'; - -(function(){ - -angular - .module('bitcoincom.services') - .factory('sendFlowService', sendFlowService); - - function sendFlowService( - sendFlowStateService, sendFlowRouterService - , bitcoinUriService, payproService, bitcoinCashJsService - , popupService, gettextCatalog - , $state, $log - ) { - - var service = { - // Variables - state: sendFlowStateService, - router: sendFlowRouterService, - - // Functions - start: start, - goNext: goNext, - goBack: goBack - }; - - return service; - - /** - * Start a new send flow - * @param {Object} params - * @param {Function} onError - */ - function start(params, onError) { - $log.debug('send-flow start()'); - - if (params && params.data) { - var res = bitcoinUriService.parse(params.data); - - if (res.isValid) { - - // If BIP70 (url) - if (res.url) { - var url = res.url; - var coin = res.coin || ''; - payproService.getPayProDetails(url, coin, function onGetPayProDetails(err, payProData) { - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), err); - } else { - var name = payProData.domain; - - // Detect some merchant that we know - if (payProData.memo.indexOf('eGifter') > -1) { - name = 'eGifter' - } else if (paymentUrl.indexOf('https://bitpay.com') > -1) { - name = 'BitPay'; - } - - // Init thirdParty - var thirdPartyData = { - id: 'bip70', - caTrusted: true, - name: name, - domain: payProData.domain, - expires: payProData.expires, - memo: payProData.memo, - network: 'livenet', - requiredFeeRate: payProData.requiredFeeRate, - selfSigned: 0, - time: payProData.time, - url: payProData.url, - verified: true - }; - - // Fill in params - params.amount = payProData.amount, - params.toAddress = payProData.toAddress, - params.coin = coin, - params.thirdParty = thirdPartyData - } - - // Resolve - _next(); - }); - } else { - if (res.coin) { - params.coin = res.coin; - } - - if (res.amountInSatoshis) { - params.amount = res.amountInSatoshis; - } - - if (res.publicAddress) { - var prefix = res.isTestnet ? 'bchtest:' : 'bitcoincash:'; - params.displayAddress = res.publicAddress.cashAddr || res.publicAddress.legacy || res.publicAddress.bitpay; - var formatAddress = res.publicAddress.cashAddr ? prefix + params.displayAddress : params.displayAddress; - params.toAddress = bitcoinCashJsService.readAddress(formatAddress).legacy; - } - - _next(); - } - } else { - if (onError) { - onError(); - } - } - } else { - _next(); - } - - - // Next used for sync the async task - function _next() { - sendFlowStateService.init(params); - - // Routing strategy to -> send-flow-router.service - sendFlowRouterService.start(); - } - } - - /** - * Go to the next step - * @param {Object} state - */ - function goNext(state) { - $log.debug('send-flow goNext()'); - - // Save the current route before leaving - state.route = $state.current.name; - - // Save the state and redirect the user - sendFlowStateService.push(state); - sendFlowRouterService.goNext(); - } - - /** - * Go to the previous step - */ - function goBack() { - $log.debug('send-flow goBack()'); - - // Remove the state on top and redirect the user - sendFlowStateService.pop(); - sendFlowRouterService.goBack(); - } - } -})(); \ No newline at end of file diff --git a/src/js/services/servicesService.js b/src/js/services/servicesService.js index ddd9db394..f2344dd01 100644 --- a/src/js/services/servicesService.js +++ b/src/js/services/servicesService.js @@ -1,12 +1,7 @@ 'use strict' angular.module('copayApp.services').factory('servicesService', function(configService, $log, lodash) { var root = {}; - var services = [{ - name: 'shapeshift', - title: 'Shapeshift', - icon: 'icon-shapeshift', - href: 'https://shapeshift.io/' - }]; + var services = []; root.register = function(serviceInfo) { $log.info('Adding Services entry:' + serviceInfo.name); diff --git a/src/js/services/shapeShiftApiService.js b/src/js/services/shapeShiftApiService.js index cc5fb0792..210ae0fbd 100644 --- a/src/js/services/shapeShiftApiService.js +++ b/src/js/services/shapeShiftApiService.js @@ -328,23 +328,18 @@ angular.module('copayApp.services').factory('shapeshiftApiService', function($q) $scope.amount, $scope.withdrawalAddress, $scope.coinIn, $scope.coinOut ); - console.log('shapeshiftApiService.FixedAmountTx()'); console.log(fixedTx); SSA.FixedAmountTx(fixedTx, function (data) { - console.log(data); - promise.resolve(data); + console.log(data) + return promise.resolve({ fixedTxData : data.success }); }); return promise.promise; }, NormalTx : function($scope){ var promise = $q.defer(); var normalTx = SSA.CreateNormalTx($scope.withdrawalAddress, $scope.coinIn, $scope.coinOut); - - console.log('shapeshiftApiService.NormalTx()'); - console.log(normalTx); SSA.NormalTx(normalTx, function (data) { - console.log(data); - promise.resolve(data); + promise.resolve({ normalTxData : data }); }); return promise.promise; }, @@ -365,12 +360,11 @@ angular.module('copayApp.services').factory('shapeshiftApiService', function($q) return promise.promise; }, ValidateAddress : function(address, coin) { - var promise = $q.defer(); - SSA.ValidateAdddress(address, coin, function onRequest(data){ - console.log(data); - promise.resolve(data); - }); - return promise.promise; + var promise = $q.defer(); + SSA.ValidateAdddress(address, coin, function(data){ + promise.resolve(data); + }); + return promise.promise; } }; }); diff --git a/src/js/services/shapeshift.service.js b/src/js/services/shapeshift.service.js deleted file mode 100644 index 73410e478..000000000 --- a/src/js/services/shapeshift.service.js +++ /dev/null @@ -1,112 +0,0 @@ -'use strict'; - -(function(){ - -angular - .module('bitcoincom.services') - .factory('shapeshiftService', shapeshiftService); - - function shapeshiftService(shapeshiftApiService, gettextCatalog) { - - var service = { - // Variables - coinIn: '', - coinOut: '', - withdrawalAddress: '', - returnAddress: '', - amount: '', - marketData: {}, - coins: { - 'BTC': {name: 'Bitcoin', symbol: 'BTC'}, - 'BCH': {name: 'Bitcoin Cash', symbol: 'BCH'} - }, - - // Functions - getMarketData: getMarketData, - shiftIt: shiftIt - }; - - return service; - - function handleError(response, defaultMessage, cb) { - if (response && typeof response.error === "string") { - cb(new Error(response.error)); - } else if (response && response.error && response.error.message) { - cb(new Error(response.error.message)); - } else { - cb(new Error(defaultMessage)); - } - } - - function getMarketData(coinIn, coinOut, cb) { - service.coinIn = coinIn; - service.coinOut = coinOut; - shapeshiftApiService - .marketInfo(service.coinIn, service.coinOut) - .then(function (response) { - if (!response || response.error) { - handleError(response, 'Invalid response from Shapeshift', cb); - } else { - service.marketData = response; - service.rateString = service.marketData.rate.toString() + ' ' + coinOut.toUpperCase() + '/' + coinIn.toUpperCase(); - cb(null, response); - } - }); - } - - function shiftIt(coinIn, coinOut, withdrawalAddress, returnAddress, amount, cb) { - // Test if the amount is correct depending on the min and max - if (!amount || typeof amount !== 'number') { - cb(new Error(gettextCatalog.getString('Amount is not defined'))); - } else if (amount < service.marketData.minimum) { - cb(new Error(gettextCatalog.getString('Amount is below the minimun'))); - } else if (amount > service.marketData.maxLimit) { - cb(new Error(gettextCatalog.getString('Amount is above the limit'))); - } else { - // Init service data - service.withdrawalAddress = withdrawalAddress; - service.returnAddress = returnAddress; - service.coinIn = coinIn; - service.coinOut = coinOut; - service.amount = amount; - - // Check the address - shapeshiftApiService - .ValidateAddress(withdrawalAddress, coinOut) - .then(function onSuccess(response) { - if (response && response.isvalid) { - // Prepare the transaction shapeshift side - shapeshiftApiService.NormalTx(service).then(function onResponse(response) { - // If error, return it - if (!response || response.error) { - handleError(response, gettextCatalog.getString('Invalid response from Shapeshift'), cb); - } else { - var txData = response; - - // If the content is not that it was expected, get back an error - if (!txData || !txData.orderId || !txData.deposit) { - cb(new Error(gettextCatalog.getString('Invalid response from Shapeshift'))); - } else { - // Get back the data - service.depositInfo = txData; - var shapeshiftData = { - coinIn: coinIn, - coinOut: coinOut, - toWalletId: service.toWalletId, - minAmount: service.marketData.minimum, - maxAmount: service.marketData.maxLimit, - orderId: txData.orderId, - toAddress: txData.deposit - }; - cb(null, shapeshiftData); - } - } - }); - } else { - cb(new Error(gettextCatalog.getString('Invalid address'))); - } - }); - } - } - } -})(); \ No newline at end of file diff --git a/src/js/services/shapeshiftService.js b/src/js/services/shapeshiftService.js new file mode 100644 index 000000000..8a9b8fcaa --- /dev/null +++ b/src/js/services/shapeshiftService.js @@ -0,0 +1,19 @@ +'use strict'; +angular.module('copayApp.services').factory('shapeshiftService', function($http, $log, lodash, moment, storageService, configService, platformInfo, servicesService) { + var root = {}; + var credentials = {}; + + var servicesItem = { + name: 'shapeshift', + title: 'Shapeshift', + icon: 'icon-shapeshift', + sref: 'tabs.shapeshift', + }; + + var register = function() { + servicesService.register(servicesItem); + }; + + register(); + return root; +}); diff --git a/src/js/services/storageService.spec.js b/src/js/services/storageService.spec.js index cc3ad285d..493678b97 100644 --- a/src/js/services/storageService.spec.js +++ b/src/js/services/storageService.spec.js @@ -414,7 +414,7 @@ xdescribe('storageService on desktop', function(){ }); -xdescribe('storageService on desktop using local storage', function(){ +describe('storageService on desktop using local storage', function(){ var appConfig, localStorageServiceMock, log, @@ -614,7 +614,7 @@ xdescribe('storageService on desktop using local storage', function(){ }); -xdescribe('storageService on mobile', function(){ +describe('storageService on mobile', function(){ var appConfig, expectedOldProfileSavedToSecure, expectedOldProfileMergedWithSecure, diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js index 1932ebd2a..ebcb3886a 100644 --- a/src/js/services/txFormatService.js +++ b/src/js/services/txFormatService.js @@ -201,7 +201,7 @@ angular.module('copayApp.services').factory('txFormatService', function($filter, var alternativeIsoCode = config.alternativeIsoCode; // If fiat currency - if (currency && currency.toUpperCase() != 'BCH' && currency.toUpperCase() != 'BTC' && currency != 'sat') { + if (currency != 'BCH' && currency != 'BTC' && currency != 'sat') { amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency; amountSat = rateService.fromFiat(amount, currency, coin).toFixed(0); } else if (currency == 'sat') { diff --git a/src/js/services/uxLanguage.js b/src/js/services/uxLanguage.js index b8e7c3b09..1fa446f01 100644 --- a/src/js/services/uxLanguage.js +++ b/src/js/services/uxLanguage.js @@ -10,7 +10,7 @@ angular.module('copayApp.services') isoCode: 'en', rateCode: 'USD' }, { - name: 'Català', + name: 'català', isoCode: 'ca', rateCode: 'EUR' },{ @@ -59,6 +59,10 @@ angular.module('copayApp.services') name: 'Português', isoCode: 'pt', rateCode: 'EUR' + }, { + name: 'русский язык', + isoCode: 'ru', + rateCode: 'RUB' }, { name: '한국어', isoCode: 'ko', diff --git a/src/js/services/wallet-history.service.js b/src/js/services/wallet-history.service.js deleted file mode 100644 index 512a2d8b1..000000000 --- a/src/js/services/wallet-history.service.js +++ /dev/null @@ -1,275 +0,0 @@ -'use strict'; - -(function(){ - - angular - .module('bitcoincom.services') - .factory('walletHistoryService', walletHistoryService); - - function walletHistoryService(configService, storageService, lodash, $log, txFormatService) { - //var PAGE_SIZE = 50; - var PAGE_SIZE = 20; // For dev only - // How much to overlap on each end of the page, for mitigating inconsistent sort order. - var PAGE_OVERLAP_FRACTION = 0.2; - var PAGE_OVERLAP = Math.floor(PAGE_SIZE * PAGE_OVERLAP_FRACTION); - // The fraction of transactions in the new overlapping resultset that we already know about. - // If we know about at least this many, then there are probably no gaps. - var MIN_KNOWN_TX_OVERLAP_FRACTION = 0.5; - - var SAFE_CONFIRMATIONS = 6; - - var allTransactionsFetched = false; - var service = { - getCachedTxHistory: getCachedTxHistory, - updateLocalTxHistoryByPage: updateLocalTxHistoryByPage, - }; - return service; - - function addEarlyTransactions(walletId, cachedTxs, newTxs) { - - var cachedTxIndexFromId = {}; - cachedTxs.forEach(function forCachedTx(tx){ - cachedTxIndexFromId[tx.txid] = true; - }); - - var confirmationsUpdated = false; - var someTransactionsWereNew = false; - var overlappingTxsCount = 0; - - newTxs.forEach(function forNewTx(tx){ - if (typeof cachedTxIndexFromId[tx.txid] === "undefined") { - someTransactionsWereNew = true; - cachedTxs.push(tx); - } else { - var txUpdated = updateCachedTx(cachedTxs, cachedTxIndexFromId, tx); - confirmationsUpdated = confirmationsUpdated || txUpdated; - overlappingTxsCount++; - } - }); - - var overlappingTxFraction = overlappingTxsCount / Math.min(cachedTxs.length, PAGE_OVERLAP); - console.log('overlappingTxFraction:', overlappingTxFraction); - - if (overlappingTxFraction >= MIN_KNOWN_TX_OVERLAP_FRACTION) { // We are good - if (someTransactionsWereNew) { - saveTxHistory(walletId, cachedTxs); - } else if (confirmationsUpdated) { - saveTxHistory(walletId, cachedTxs); - } else if (overlappingTxsCount === newTxs.length) { - allTransactionsFetched = true; - } - return cachedTxs; - } else { - // We might be missing some txs. - console.error('We might be missing some txs in the history.'); - // Our history is wrong, so remove it - we could instead, try to fetch data that was not so early. - storageService.removeTxHistory(walletId, function onRemoveTxHistory(){}); - return []; - } - - } - - function addLatestTransactions(walletId, cachedTxs, newTxs) { - var cachedTxIndexFromId = {}; - cachedTxs.forEach(function forCachedTx(tx, txIndex){ - cachedTxIndexFromId[tx.txid] = txIndex; - }); - - var someTransactionsWereNew = false; - var confirmationsUpdated = false; - var overlappingTxsCount = 0; - var uniqueNewTxs = []; - - newTxs.forEach(function forNewTx(tx){ - if (typeof cachedTxIndexFromId[tx.txid] === "undefined") { - someTransactionsWereNew = true; - uniqueNewTxs.push(tx); - } else { - var txUpdated = updateCachedTx(cachedTxs, cachedTxIndexFromId, tx); - confirmationsUpdated = confirmationsUpdated || txUpdated; - overlappingTxsCount++; - } - }); - - var overlappingTxFraction = overlappingTxsCount / Math.min(cachedTxs.length, PAGE_OVERLAP); - - if (overlappingTxFraction >= MIN_KNOWN_TX_OVERLAP_FRACTION) { // We are good - if (someTransactionsWereNew) { - var allTxs = uniqueNewTxs.concat(cachedTxs); - saveTxHistory(walletId, allTxs); - return allTxs; - } else { - if (confirmationsUpdated) { - saveTxHistory(walletId, cachedTxs); - } - return cachedTxs; - } - } else { - // We might be missing some txs. - // Our history is wrong, so just include the latest ones - saveTxHistory(walletId, newTxs); - return newTxs; - } - - } - - // Only clear the cache once we have received new transactions from the server. - /** - * @param wallet - * @param start - * @param {function(err, txs)} cb - transactions is always an array, may be empty - */ - function fetchTxHistoryByPage(wallet, start, cb) { - var skip = Math.max(0, start - PAGE_OVERLAP); - var limit = PAGE_SIZE; - - var opts = { - skip: skip, - limit: limit - }; - wallet.getTxHistory(opts, function onTxHistory(err, txsFromServer) { - if (err) { - return cb(err, []); - } - - if (txsFromServer.length === 0) { - return cb(null, []); - } - - var processedTxs = processNewTxs(wallet, txsFromServer); - - return cb(null, processedTxs); - }); - } - - /** - * @param {string} walletId - * @param {function(error, txs)} cb - txs is always an array, may be empty - */ - function getCachedTxHistory(walletId, cb) { - console.log('txhistory updateLocalTxHistoryByPage()'); - storageService.getTxHistory(walletId, function onGetTxHistory(err, txHistoryString){ - if (err) { - return cb(err, []); - } - - if (!txHistoryString) { - return cb(null, []); - } - - try { - var txHistory = JSON.parse(txHistoryString); - return cb(null, txHistory); - } catch (e) { - $log.error('Failed to parse tx history.', e); - return cb(e, []); - } - }); - } - - function processNewTxs(wallet, txs) { - var now = Math.floor(Date.now() / 1000); - var txHistoryUnique = {}; - var processedTxs = []; - wallet.hasUnsafeConfirmed = false; - - lodash.each(txs, function(tx) { - tx = txFormatService.processTx(wallet.coin, tx); - - // no future transactions... - if (tx.time > now) - tx.time = now; - - if (tx.confirmations >= SAFE_CONFIRMATIONS) { - tx.safeConfirmed = SAFE_CONFIRMATIONS + '+'; - } else { - tx.safeConfirmed = false; - wallet.hasUnsafeConfirmed = true; - } - - if (tx.note) { - delete tx.note.encryptedEditedByName; - delete tx.note.encryptedBody; - } - - if (!txHistoryUnique[tx.txid]) { - processedTxs.push(tx); - txHistoryUnique[tx.txid] = true; - } else { - $log.debug('Ignoring duplicate TX in history: ' + tx.txid) - } - }); - - return processedTxs; - } - - function saveTxHistory(walletId, processedTxs) { - storageService.setTxHistory(processedTxs, walletId, function onSetTxHistory(error){ - if (error) { - $log.error('pagination Failed to save tx history.', error); - } - }); - } - - /** - * Returns true if the cached tx was updated - * @param {*} cachedTxs - * @param {*} cachedTxIndexFromId - Indices for cachedTxs, based on txid - * @param {*} tx - The most recent tx info - */ - function updateCachedTx(cachedTxs, cachedTxIndexFromId, tx) { - var updated = false; - var txIndex = cachedTxIndexFromId[tx.txid]; - var cachedTx = cachedTxs[txIndex]; - - if (cachedTx.confirmations < SAFE_CONFIRMATIONS && tx.confirmations > cachedTx.confirmations) { - cachedTxs[txIndex].confirmations = tx.confirmations; - updated = true; - } - return updated; - } - - function updateLocalTxHistoryByPage(wallet, getLatest, flushCacheOnNew, cb) { - console.log('txhistory updaetLocalTxHistoryByPage()'); - if (flushCacheOnNew) { - fetchTxHistoryByPage(wallet, 0, function onFetchTxHistory(err, txs){ - if (err) { - return cb(err, txs); - } - saveTxHistory(wallet.id, txs); - return cb(null, txs); - }); - } else { - getCachedTxHistory(wallet.id, function onCachedHistory(err, cachedTxs){ - if (err) { - $log.error('Failed to get cached tx history.', err); - return cb(err, []); - } - - var start = getLatest ? 0 : cachedTxs.length; - fetchTxHistoryByPage(wallet, start, function onFetchHistory(err, fetchedTxs){ - if (err) { - return cb(err); - } - - if (fetchedTxs.length === 0) { - return cb(null, cachedTxs, true /*fetchedAllTransactions*/); - } - - var txs = []; - if (getLatest) { - txs = addLatestTransactions(wallet.id, cachedTxs, fetchedTxs); - } else { - allTransactionsFetched = false; - txs = addEarlyTransactions(wallet.id, cachedTxs, fetchedTxs); - return cb(null, txs, allTransactionsFetched); - } - return cb(null, txs); - }); - - - }); - } - } - } -})(); \ No newline at end of file diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index d29f99272..cb04ffbe3 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -396,23 +396,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim return ret; }; - var skipped = 0; - - function fixTxsUnit(txs) { - if (!txs || !txs[0] || !txs[0].amountStr) return; - - var cacheCoin = txs[0].amountStr.split(' ')[1]; - - if (cacheCoin == 'bits') { - - $log.debug('Fixing Tx Cache Unit to: ' + wallet.coin) - lodash.each(txs, function(tx) { - tx.amountStr = txFormatService.formatAmountStr(wallet.coin, tx.amount); - tx.feeStr = txFormatService.formatAmountStr(wallet.coin, tx.fees); - }); - } - }; - var updateLocalTxHistory = function(wallet, opts, cb) { var FIRST_LIMIT = 5; var LIMIT = 50; @@ -423,10 +406,25 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim var progressFn = opts.progressFn || function() {}; var foundLimitTx = false; + if (opts.feeLevels) { opts.lowAmount = root.getLowAmount(wallet, opts.feeLevels); } + var fixTxsUnit = function(txs) { + if (!txs || !txs[0] || !txs[0].amountStr) return; + + var cacheCoin = txs[0].amountStr.split(' ')[1]; + + if (cacheCoin == 'bits') { + + $log.debug('Fixing Tx Cache Unit to: ' + wallet.coin) + lodash.each(txs, function(tx) { + tx.amountStr = txFormatService.formatAmountStr(wallet.coin, tx.amount); + tx.feeStr = txFormatService.formatAmountStr(wallet.coin, tx.fees); + }); + } + }; getSavedTxs(walletId, function(err, txsFromLocal) { if (err) return cb(err); @@ -437,14 +435,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim var endingTxid = confirmedTxs[0] ? confirmedTxs[0].txid : null; var endingTs = confirmedTxs[0] ? confirmedTxs[0].time : null; - console.log('pagination Hard confirmed TXs. Got:' + confirmedTxs.length + '/' + txsFromLocal.length); + $log.debug('Confirmed TXs. Got:' + confirmedTxs.length + '/' + txsFromLocal.length); // First update progressFn(txsFromLocal, 0); wallet.completeHistory = txsFromLocal; function getNewTxs(newTxs, skip, next) { - console.log('pagination getNewTxs skip: ' + skip); getTxsFromServer(wallet, skip, endingTxid, requestLimit, function(err, res) { if (err) { $log.warn(bwcError.msg(err, 'Server Error')); //TODO @@ -457,7 +454,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim return next(err); } - console.log('pagination Result count: ' + res.length); // Check if new txs are founds, if yes, lets investigate in the 50 next // To be sure we are not missing txs by sorting (maybe a new tx is after the "endingTxid" var newDiscoveredTxs = res.filter(function (x) { @@ -466,7 +462,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }).length == 0; }); - console.log('pagination Discovering new TXs. Got:' + newDiscoveredTxs.length); + $log.debug('Discovering TXs. Got:' + newDiscoveredTxs.length); var shouldContinue = newDiscoveredTxs.length > 0; @@ -479,7 +475,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim skip = skip + requestLimit; - console.log('pagination Syncing TXs. Got:' + newTxs.length + ' Skip:' + skip, ' EndingTxid:', endingTxid, ' Continue:', shouldContinue); + $log.debug('Syncing TXs. Got:' + newTxs.length + ' Skip:' + skip, ' EndingTxid:', endingTxid, ' Continue:', shouldContinue); // TODO Dirty // do not sync all history, just looking for a single TX. @@ -496,16 +492,14 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim } // - shouldContinue = false; - - skipped = skip; if (!shouldContinue) { - console.log('pagination Finished Sync: New / soft confirmed Txs: ' + newTxs.length); + $log.debug('Finished Sync: New / soft confirmed Txs: ' + newTxs.length); return next(null, newTxs); } requestLimit = LIMIT; + getNewTxs(newTxs, skip, next); }); }; @@ -541,87 +535,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); } - - if (opts.getMoreTxs) { - var requestLimit = LIMIT; - getNewTxs([], skipped, function(err, txs) { - if (err) return cb(err); - - console.log(); - createReceivedEvents(txs); - - var newHistory = lodash.uniq(lodash.compact(txs.concat(confirmedTxs)), function(x) { - return x.txid; - }); - - - function updateNotes(cb2) { - if (!endingTs) return cb2(); - - $log.debug('Syncing notes from: ' + endingTs); - wallet.getTxNotes({ - minTs: endingTs - }, function(err, notes) { - if (err) { - $log.warn(err); - return cb2(); - }; - lodash.each(notes, function(note) { - $log.debug('Note for ' + note.txid); - lodash.each(newHistory, function(tx) { - if (tx.txid == note.txid) { - $log.debug('...updating note for ' + note.txid); - tx.note = note; - } - }); - }); - return cb2(); - }); - } - - function updateLowAmount(txs) { - if (!opts.lowAmount) return; - - lodash.each(txs, function(tx) { - tx.lowAmount = tx.amount < opts.lowAmount; - }); - }; - - updateLowAmount(txs); - - updateNotes(function() { - - // - if (foundLimitTx) { - $log.debug('Tx history read until limitTx: ' + opts.limitTx); - return cb(null, newHistory); - } - // - - var historyToSave = JSON.stringify(newHistory); - - lodash.each(txs, function(tx) { - tx.recent = true; - }) - - $log.debug('Tx History synced. Total Txs: ' + newHistory.length); - - // Final update - if (walletId == wallet.credentials.walletId) { - wallet.completeHistory = newHistory; - } - - return storageService.setTxHistory(historyToSave, walletId, function() { - $log.debug('Tx History saved.'); - return cb(null, newHistory); - }); - }); - }); - return; - } - - skipped = 0; - getNewTxs([], 0, function(err, txs) { if (err) return cb(err); @@ -690,19 +603,14 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim return storageService.setTxHistory(historyToSave, walletId, function() { $log.debug('Tx History saved.'); - return cb(null, newHistory); + + return cb(); }); }); }); }); }; - root.getMoreTxs = function(wallet, cb) { - var opts = {}; - opts.getMoreTxs = true; - updateLocalTxHistory(wallet, opts, cb); - }; - root.getTxNote = function(wallet, txid, cb) { wallet.getTxNote({ txid: txid @@ -726,6 +634,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }; root.getTx = function(wallet, txid, cb) { + function finish(list) { var tx = lodash.find(list, { txid: txid @@ -742,6 +651,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim limitTx: txid }, function(err, txHistory) { if (err) return cb(err); + finish(txHistory); }); } @@ -765,10 +675,16 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim root.getTxHistory = function(wallet, opts, cb) { opts = opts || {}; + var walletId = wallet.credentials.walletId; + if (!wallet.isComplete()) return cb(); - // var historyIsCached = wallet.completeHistory && wallet.completeHistory.isValid; - // if (historyIsCached && !opts.force) return cb(null, wallet.completeHistory); + function isHistoryCached() { + return wallet.completeHistory && wallet.completeHistory.isValid; + }; + + // disable caching + //if (isHistoryCached() && !opts.force) return cb(null, wallet.completeHistory); $log.debug('Updating Transaction History'); @@ -983,7 +899,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim var createAddress = function(wallet, cb) { $log.debug('Creating address for wallet:', wallet.id); - wallet.createAddress({}, function onWalletCreatedAddress(err, addr) { + wallet.createAddress({}, function(err, addr) { if (err) { var prefix = gettextCatalog.getString('Could not create address'); if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) { @@ -1001,7 +917,6 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim if (err) return cb(err); return cb(null, addr[0].address); }); - return; } return bwcError.cb(err, prefix, cb); } diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss index 886d730c7..e343f8fd2 100644 --- a/src/sass/buttons.scss +++ b/src/sass/buttons.scss @@ -1,5 +1,5 @@ %button-standard { - width: 90%; + width: 85%; max-width: 300px; margin-left: auto; margin-right: auto; @@ -73,17 +73,5 @@ &.activated { color: #FFF; } - &-outline { - @include button-style(transparent, #FFFFFF, #FFFFFF, #FFFFFF, #FFFFFF); - @include button-outline(#FFFFFF); - background: none; - box-shadow: none; - } - } - &-grey-outline { - @include button-style(transparent, #727272, #FAFAFA, #727272, #727272); - @include button-outline(#727272); - background: none; - box-shadow: none; } } \ No newline at end of file diff --git a/src/sass/components/action-minor.scss b/src/sass/components/action-minor.scss deleted file mode 100644 index f158fe845..000000000 --- a/src/sass/components/action-minor.scss +++ /dev/null @@ -1,24 +0,0 @@ -.action-minor { - margin: 20px 14px; - font-size: 14px; - - &.mt-negative { - margin-top: 0; - } - - &.text-right { - text-align: right; - } - - > .action-icon { - width: 15px; - height: 15px; - vertical-align: middle; - margin-right: 3px; - } - - > .action-text { - vertical-align: middle; - color: #444444; - } -} \ No newline at end of file diff --git a/src/sass/components/address-frame.scss b/src/sass/components/address-frame.scss deleted file mode 100644 index 8aecce6d6..000000000 --- a/src/sass/components/address-frame.scss +++ /dev/null @@ -1,27 +0,0 @@ -.address-frame { - background-color: #F8F8F8; - border: 0.5px solid #EDEBEB; - border-radius: 3px; - padding: 9px; - text-align: center; - font-size: 14px; - overflow: hidden; - text-overflow: ellipsis; - - &.expanded { - white-space: normal; - text-overflow: clip; - } - - .prefix { - color: #000000; - } - - .mid { - color: #919191; - } - - .suffix { - color: #000000; - } -} \ No newline at end of file diff --git a/src/sass/components/card.scss b/src/sass/components/card.scss deleted file mode 100644 index 6df235ab8..000000000 --- a/src/sass/components/card.scss +++ /dev/null @@ -1,5 +0,0 @@ -.card { - &.card-gutter-compact { - margin: 10px 12px; - } -} \ No newline at end of file diff --git a/src/sass/components/components.scss b/src/sass/components/components.scss deleted file mode 100644 index 4d2bd695e..000000000 --- a/src/sass/components/components.scss +++ /dev/null @@ -1,12 +0,0 @@ -@import "item"; -@import "ion-content"; -@import "card"; - -@import "header"; -@import "content-frame"; -@import "address-frame"; -@import "action-minor"; -@import "expand-content"; -@import "fee-summary"; -@import "formatted-amount"; -@import "wallet-balance"; diff --git a/src/sass/components/content-frame.scss b/src/sass/components/content-frame.scss deleted file mode 100644 index 5766b246b..000000000 --- a/src/sass/components/content-frame.scss +++ /dev/null @@ -1,11 +0,0 @@ -.content-frame { - &.negative-top { - margin-top: -40px; - - .card { - &:first-child { - margin-top: 0; - } - } - } -} \ No newline at end of file diff --git a/src/sass/components/expand-content.scss b/src/sass/components/expand-content.scss deleted file mode 100644 index 934a2beec..000000000 --- a/src/sass/components/expand-content.scss +++ /dev/null @@ -1,26 +0,0 @@ -.expand-content-frame { - position: relative; - - .expand-content-trigger { - position: absolute; - top: 0; - transition: opacity 0.3s ease; - right: 0; - - &.expand-content-revealed { - opacity: 0; - } - } - - .expand-content { - opacity: 0; - transform-origin: 100% 0%; - transform: scale(0,0); - transition: opacity 0.3s ease, transform 0.3s ease; - - &.expand-content-revealed { - opacity: 1; - transform: scale(1,1); - } - } -} \ No newline at end of file diff --git a/src/sass/components/fee-summary.scss b/src/sass/components/fee-summary.scss deleted file mode 100644 index 88c43ab02..000000000 --- a/src/sass/components/fee-summary.scss +++ /dev/null @@ -1,40 +0,0 @@ -.fee-summary { - background-color: #F2F2F2; - box-sizing: border-box; - display: flex; - flex-direction: column; - padding: 5px 12px 15px; - position: relative; - width: 100%; - - &:before { - content: ''; - position: absolute; - left: 0; - top: -15px; - width: 100%; - height: 15px; - background: linear-gradient(to bottom, rgba(242,242,242,0) 0%,rgba(242,242,242,1) 100%); - } - - .amount { - width: 100%; - - .fee-fiat { - display: inline; - - &.positive { - color: #70955F; - } - - &.negative { - color: #C24633; - } - } - - .fee-crypto { - color: #A7A7A7; - float: right; - } - } -} \ No newline at end of file diff --git a/src/sass/components/formatted-amount.scss b/src/sass/components/formatted-amount.scss deleted file mode 100644 index 6678572c9..000000000 --- a/src/sass/components/formatted-amount.scss +++ /dev/null @@ -1,37 +0,0 @@ -.formatted-amount { - display: inline-block; - - .start, - .middle, - .end, - .currency { - display: inline-block; - } - - .start { - font-size: 1em; - } - - .middle { - font-size: 0.7857em; - margin-left: 5px; - } - - .end { - font-size: 0.7857em; - margin-left: 5px; - } - - &.size-equal { - .middle, - .end { - font-size: 1em; - } - } - - .currency { - font-size: 1em; - margin-left: 5px; - text-transform: uppercase; - } -} \ No newline at end of file diff --git a/src/sass/components/header.scss b/src/sass/components/header.scss deleted file mode 100644 index d44c93b60..000000000 --- a/src/sass/components/header.scss +++ /dev/null @@ -1,39 +0,0 @@ -.header { - padding: 29px 12px 61px; - background-color: $v-bitcoin-orange; - &.btc { - background-color: $v-bitcoin-core; - } - color: #FFFFFF; - - .title { - font-size: 18px; - font-weight: 400; - line-height: 1em; - color: #FFFFFF; - text-align: center; - - + .content { - margin-top: 23px; - } - } - - .content { - text-align: center; - - p { - margin: 0; - line-height: 1em; - font-size: 18px; - - &.large { - font-size: 29px; - font-weight: 600; - } - - + p { - margin-top: 8px; - } - } - } -} \ No newline at end of file diff --git a/src/sass/components/ion-content.scss b/src/sass/components/ion-content.scss deleted file mode 100644 index 56f3960a0..000000000 --- a/src/sass/components/ion-content.scss +++ /dev/null @@ -1,17 +0,0 @@ -/* -* Extends Ionic v1 ion-content -*/ - -ion-content { - &.bg-neutral { - background-color: #F2F2F2; - } - - &.padded-bottom-cta { - bottom: 92px; - } - - &.padded-bottom-cta-with-summary { - bottom: 134px; - } -} \ No newline at end of file diff --git a/src/sass/components/item.scss b/src/sass/components/item.scss deleted file mode 100644 index a6ac4143c..000000000 --- a/src/sass/components/item.scss +++ /dev/null @@ -1,49 +0,0 @@ -/* -* Extends Ionic v1 item -*/ - -.item { - &.item-compact { - padding: 11px 13px; - } - &.item-gutterless { - padding: 0; - } - - .item-content { - &.item-content-avatar { - min-height: 69px; - padding: 13px 11px 13px 68px; - - > img, - > i { - &:first-child { - position: absolute; - max-width: 40px; - max-height: 40px; - width: 100%; - height: 100%; - border-radius: 50%; - left: 13px; - top: 50%; - padding: 0; - -webkit-transform: translate(0,-50%); - transform: translate(0,-50%); - } - } - } - - &.item-content-compact { - min-height: 0; - padding: 13px 11px; - } - - .highlight { - color: #FAB915 - } - - + .item-content { - padding-top: 0; - } - } -} \ No newline at end of file diff --git a/src/sass/components/wallet-balance.scss b/src/sass/components/wallet-balance.scss deleted file mode 100644 index faf4e8611..000000000 --- a/src/sass/components/wallet-balance.scss +++ /dev/null @@ -1,3 +0,0 @@ -.wallet-balance-directive { - display: inline-block; -} \ No newline at end of file diff --git a/src/sass/directives/directives.scss b/src/sass/directives/directives.scss index 954b86c3a..9159d3f23 100644 --- a/src/sass/directives/directives.scss +++ b/src/sass/directives/directives.scss @@ -1,2 +1 @@ @import "gravatar"; -@import "elastic"; \ No newline at end of file diff --git a/src/sass/directives/elastic.scss b/src/sass/directives/elastic.scss deleted file mode 100644 index 8e8aba4fa..000000000 --- a/src/sass/directives/elastic.scss +++ /dev/null @@ -1,4 +0,0 @@ -.elastic { - width: 100%; - font-size: 14px; -} \ No newline at end of file diff --git a/src/sass/icons.scss b/src/sass/icons.scss index ee270408f..7d14f8886 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -88,13 +88,6 @@ background-image: url('../img/icon-faucet.svg'); background-size: 70%; } - - &.icon-wallet { - background-color: #FAB915; - background-image: url('../img/icon-wallet.svg'); - border: none; - box-shadow: 0 0 0 1px rgba(0,0,0,0.3) inset; - } } } diff --git a/src/sass/main.scss b/src/sass/main.scss index 516656449..7b3e46291 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -9,5 +9,4 @@ @import "mixins/mixins"; @import "views/views"; @import "directives/directives"; -@import "components/components"; @import "shame"; diff --git a/src/sass/mixins/layout.scss b/src/sass/mixins/layout.scss index e7a1af9da..b03d53800 100644 --- a/src/sass/mixins/layout.scss +++ b/src/sass/mixins/layout.scss @@ -18,55 +18,3 @@ .absolute-center{ @include absolute-center(); } - -.third-party-notice { - font-size: 12px; - margin: 0px 14px; - font-weight: 600; - color: #6F6F70; - - @media (min-width: 768px) { - text-align: center; - } -} - -@mixin empty-case() { - padding-top: 5vh; - text-align: center; - .item { - border-style: none; - } - & > .title { - font-size: 20px; - color: $v-dark-gray; - margin: 20px 10px; - } - & > .subtitle { - font-size: 1rem; - line-height: 1.5em; - font-weight: 300; - color: #6F6F70; - margin: 20px 1em 2.5em; - } - .big-icon-svg { - .bg.green { - padding: 0 10px; - box-shadow: none; - } - } - .buttons { - margin-top: 18px; - .button { - font-weight: bold; - font-size: 19px; - line-height: 26px; - padding: 8px 6px; - } - } - .button-first-contact img { - height: 19px; - width: 19px; - margin-right: 6px; - vertical-align: sub; - } -} \ No newline at end of file diff --git a/src/sass/qr.scss b/src/sass/qr.scss index 5df26e37b..62fd12eb7 100644 --- a/src/sass/qr.scss +++ b/src/sass/qr.scss @@ -5,8 +5,8 @@ qrcode { content: ""; background-size: 100% 100%; display: block; - left: calc(50% - 22px); - margin-top: calc(50% - 22px); + left: 88px; + margin-top: 88px; width: 44px; height: 44px; position:absolute; diff --git a/src/sass/shame.scss b/src/sass/shame.scss index dbbc222d7..07ac2dedf 100644 --- a/src/sass/shame.scss +++ b/src/sass/shame.scss @@ -233,10 +233,6 @@ input[type=number] { font-size: 24px; } -.size-25 { - font-size: 25px; -} - .size-28 { font-size: 28px; } @@ -468,7 +464,3 @@ input[type=file] { .white-space-initial { white-space: initial; } - -.height-spacer { - height: 15px; -} diff --git a/src/sass/variables.scss b/src/sass/variables.scss index 49ee6ae89..cb21c030a 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -8,9 +8,7 @@ $v-font-family-light: "Roboto-Light", sans-serif- /* Colors */ $v-bitcoin-orange: #fab915 !default; -$v-bitcoin-core: #535353 !default; -$v-off-black: #262424; $v-dark-gray: #445 !default; $v-mid-gray: #667 !default; $v-light-gray: #9b9bab !default; @@ -26,11 +24,8 @@ $v-text-accent-color: #647ce8 !default; $v-success-color: #13e5b6 !default; $v-warning-color: #ffa500 !default; -$v-warning-color-2: #b7664d; $v-error-color: #ef473a !default; -$v-background-under-card: #f2f2f2; - $v-wallet-color-map: ( 0: (color: #dd4b39, name: 'Cinnabar'), 1: (color: #f38f12, name: 'Carrot Orange'), @@ -82,7 +77,6 @@ $v-button-primary-active-bg: darken($v-accent-color, 10% $v-button-primary-active-border: transparent !default; $v-button-primary-clear-bg: none !default; $v-button-primary-clear-color: $v-accent-color !default; -$v-button-primary-disabled-bg: $v-mid-gray; $v-button-primary-outline-bg: transparent !default; $v-button-primary-outline-border: $v-accent-color !default; $v-button-primary-outline-color: $v-accent-color !default; diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss index aba2fe6d9..c712d85e5 100644 --- a/src/sass/views/amount.scss +++ b/src/sass/views/amount.scss @@ -244,21 +244,6 @@ flex-direction: column; justify-content: center; - .send-amount-header-footer { - flex: 1 1 auto; - min-height: 20px; - - .warning { - font-weight: bold; - font-size: 12px; - padding: 0 6px 6px 6px; - text-align: center; - } - &__max { - float: right; - } - } - .send-amount-tool { flex: 0 1 auto; @@ -275,8 +260,6 @@ } .primary-amount { - color: #333; - font-weight: bold; input, .unit, .primary-amount-display { font-size: 1.8em; @@ -305,8 +288,7 @@ &.very-long { input, .unit, .primary-amount-display { - font-size: 1.2em; // OK for iPhone 5 / SE with BCH to 8dp - + font-size: 0.9em; @media (min-width: 375px) { font-size: 1.3em; @@ -347,16 +329,16 @@ line-height: 1em; } + .unit { + font-weight: bold; + } + .primary-amount-display { margin-right: 5px; word-break: break-all; - width: 100%; } } - .alternative-amount { - color: #6F6F70; - } .switch-currencies { position: absolute; right: 0; @@ -369,60 +351,26 @@ } } } - } - } - .send-amount-extras { - display: flex; - flex: 0 0 auto; - /* So that if only one item is present, it appears on the right. */ - flex-direction: row-reverse; - font-size: 12px; - align-items: center; - justify-content: space-between; - margin: 0 14px; + .send-amount-actions { + margin-top: 15px; + display: flex; + align-items: center; + justify-content: center; - .available-funds { - color: #6F6F70; - text-align: left; - } + .button { + flex: 1 1 auto; + line-height: 1.2em; - .change-currency { - text-align: right; - } + + .button { + margin-left: 10px; + } - .warning { - color: $v-warning-color-2; - } - - .extra { - flex: 1; - line-height: normal; - - .button { - background: none; - border: none; - border-radius: 0; - color: #000; - font-family: 'ProximaNova'; - font-size: 14px; - line-height: normal; - min-height: auto; - min-width: auto; - padding: 0; - } - - .button .icon:before { - font-size: 14px; - line-height: normal; - } - - - .button { - span { - display: flex; - align-items: center; - justify-content: center; + span { + display: flex; + align-items: center; + justify-content: center; + } } } } @@ -446,58 +394,37 @@ .keypad-container { position: relative; - font-size: 18px; - line-height: 2em; //flex: 0 1 196px; - @media (min-height: 667px) { - font-size: 24px; - } - - @media(max-height: 480px) { - font-size: 12px; - } - @media (min-height: 667px) { //flex: 0 1 224px; } - .sendmax { - background: $v-off-black; - - .button { - color: white; - background: black; - border: 1px solid $v-off-black; - border-radius: 0; - font-size: 0.8em; - line-height: 2em; - width: 100%; - - .available-funds-amount { - color: #C9C9C9; - } - - &:active { - background-color: $v-dark-gray; - } - } - } - .keypad { text-align: center; + font-size: 18px; font-weight: lighter; position: absolute; bottom: 0; width: 100%; - color: $v-text-primary-color; - + color: $v-mid-gray; + @media (min-height: 667px) { + font-size: 24px; + } .row { padding: 0 !important; margin: 0 !important; } + + .col { + line-height: 38px; + + @media (min-height: 667px) { + line-height: 45px; + } + } .row { &:last-child { @@ -531,34 +458,23 @@ .digit{ cursor: pointer; - background-color: #000; - border: 1px solid $v-off-black; + border-top: 1px solid $v-subtle-gray; + border-left: 1px solid $v-subtle-gray; transition: all 0.1s ease; &:active { - background-color: $v-dark-gray; + background-color: $v-subtle-gray; } } + @media(max-height: 480px) { + font-size: 12px; + + } } } - - .button-primary { - background-color: $v-primary-color; - border-radius: 0; - font-weight: bold; - } - - .button-primary[disabled] { - background-color: $v-button-primary-disabled-bg; - opacity: 1; - } } - - .warning { - color: $v-warning-color-2; - } - background: $v-background-under-card; + background: #494949; ion-content { margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */ diff --git a/src/sass/views/custom-amount.scss b/src/sass/views/custom-amount.scss index 17973101d..b9bf65459 100644 --- a/src/sass/views/custom-amount.scss +++ b/src/sass/views/custom-amount.scss @@ -26,10 +26,16 @@ height: 100%; .qr-code { text-align: center; - margin-top: 6px; - qrcode canvas { - height: 30vh; - max-height: 220px; + margin-top: 24vh; + margin-bottom: 7vh; + @media(max-height: 800px) { + margin-top: 18vh; + } + @media(max-height: 700px) { + margin-top: 14vh; + } + @media(max-height: 600px) { + margin-top: 8vh; } } .info { @@ -85,34 +91,5 @@ .address-types { text-align: center; } - - .amount { - margin-top: 20vh; - margin-bottom: 4vh; - @media(max-height: 800px) { - margin-top: 12vh; - margin-bottom: 6vh; - } - @media(max-height: 700px) { - margin-top: 10vh; - margin-bottom: 4vh; - } - @media(max-height: 600px) { - margin-top: 6vh; - margin-bottom: 2vh; - - } - width: 100%; - text-align: center; - //padding-top: 30px; - display: block; - align-items: center; - justify-content: center; - - &-alternative { - line-height: 36px; - } - } - } } diff --git a/src/sass/views/includes/slideToAcceptSuccess.scss b/src/sass/views/includes/slideToAcceptSuccess.scss index f64dd6154..68312c7a4 100644 --- a/src/sass/views/includes/slideToAcceptSuccess.scss +++ b/src/sass/views/includes/slideToAcceptSuccess.scss @@ -12,6 +12,12 @@ slide-to-accept-success { .slide-success { $duration: 400ms; + &__windows-background { + background: $v-success-bg-color; + height: 100%; + width: 100%; + position: fixed; + } &__background { $start-radius: 5; $scale-factor: 20; @@ -34,11 +40,9 @@ slide-to-accept-success { &__content { position: relative; z-index: 1; - margin-top: -10vh; + margin-top: -20vh; > img { - width: 45vw; - max-width: 166px; margin-bottom: 1.8rem; -webkit-transform: translateY(5rem); transform: translateY(5rem); @@ -55,7 +59,7 @@ slide-to-accept-success { &__header { color: #FFFFFF; - font-size: 29px; + font-size: 26px; -webkit-transform: translateY(5rem); transform: translateY(5rem); opacity: 0; @@ -68,26 +72,6 @@ slide-to-accept-success { opacity: 1; } } - &__share { - transition: transform $duration ease, opacity $duration ease; - transition-delay: 600ms; - opacity: 0; - margin-top: 15vh; - span { - color: #FFF; - font-size: 22px; - height: 28px; - } - img { - height: 28px; - width: auto; - vertical-align: bottom; - margin-right: 4px; - } - &.reveal { - opacity: 0.79; - } - } } &__footer { @@ -114,11 +98,11 @@ slide-to-accept-success { &__btn { display: block; color: #FFFFFF; - font-size: 22px; + font-size: 18px; font-weight: 600; letter-spacing: 2.86px; - padding: 2rem 0 2.1rem; - border-top: 1px solid rgba(255, 255, 255, 0.25); + padding: 1rem 0 1.1rem; + border-top: 1px solid rgba(255, 255, 255, .45); cursor: pointer; } } diff --git a/src/sass/views/review.scss b/src/sass/views/review.scss deleted file mode 100644 index d4f02f2f4..000000000 --- a/src/sass/views/review.scss +++ /dev/null @@ -1,23 +0,0 @@ -#view-review { - - slide-to-accept, slide-to-accept-success { - margin-bottom: constant(safe-area-inset-bottom); /* iOS 11.0 */ - margin-bottom: env(safe-area-inset-bottom); /* iOS 11.2 */ - } - - .fee-summary { - bottom: 92px; - bottom: calc(92px + constant(safe-area-inset-bottom)); /* iOS 11.0 */ - bottom: calc(92px + env(safe-area-inset-bottom)); /* iOS 11.2 */ - position: absolute; - } - - .shapeshift-banner, .bitpay-banner, .egifter-banner { - box-shadow: none; - } - - .warning { - color: $v-warning-color-2; - } - -} \ No newline at end of file diff --git a/src/sass/views/shapeshift.scss b/src/sass/views/shapeshift.scss deleted file mode 100644 index 5b63c0354..000000000 --- a/src/sass/views/shapeshift.scss +++ /dev/null @@ -1,23 +0,0 @@ -#shapeshift { - .swap-image { - width: auto; - max-width: 400px; - max-height: 25vh; - } - .empty-case { - @include empty-case(); - } - .button-shapeshift { - @extend %button-standard; - - @include button-style(#243F5D, #FFF, #606060, #FFF, #FFF); - @include button-clear(#FFF); - @include button-outline(#C1C1C1); - border: 0px; - @include button-shadow(); - } -} -.header.shapeshift { - background: url(../img/shapeshiftbg.jpg) center center repeat #28394d; - opacity: 0.99; -} \ No newline at end of file diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index aed37705e..66a2f1d58 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -69,30 +69,6 @@ } } } - .buttons { - display: flex; - flex-direction: row; - justify-content: space-evenly; - margin: 6px auto -12px; - text-align: center; - width: 100%; - >.col { - padding: 5px 10px; - margin-bottom: 0; - } - .button { - border: 2px solid; - border-radius: 47px; - padding: 8px 2px 8px 2px; - text-align: center; - width: 100%; - max-width: 300px; - font-size: 19px; - font-weight: bolder; - min-height: 0; - line-height: 19px; - } - } .wallet-coin-logo { vertical-align: middle; margin-right: 5px; @@ -173,11 +149,6 @@ font-weight: 700; color: #444; } - .release-notes { - white-space: pre; - white-space: pre-line; - text-align: left; - } .button { width: 100%; border: none; @@ -195,13 +166,3 @@ top:11px; } } -.popup-update { - .popup-buttons { - display: block; - } - .popup-buttons .button{ - display:block; - min-width: 100% !important; - margin-top: 4px; - } -} \ No newline at end of file diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss index 0b406254d..40dc79504 100644 --- a/src/sass/views/tab-receive.scss +++ b/src/sass/views/tab-receive.scss @@ -84,9 +84,6 @@ width: 100%; } .payment-received-container { - svg { - max-height: 400px; - } margin: 0 20px; .payment-received-amount { font-size: 1.8em; diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss index 564e90d66..a4025156f 100644 --- a/src/sass/views/tab-send.scss +++ b/src/sass/views/tab-send.scss @@ -2,15 +2,15 @@ @extend .deflash-blue; &-header{ - //height: 300px; + height: 300px; width: 100%; } &-contacts { - //height: calc(100vh - 300px - 50px - 44px); /* screen size - button container - bottom-tab-menu - header top */ + height: calc(100vh - 300px - 50px - 44px); /* screen size - button container - bottom-tab-menu - header top */ &.ios { - //height: calc(100vh - 300px - 50px - 44px - 18px); // Remove the notification-bar height on iOS + height: calc(100vh - 300px - 50px - 44px - 18px); // Remove the notification-bar height on iOS } - //overflow: scroll; + overflow: scroll; } .input { @@ -88,8 +88,6 @@ &.contains-address { .address { display: inline; - border: none; - background-color: transparent; } .non-address { display: none; @@ -105,7 +103,7 @@ width: auto; margin: 2px 0 4px; } - min-height: 65px; + height: 60px; line-height: 16px; margin-right: 0px; width: 95%; @@ -135,7 +133,42 @@ padding-left: 30px; } .sendTip { - @include empty-case(); + padding-top: 5vh; + text-align: center; + .item { + border-style: none; + } + & > .title { + font-size: 20px; + color: $v-dark-gray; + margin: 20px 10px; + } + & > .subtitle { + font-size: 1rem; + line-height: 1.5em; + font-weight: 300; + color: #6F6F70; + margin: 20px 1em 2.5em; + } + .big-icon-svg { + .bg.green { + padding: 0 10px; + box-shadow: none; + } + } + .buttons { + margin-top: 18px; + .button { + font-weight: bold; + font-size: 19px; + } + } + .button-first-contact img { + height: 19px; + width: 19px; + margin-right: 6px; + vertical-align: sub; + } } .item-heading { line-height: 16px; @@ -223,12 +256,12 @@ } } #tab-send-header { - //height: 270px; + height: 270px; } #tab-send-contacts { - //height: calc(100vh - 270px - 50px - 44px); /* screen size - button container - bottom-tab-menu - header top */ + height: calc(100vh - 270px - 50px - 44px); /* screen size - button container - bottom-tab-menu - header top */ &.ios { - //height: calc(100vh - 270px - 50px - 44px - 18px); // Remove the notification-bar height on iOS + height: calc(100vh - 270px - 50px - 44px - 18px); // Remove the notification-bar height on iOS } } } diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 1f25b564a..d4ed735ed 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -8,13 +8,11 @@ @import "tab-receive"; @import "tab-scan"; @import "tab-send"; -@import "wallet-origin-destination"; @import "tab-settings"; @import "wallet-colors"; @import "walletBalance"; @import "walletDetails"; @import "advancedSettings"; -@import "shapeshift"; @import "bitpayCard"; @import "bitpayCardIntro"; @import "buyandsell"; @@ -50,4 +48,3 @@ @import "includes/logOptions"; @import "includes/checkBar"; @import "cashScan"; -@import "review"; diff --git a/src/sass/views/wallet-origin-destination.scss b/src/sass/views/wallet-origin-destination.scss deleted file mode 100644 index 1c6016862..000000000 --- a/src/sass/views/wallet-origin-destination.scss +++ /dev/null @@ -1,74 +0,0 @@ -#wallet-origin-destination { - .header--request { - padding: 30px 24px; - width: 100%; - height: 139px; - background-color: #fff; - &__title { - width: 46px; - height: 20px; - font-size: 16px; - font-weight: 600; - letter-spacing: -0.4px; - color: #000000; - } - &__amount { - font-size: 29px; - font-weight: 600; - letter-spacing: -0.7px; - color: #000000; - margin: 11px 0 2px; - } - &__amount-alt { - opacity: 0.45; - font-size: 16px; - font-weight: 600; - letter-spacing: -0.4px; - color: #000000; - } - } - .wallets-header { - margin: 20px 14px 0px; - - .title { - font-size: 16px; - font-weight: bold; - color: $v-dark-gray; - margin-bottom: -12px; - } - } - .card { - font-size: 12px; - margin: 20px 14px 0px; - - .item-heading { - .subtitle { - font-size: 12px; - } - font-weight: 600; - - } - - &-insufficient { - .wallet { - opacity: 0.4; - - } - .item-heading { - font-size: 12px; - >div { - display: inline-block; - vertical-align: text-bottom; - } - } - &__dot { - display: inline-block; - width: 16px; - height: 16px; - background-color: #ec5959; - border-radius: 8px; - margin: 2px 6px 2px 2px; - } - } - } -} \ No newline at end of file diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss index e8b64ef45..9e651f871 100644 --- a/src/sass/views/walletDetails.scss +++ b/src/sass/views/walletDetails.scss @@ -1,4 +1,3 @@ -$wallet-details-collapse-transition: all 0.25s ease-in-out; .wallet-details { &__tx-amount { font-size: 16px; @@ -136,26 +135,11 @@ $wallet-details-collapse-transition: all 0.25s ease-in-out; &.status-bar { margin-top: 20px; - margin-top: env(safe-area-inset-top); - } - &.collapse { - ion-content { - margin-top: 40px; - } - .amount { - &__scale, &__error { - -webkit-transform: scale3d(0.5, 0.5, 0.5) translateY(0px); - transform: scale3d(0.5, 0.5, 0.5) translateY(0px); - } - } - .amount-alternative, .send-receive-buttons, .wallet-details-wallet-info { - opacity: 0; - } } } .bar-header { border: 0; - background: rgb(238, 182, 64); + background: none; .title, .button { color: #fff; } @@ -167,14 +151,13 @@ $wallet-details-collapse-transition: all 0.25s ease-in-out; background-color: inherit !important; } ion-content { + + &.collapsible { + margin-top: 210px; + } + padding-top: 0; top: 0; - transition: $wallet-details-collapse-transition; - - margin-top: 185px; - @media only screen and (max-height:500px) { - margin-top: 165px; - } margin-bottom: 16px; .scroll { @@ -207,53 +190,20 @@ $wallet-details-collapse-transition: all 0.25s ease-in-out; transform: translateY(100px); } } - - .send-receive-buttons { - display: flex; - flex-direction: row; - justify-content: space-evenly; - width: 100%; - position: absolute; - bottom: 20px; - transition: $wallet-details-collapse-transition; - >.col { - padding: 5px 10px; - margin-bottom: 0; - } - .button { - border: 2px solid; - border-radius: 47px; - padding: 6px 2px 6px 2px; - text-align: center; - width: 100%; - max-width: 300px; - font-size: 19px; - font-weight: bolder; - min-height: 0; - line-height: 19px; - } - } } .amount { - align-items: center; - color: #fff; - display: block; - - height: 230px; - @media only screen and (max-height:500px) { - height: 210px; - } - - justify-content: center; - padding-top: 40px; - text-align: center; - transition: $wallet-details-collapse-transition; width: 100%; + text-align: center; + color: #fff; + height: 210px; + padding-top: 40px; + display: block; + align-items: center; + justify-content: center; &__balance { -webkit-transform: scale3d(1, 1, 1) translateY(45px); transform: scale3d(1, 1, 1) translateY(45px); - transition: $wallet-details-collapse-transition; } &__updating { @@ -263,7 +213,6 @@ $wallet-details-collapse-transition: all 0.25s ease-in-out; &-alternative { line-height: 36px; - transition: $wallet-details-collapse-transition; } &__button-balance { @@ -279,14 +228,12 @@ $wallet-details-collapse-transition: all 0.25s ease-in-out; &__error { font-size: 14px; padding: 35px 20px; - opacity: 1; } } .no-alternative { padding-top: 45px; } - .item.item-footer { font-weight: lighter; } @@ -366,6 +313,4 @@ a.item { .loading-wallet svg { margin-top: 0; - width: 16px; - height: 16px; } \ No newline at end of file diff --git a/src/shim/shim.js b/src/shim/shim.js index 6f9abc0ae..495848f05 100644 --- a/src/shim/shim.js +++ b/src/shim/shim.js @@ -8,56 +8,4 @@ if (!ArrayBuffer['isView']) { ArrayBuffer.isView = function(a) { return a !== null && typeof(a) === "object" && a['buffer'] instanceof ArrayBuffer; }; -} - -// https://tc39.github.io/ecma262/#sec-array.prototype.includes -if (!Array.prototype.includes) { - Object.defineProperty(Array.prototype, 'includes', { - value: function(searchElement, fromIndex) { - - if (this == null) { - throw new TypeError('"this" is null or not defined'); - } - - // 1. Let O be ? ToObject(this value). - var o = Object(this); - - // 2. Let len be ? ToLength(? Get(O, "length")). - var len = o.length >>> 0; - - // 3. If len is 0, return false. - if (len === 0) { - return false; - } - - // 4. Let n be ? ToInteger(fromIndex). - // (If fromIndex is undefined, this step produces the value 0.) - var n = fromIndex | 0; - - // 5. If n ≥ 0, then - // a. Let k be n. - // 6. Else n < 0, - // a. Let k be len + n. - // b. If k < 0, let k be 0. - var k = Math.max(n >= 0 ? n : len - Math.abs(n), 0); - - function sameValueZero(x, y) { - return x === y || (typeof x === 'number' && typeof y === 'number' && isNaN(x) && isNaN(y)); - } - - // 7. Repeat, while k < len - while (k < len) { - // a. Let elementK be the result of ? Get(O, ! ToString(k)). - // b. If SameValueZero(searchElement, elementK) is true, return true. - if (sameValueZero(o[k], searchElement)) { - return true; - } - // c. Increase k by 1. - k++; - } - - // 8. Return false - return false; - } - }); } \ No newline at end of file diff --git a/test/karma.conf.js b/test/karma.conf.js index 22efcd1c8..002d40c91 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -17,8 +17,6 @@ module.exports = function(config) { files: [ 'node_modules/angular/angular.js', - 'bitanalytics/bitanalytics.js', - // From Gruntfile.js 'bower_components/qrcode-generator/js/qrcode.js', 'bower_components/qrcode-generator/js/qrcode_UTF8.js', diff --git a/www/css/bitcoin.com.css b/www/css/bitcoin.com.css index f0d7eab30..9b69005c4 100644 --- a/www/css/bitcoin.com.css +++ b/www/css/bitcoin.com.css @@ -318,33 +318,5 @@ div.slide-success__background.fill-screen { display: block; float: left; max-height: 100%; - max-width: 100%; -} - -.bitpay-banner { - background: #1A3A8B; - padding: 10px; - box-shadow: 0px 5px 10px 0px #cccccc; - height: 5em; -} - -.bitpay-logo { - display: block; - max-height: 100%; - width: 100%; - height: 4em; -} - -.egifter-banner { - background: #066EAA; - padding: 10px; - box-shadow: 0px 5px 10px 0px #cccccc; - height: 5em; - text-align: center; -} - -.egifter-logo { - max-height: 100%; - max-width: 100%; - height: 4em; + max-width: 100%; } diff --git a/www/css/main.css b/www/css/main.css index 83c50fe17..b4e67edac 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -9970,7 +9970,7 @@ ion-nav-bar.hide { .card { margin: 20px 14px; } -ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm:before, ion-view#copayers-invitation:before, ion-view#tab-home:before, ion-view#tab-receive:before, ion-view#tab-send:before, ion-view.settings:before, ion-view#bitpayCard:before, ion-view#bitpayCard-intro:before, ion-view#view-address-book:before, ion-view#addresses:before, ion-view#choose-fee-level:before, ion-view#txp-details:before, ion-view#coinbase:before, ion-view#glidera:before, ion-view#amazon:before, ion-view#mercadolibre:before, ion-view#custom-amount:before { +ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm:before, ion-view#copayers-invitation:before, ion-view#tab-home:before, ion-view#tab-receive:before, ion-view#tab-send:before, ion-view.settings:before, ion-view#bitpayCard:before, ion-view#bitpayCard-intro:before, ion-view#view-address-book:before, ion-view#addresses:before, ion-view#send-feedback:before, ion-view#choose-fee-level:before, ion-view#txp-details:before, ion-view#coinbase:before, ion-view#glidera:before, ion-view#amazon:before, ion-view#mercadolibre:before, ion-view#custom-amount:before { content: " "; display: block; position: absolute; @@ -9980,7 +9980,7 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm height: 44px; background-color: #fab915; } -.platform-ios.platform-cordova:not(.fullscreen) ion-view.deflash-blue:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#view-amount:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#view-confirm:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#copayers-invitation:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#tab-home:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#tab-receive:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#tab-send:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view.settings:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#bitpayCard:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#bitpayCard-intro:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#view-address-book:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#addresses:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#choose-fee-level:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#txp-details:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#coinbase:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#glidera:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#amazon:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#mercadolibre:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#custom-amount:before { +.platform-ios.platform-cordova:not(.fullscreen) ion-view.deflash-blue:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#view-amount:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#view-confirm:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#copayers-invitation:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#tab-home:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#tab-receive:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#tab-send:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view.settings:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#bitpayCard:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#bitpayCard-intro:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#view-address-book:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#addresses:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#send-feedback:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#choose-fee-level:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#txp-details:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#coinbase:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#glidera:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#amazon:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#mercadolibre:before, .platform-ios.platform-cordova:not(.fullscreen) ion-view#custom-amount:before { height: 64px; } .just-a-hint, .icon.bp-arrow-right, .icon.bp-arrow-down, .icon.bp-arrow-up { @@ -10037,11 +10037,6 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm .big-icon-svg.theme-circle > .bg.icon-faucet { background-image: url("../img/icon-faucet.svg"); background-size: 70%; } - .big-icon-svg.theme-circle > .bg.icon-wallet { - background-color: #FAB915; - background-image: url("../img/icon-wallet.svg"); - border: none; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3) inset; } .big-icon-svg.theme-circle-services > .bg { border: 1px solid #191919; } .big-icon-svg.theme-circle-community > .bg { @@ -10076,14 +10071,12 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm .loading .spinner svg { margin-top: 0; } -.button.button-primary.button-standard, .button.button-secondary.button-standard, .button.button-light.button-standard, .button.button-white.button-standard, .button.button-green.button-standard, .button.button-assertive.button-standard, +.button.button-primary.button-standard, .button.button-secondary.button-standard, .button.button-light.button-standard, .button.button-assertive.button-standard, .onboarding .button.button-primary.button-standard, .onboarding .button.button-secondary.button-standard, .onboarding .button.button-light.button-standard, -.onboarding .button.button-white.button-standard, -.onboarding .button.button-green.button-standard, -.onboarding .button.button-assertive.button-standard, #shapeshift .button-shapeshift { - width: 90%; +.onboarding .button.button-assertive.button-standard { + width: 85%; max-width: 300px; margin-left: auto; margin-right: auto; @@ -10125,12 +10118,10 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm box-shadow: none; color: #fff; } -.button.button-primary.button-standard + .button-standard, .button.button-secondary.button-standard + .button-standard, .button.button-light.button-standard + .button-standard, .button.button-white.button-standard + .button-standard, .button.button-green.button-standard + .button-standard, .button.button-assertive.button-standard + .button-standard, +.button.button-primary.button-standard + .button-standard, .button.button-secondary.button-standard + .button-standard, .button.button-light.button-standard + .button-standard, .button.button-assertive.button-standard + .button-standard, .onboarding .button.button-primary.button-standard + .button-standard, .onboarding .button.button-secondary.button-standard + .button-standard, .onboarding .button.button-light.button-standard + .button-standard, -.onboarding .button.button-white.button-standard + .button-standard, -.onboarding .button.button-green.button-standard + .button-standard, .onboarding .button.button-assertive.button-standard + .button-standard { margin-top: 1rem; } @@ -10192,108 +10183,8 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm font-size: 0.7em !important; display: inline !important; } -.button { - border-radius: 6px; } - .button.button-full { - border-radius: 0; - display: block; } - .button-green { - border-color: #FFF; - background-color: #719561; - color: #FFF; - border: 0px; - box-shadow: 0 2px 11px 0 #C1C1C1; } - .button-green:hover { - color: #FFF; - text-decoration: none; } - .button-green.active, .button-green.activated { - border-color: #FFF; - background-color: #606060; } - .button-green.button-clear { - border-color: transparent; - background: none; - box-shadow: none; - color: #FFF; } - .button-green.button-icon { - border-color: transparent; - background: none; } - .button-green.button-outline { - border-color: #C1C1C1; - background: transparent; - color: #C1C1C1; } - .button-green.button-outline.active, .button-green.button-outline.activated { - background-color: #C1C1C1; - box-shadow: none; - color: #fff; } - .button-white { - border-color: #C1C1C1; - background-color: #FFF; - color: #606060; - box-shadow: 0 2px 11px 0 #C1C1C1; } - .button-white:hover { - color: #606060; - text-decoration: none; } - .button-white.active, .button-white.activated { - border-color: #FFF; - background-color: #C1C1C1; } - .button-white.button-clear { - border-color: transparent; - background: none; - box-shadow: none; - color: #FFF; } - .button-white.button-icon { - border-color: transparent; - background: none; } - .button-white.button-outline { - border-color: #C1C1C1; - background: transparent; - color: #C1C1C1; } - .button-white.button-outline.active, .button-white.button-outline.activated { - background-color: #C1C1C1; - box-shadow: none; - color: #fff; } - .button-white.activated { - color: #FFF; } - .button-white-outline { - border-color: #FFFFFF; - background-color: transparent; - color: #FFFFFF; - background: none; - box-shadow: none; } - .button-white-outline:hover { - color: #FFFFFF; - text-decoration: none; } - .button-white-outline.active, .button-white-outline.activated { - border-color: #FFFFFF; - background-color: #FFFFFF; } - .button-white-outline.button-outline { - border-color: #FFFFFF; - background: transparent; - color: #FFFFFF; } - .button-white-outline.button-outline.active, .button-white-outline.button-outline.activated { - background-color: #FFFFFF; - box-shadow: none; - color: #fff; } - .button-grey-outline { - border-color: #727272; - background-color: transparent; - color: #727272; - background: none; - box-shadow: none; } - .button-grey-outline:hover { - color: #727272; - text-decoration: none; } - .button-grey-outline.active, .button-grey-outline.activated { - border-color: #727272; - background-color: #FAFAFA; } - .button-grey-outline.button-outline { - border-color: #727272; - background: transparent; - color: #727272; } - .button-grey-outline.button-outline.active, .button-grey-outline.button-outline.activated { - background-color: #727272; - box-shadow: none; - color: #fff; } +.button.button-full { + display: block; } .button-clear { background: none !important; } @@ -10306,22 +10197,6 @@ textarea.d-block { display: block; width: 100%; } -qrcode { - position: relative; } - qrcode.qr-overlay::before { - content: ""; - background-size: 100% 100%; - display: block; - left: calc(50% - 22px); - margin-top: calc(50% - 22px); - width: 44px; - height: 44px; - position: absolute; } - qrcode.qr-overlay--bch::before { - background-image: url("../img/qr-overlay-bch.png"); } - qrcode.qr-overlay--btc::before { - background-image: url("../img/qr-overlay-btc.png"); } - .center-block { float: none; margin: 0 auto; } @@ -10333,15 +10208,6 @@ qrcode { top: 50%; left: 50%; } -.third-party-notice { - font-size: 12px; - margin: 0px 14px; - font-weight: 600; - color: #6F6F70; } - @media (min-width: 768px) { - .third-party-notice { - text-align: center; } } - .tabs .tab-item .icon { background-repeat: no-repeat; background-position: center; @@ -10371,10 +10237,6 @@ qrcode { font-weight: 700; } #tab-home .card > .item-heading .icon, #tab-home .list > .item-heading .icon, #tab-send .card > .item-heading .icon, #tab-send .list > .item-heading .icon { color: #667; } - #tab-home .card > .item-heading .subtitle, #tab-home .list > .item-heading .subtitle, #tab-send .card > .item-heading .subtitle, #tab-send .list > .item-heading .subtitle { - color: #667; - font-size: 12px; - font-weight: 300; } #view-add .item { margin-bottom: 10px; @@ -10398,401 +10260,349 @@ qrcode { #view-add .bg.join { padding: 10px; } -#view-amount { - background: #f2f2f2; } - #view-amount .recipient-label { - font-size: 14px; - padding-bottom: 0; - color: #667; } - #view-amount .item-no-bottom-border + .item { - border-top: 0; } - #view-amount .icon-bitpay-card { - background-image: url("../img/icon-bitpay.svg"); } - #view-amount .icon-amazon { - background-image: url("../img/icon-amazon.svg"); } - @media (max-width: 480px) { - #view-amount .bitcoin-address { - font-size: 13px; - padding-left: 48px; } - #view-amount .bitcoin-address .icon { - left: 8px; - font-size: 24px; } - #view-amount .bitcoin-address .big-icon-svg { - left: 5px; } - #view-amount .bitcoin-address .big-icon-svg > .bg { - width: 30px; - height: 30px; - box-shadow: none; } } - @media (max-width: 320px) { - #view-amount .bitcoin-address > span:last-child { - margin-left: -2px; } } - #view-amount .send-gravatar { - left: 11px; - position: absolute; - top: 10px; } - #view-amount .amount span input { - display: inline; - width: 120px; } - #view-amount .amount-pane-recipient { - position: absolute; - top: 95px; - bottom: 0; - width: 100%; - background-color: #fff; - padding: 0 16px; } - #view-amount .amount-pane-recipient .amount-bar { - padding: 24px 0; - font-size: 18px; } - @media (max-height: 480px) { - #view-amount .amount-pane-recipient .amount-bar { - padding: 0px; } } - @media (max-width: 320px) { - #view-amount .amount-pane-recipient .amount-bar { - padding: 0px; } } - #view-amount .amount-pane-recipient .amount-bar .title { - float: left; - padding-top: 10px; - color: #445; - font-weight: bold; } - @media (max-height: 480px) { - #view-amount .amount-pane-recipient .amount-bar .title { - padding: 0px; } } - @media (max-height: 480px) { - #view-amount .amount-pane-recipient .amount-bar { - padding-top: 3px; } } - #view-amount .amount-pane-recipient .amount { - display: flex; - flex-direction: column; - justify-content: center; - flex-grow: 1; - position: absolute; - bottom: 254px; - top: 66px; } - #view-amount .amount-pane-recipient .amount .light { - color: #9b9bab; } - @media (max-height: 480px) { - #view-amount .amount-pane-recipient .amount { - top: 45px; } } - @media (max-width: 320px) { - #view-amount .amount-pane-recipient .amount { - bottom: 276px; - top: 60px; } - #view-amount .amount-pane-recipient .amount > div { - display: inline-block; } - #view-amount .amount-pane-recipient .amount > div:first-child { - display: inherit; } } - #view-amount .amount-pane-no-recipient { - position: absolute; - top: 0; - bottom: 0; - width: 100%; - background-color: #fff; - padding: 0 16px; } - #view-amount .amount-pane-no-recipient .amount-bar { - padding: 24px 0; - font-size: 18px; } - #view-amount .amount-pane-no-recipient .amount-bar .title { - padding-top: 10px; - color: #445; - font-weight: bold; } - #view-amount .amount-pane-no-recipient .amount-bar .title .limits { - margin-top: 10px; - color: #9b9bab; - font-size: 12px; } - #view-amount .amount-pane-no-recipient .amount-bar .title .select { - margin: 10px 1px; } - #view-amount .amount-pane-no-recipient .amount { - display: flex; - flex-direction: column; - justify-content: center; - flex-grow: 1; - position: absolute; - bottom: 254px; - top: 66px; } - #view-amount .amount-pane-no-recipient .amount .light { - color: #9b9bab; } - #view-amount .amount { - padding-top: 10px; - padding-bottom: 10px; } - #view-amount .amount .icon-toggle { - font-size: 1.2em; - width: auto; - margin: 0.8em auto; - border: 1px solid #f2f2f2; +#view-amount .recipient-label { + font-size: 14px; + padding-bottom: 0; + color: #667; } + +#view-amount .item-no-bottom-border + .item { + border-top: 0; } + +#view-amount .icon-bitpay-card { + background-image: url("../img/icon-bitpay.svg"); } + +#view-amount .icon-amazon { + background-image: url("../img/icon-amazon.svg"); } + +@media (max-width: 480px) { + #view-amount .bitcoin-address { + font-size: 13px; + padding-left: 48px; } + #view-amount .bitcoin-address .icon { + left: 8px; + font-size: 24px; } + #view-amount .bitcoin-address .big-icon-svg { + left: 5px; } + #view-amount .bitcoin-address .big-icon-svg > .bg { + width: 30px; + height: 30px; + box-shadow: none; } } + +@media (max-width: 320px) { + #view-amount .bitcoin-address > span:last-child { + margin-left: -2px; } } + +#view-amount .send-gravatar { + left: 11px; + position: absolute; + top: 10px; } + +#view-amount .amount span input { + display: inline; + width: 120px; } + +#view-amount .amount-pane-recipient { + position: absolute; + top: 95px; + bottom: 0; + width: 100%; + background-color: #fff; + padding: 0 16px; } + #view-amount .amount-pane-recipient .amount-bar { + padding: 24px 0; + font-size: 18px; } + @media (max-height: 480px) { + #view-amount .amount-pane-recipient .amount-bar { + padding: 0px; } } + @media (max-width: 320px) { + #view-amount .amount-pane-recipient .amount-bar { + padding: 0px; } } + #view-amount .amount-pane-recipient .amount-bar .title { + float: left; + padding-top: 10px; color: #445; - border-radius: 3px; - padding: 0 10px; - cursor: pointer; } - @media (max-height: 280px) { - #view-amount .amount .icon-toggle { - margin: 0.1em auto; } } - #view-amount .amount__editable--minimize { - font-size: 22px; } - #view-amount .amount__editable--standard { - font-size: 42px; } - @media (max-height: 480px) { - #view-amount .amount__editable--standard { - font-size: 26px; - padding-top: 10px; } } - #view-amount .amount__editable--placeholder { - color: #9b9bab; } - #view-amount .amount__number { - color: #445; } - #view-amount .amount__currency-toggle { - border: 1px solid #f2f2f2; - color: #445; - border-radius: 3px; - padding: 0 10px; - cursor: pointer; - font-size: .6em; - position: relative; - top: -3px; - line-height: 1; } - @media (max-width: 320px) { - #view-amount .amount__currency-toggle { - line-height: 30px; - height: 30px; } } - #view-amount .amount__currency-toggle-mobile { - border: 1px solid #f2f2f2; - color: #445; - border-radius: 3px; - cursor: pointer; - position: relative; - line-height: 1; } - @media (max-width: 320px) { - #view-amount .amount__currency-toggle-mobile { - line-height: 30px; - height: 30px; } } - #view-amount .amount__results--minimize { - font-size: 12px; } - #view-amount .amount__results--standard { - font-size: 18px; - padding: 10px 0; } - #view-amount .amount__results--placeholder { - color: #9b9bab; } - #view-amount .amount__result { - color: #9b9bab; - font-size: .9em; - line-height: 1; } - @media (max-height: 480px) { - #view-amount .amount__result { - margin-bottom: 0; } } - #view-amount .amount__result-equiv { - color: #667; - font-size: 1.2em; } - @media (max-height: 480px) { - #view-amount .amount__result-equiv { - margin-top: 0; - font-size: 16px; } } - #view-amount .scroll-content { - display: flex; - flex-direction: column; } - #view-amount .scroll-content .send-amount { - flex: 1 1 auto; - display: flex; - flex-direction: column; - justify-content: center; } - #view-amount .scroll-content .send-amount .send-amount-header-footer { - flex: 1 1 auto; - min-height: 20px; } - #view-amount .scroll-content .send-amount .send-amount-header-footer .warning { - font-weight: bold; - font-size: 12px; - padding: 0 6px 6px 6px; - text-align: center; } - #view-amount .scroll-content .send-amount .send-amount-header-footer__max { - float: right; } - #view-amount .scroll-content .send-amount .send-amount-tool { - flex: 0 1 auto; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input { - text-align: center; - position: relative; - padding: 10px 30px; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .text-selectable { - -webkit-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount { - color: #333; - font-weight: bold; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { - font-size: 1.8em; } - @media (min-width: 375px) { - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { - font-size: 2.1em; } } - @media (min-width: 414px) { - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { - font-size: 2.4em; } } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display { - font-size: 1.6em; } - @media (min-width: 375px) { - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display { - font-size: 1.8em; } } - @media (min-width: 414px) { - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display { - font-size: 2em; } } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display { - font-size: 1.2em; } - @media (min-width: 375px) { - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display { - font-size: 1.3em; } } - @media (min-width: 414px) { - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display { - font-size: 1.4em; } } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input { - border: 0; - padding: 0; - white-space: normal; - background: none; - line-height: 1; - box-sizing: content-box; - display: inline-block; - vertical-align: middle; - margin: 0; - height: 1em; - margin-right: 5px; - font-family: 'ProximaNova'; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { - display: inline-block; - vertical-align: middle; - line-height: 1em; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { - margin-right: 5px; - word-break: break-all; - width: 100%; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .alternative-amount { - color: #6F6F70; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .switch-currencies { - position: absolute; - right: 0; - top: 50%; - transform: translate(0, -50%); - padding: 15px; } - #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .switch-currencies img { - width: 18px; } - #view-amount .scroll-content .send-amount-extras { - display: flex; - flex: 0 0 auto; - /* So that if only one item is present, it appears on the right. */ - flex-direction: row-reverse; - font-size: 12px; - align-items: center; - justify-content: space-between; - margin: 0 14px; } - #view-amount .scroll-content .send-amount-extras .available-funds { - color: #6F6F70; - text-align: left; } - #view-amount .scroll-content .send-amount-extras .change-currency { - text-align: right; } - #view-amount .scroll-content .send-amount-extras .warning { - color: #b7664d; } - #view-amount .scroll-content .send-amount-extras .extra { - flex: 1; - line-height: normal; } - #view-amount .scroll-content .send-amount-extras .extra .button { - background: none; - border: none; - border-radius: 0; - color: #000; - font-family: 'ProximaNova'; - font-size: 14px; - line-height: normal; - min-height: auto; - min-width: auto; - padding: 0; } - #view-amount .scroll-content .send-amount-extras .extra .button .icon:before { - font-size: 14px; - line-height: normal; } - #view-amount .scroll-content .send-amount-extras .extra .button span { - display: flex; - align-items: center; - justify-content: center; } - #view-amount .scroll-content .button.no-margin { - margin: 0; } - #view-amount .scroll-content .notification-warning { - display: block; - padding: .75rem 1.25rem; - color: #856404; - background-color: #fff3cd; - border: 1px solid #ffeeba; - line-height: 1.4em; - margin-bottom: 20px; } - #view-amount .scroll-content .keypad-container { - position: relative; - font-size: 18px; - line-height: 2em; } - @media (min-height: 667px) { - #view-amount .scroll-content .keypad-container { - font-size: 24px; } } - @media (max-height: 480px) { - #view-amount .scroll-content .keypad-container { - font-size: 12px; } } - #view-amount .scroll-content .keypad-container .sendmax { - background: #262424; } - #view-amount .scroll-content .keypad-container .sendmax .button { - color: white; - background: black; - border: 1px solid #262424; - border-radius: 0; - font-size: 0.8em; - line-height: 2em; - width: 100%; } - #view-amount .scroll-content .keypad-container .sendmax .button .available-funds-amount { - color: #C9C9C9; } - #view-amount .scroll-content .keypad-container .sendmax .button:active { - background-color: #445; } - #view-amount .scroll-content .keypad-container .keypad { - text-align: center; - font-weight: lighter; - position: absolute; - bottom: 0; - width: 100%; - color: #fff; } - #view-amount .scroll-content .keypad-container .keypad .row { - padding: 0 !important; - margin: 0 !important; } - #view-amount .scroll-content .keypad-container .keypad .row:last-child .col { - padding-bottom: 10px; } - #view-amount .scroll-content .keypad-container .keypad .operator { - background-color: #f2f2f2; - font-weight: normal; - cursor: pointer; } - #view-amount .scroll-content .keypad-container .keypad .operator:active { - background-color: #9b9bab; } - #view-amount .scroll-content .keypad-container .keypad .operator-send { - font-weight: bolder; - color: #fff; - background-color: #494949; - font-size: 36px; - cursor: pointer; } - #view-amount .scroll-content .keypad-container .keypad .operator-send:active { - background-color: #eaeaea; } - #view-amount .scroll-content .keypad-container .keypad .digit { - cursor: pointer; - background-color: #000; - border: 1px solid #262424; - transition: all 0.1s ease; } - #view-amount .scroll-content .keypad-container .keypad .digit:active { - background-color: #445; } - #view-amount .scroll-content .button-primary { - background-color: #fab915; - border-radius: 0; font-weight: bold; } - #view-amount .scroll-content .button-primary[disabled] { - background-color: #667; - opacity: 1; } - #view-amount .warning { - color: #b7664d; } - #view-amount ion-content { - margin-bottom: constant(safe-area-inset-bottom); - /* iOS 11.0 */ - margin-bottom: env(safe-area-inset-bottom); - /* iOS 11.2 */ } + @media (max-height: 480px) { + #view-amount .amount-pane-recipient .amount-bar .title { + padding: 0px; } } + @media (max-height: 480px) { + #view-amount .amount-pane-recipient .amount-bar { + padding-top: 3px; } } + #view-amount .amount-pane-recipient .amount { + display: flex; + flex-direction: column; + justify-content: center; + flex-grow: 1; + position: absolute; + bottom: 254px; + top: 66px; } + #view-amount .amount-pane-recipient .amount .light { + color: #9b9bab; } + @media (max-height: 480px) { + #view-amount .amount-pane-recipient .amount { + top: 45px; } } + @media (max-width: 320px) { + #view-amount .amount-pane-recipient .amount { + bottom: 276px; + top: 60px; } + #view-amount .amount-pane-recipient .amount > div { + display: inline-block; } + #view-amount .amount-pane-recipient .amount > div:first-child { + display: inherit; } } + +#view-amount .amount-pane-no-recipient { + position: absolute; + top: 0; + bottom: 0; + width: 100%; + background-color: #fff; + padding: 0 16px; } + #view-amount .amount-pane-no-recipient .amount-bar { + padding: 24px 0; + font-size: 18px; } + #view-amount .amount-pane-no-recipient .amount-bar .title { + padding-top: 10px; + color: #445; + font-weight: bold; } + #view-amount .amount-pane-no-recipient .amount-bar .title .limits { + margin-top: 10px; + color: #9b9bab; + font-size: 12px; } + #view-amount .amount-pane-no-recipient .amount-bar .title .select { + margin: 10px 1px; } + #view-amount .amount-pane-no-recipient .amount { + display: flex; + flex-direction: column; + justify-content: center; + flex-grow: 1; + position: absolute; + bottom: 254px; + top: 66px; } + #view-amount .amount-pane-no-recipient .amount .light { + color: #9b9bab; } + +#view-amount .amount { + padding-top: 10px; + padding-bottom: 10px; } + #view-amount .amount .icon-toggle { + font-size: 1.2em; + width: auto; + margin: 0.8em auto; + border: 1px solid #f2f2f2; + color: #445; + border-radius: 3px; + padding: 0 10px; + cursor: pointer; } + @media (max-height: 280px) { + #view-amount .amount .icon-toggle { + margin: 0.1em auto; } } + #view-amount .amount__editable--minimize { + font-size: 22px; } + #view-amount .amount__editable--standard { + font-size: 42px; } + @media (max-height: 480px) { + #view-amount .amount__editable--standard { + font-size: 26px; + padding-top: 10px; } } + #view-amount .amount__editable--placeholder { + color: #9b9bab; } + #view-amount .amount__number { + color: #445; } + #view-amount .amount__currency-toggle { + border: 1px solid #f2f2f2; + color: #445; + border-radius: 3px; + padding: 0 10px; + cursor: pointer; + font-size: .6em; + position: relative; + top: -3px; + line-height: 1; } + @media (max-width: 320px) { + #view-amount .amount__currency-toggle { + line-height: 30px; + height: 30px; } } + #view-amount .amount__currency-toggle-mobile { + border: 1px solid #f2f2f2; + color: #445; + border-radius: 3px; + cursor: pointer; + position: relative; + line-height: 1; } + @media (max-width: 320px) { + #view-amount .amount__currency-toggle-mobile { + line-height: 30px; + height: 30px; } } + #view-amount .amount__results--minimize { + font-size: 12px; } + #view-amount .amount__results--standard { + font-size: 18px; + padding: 10px 0; } + #view-amount .amount__results--placeholder { + color: #9b9bab; } + #view-amount .amount__result { + color: #9b9bab; + font-size: .9em; + line-height: 1; } + @media (max-height: 480px) { + #view-amount .amount__result { + margin-bottom: 0; } } + #view-amount .amount__result-equiv { + color: #667; + font-size: 1.2em; } + @media (max-height: 480px) { + #view-amount .amount__result-equiv { + margin-top: 0; + font-size: 16px; } } + +#view-amount .scroll-content { + display: flex; + flex-direction: column; } + #view-amount .scroll-content .send-amount { + flex: 1 1 auto; + display: flex; + flex-direction: column; + justify-content: center; } + #view-amount .scroll-content .send-amount .send-amount-tool { + flex: 0 1 auto; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input { + text-align: center; + position: relative; + padding: 10px 30px; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .text-selectable { + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { + font-size: 1.8em; } + @media (min-width: 375px) { + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { + font-size: 2.1em; } } + @media (min-width: 414px) { + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { + font-size: 2.4em; } } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display { + font-size: 1.6em; } + @media (min-width: 375px) { + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display { + font-size: 1.8em; } } + @media (min-width: 414px) { + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.long .primary-amount-display { + font-size: 2em; } } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display { + font-size: 0.9em; } + @media (min-width: 375px) { + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display { + font-size: 1.3em; } } + @media (min-width: 414px) { + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long input, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .unit, #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount.very-long .primary-amount-display { + font-size: 1.4em; } } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount input { + border: 0; + padding: 0; + white-space: normal; + background: none; + line-height: 1; + box-sizing: content-box; + display: inline-block; + vertical-align: middle; + margin: 0; + height: 1em; + margin-right: 5px; + font-family: 'ProximaNova'; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit, + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { + display: inline-block; + vertical-align: middle; + line-height: 1em; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .unit { + font-weight: bold; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .primary-amount .primary-amount-display { + margin-right: 5px; + word-break: break-all; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .switch-currencies { + position: absolute; + right: 0; + top: 50%; + transform: translate(0, -50%); + padding: 15px; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-tool-input .switch-currencies img { + width: 18px; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-actions { + margin-top: 15px; + display: flex; + align-items: center; + justify-content: center; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-actions .button { + flex: 1 1 auto; + line-height: 1.2em; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-actions .button + .button { + margin-left: 10px; } + #view-amount .scroll-content .send-amount .send-amount-tool .send-amount-actions .button span { + display: flex; + align-items: center; + justify-content: center; } + #view-amount .scroll-content .button.no-margin { + margin: 0; } + #view-amount .scroll-content .notification-warning { + display: block; + padding: .75rem 1.25rem; + color: #856404; + background-color: #fff3cd; + border: 1px solid #ffeeba; + line-height: 1.4em; + margin-bottom: 20px; } + #view-amount .scroll-content .keypad-container { + position: relative; } + #view-amount .scroll-content .keypad-container .keypad { + text-align: center; + font-size: 18px; + font-weight: lighter; + position: absolute; + bottom: 0; + width: 100%; + color: #667; } + @media (min-height: 667px) { + #view-amount .scroll-content .keypad-container .keypad { + font-size: 24px; } } + #view-amount .scroll-content .keypad-container .keypad .row { + padding: 0 !important; + margin: 0 !important; } + #view-amount .scroll-content .keypad-container .keypad .col { + line-height: 38px; } + @media (min-height: 667px) { + #view-amount .scroll-content .keypad-container .keypad .col { + line-height: 45px; } } + #view-amount .scroll-content .keypad-container .keypad .row:last-child .col { + padding-bottom: 10px; } + #view-amount .scroll-content .keypad-container .keypad .operator { + background-color: #f2f2f2; + font-weight: normal; + cursor: pointer; } + #view-amount .scroll-content .keypad-container .keypad .operator:active { + background-color: #9b9bab; } + #view-amount .scroll-content .keypad-container .keypad .operator-send { + font-weight: bolder; + color: #fff; + background-color: #494949; + font-size: 36px; + cursor: pointer; } + #view-amount .scroll-content .keypad-container .keypad .operator-send:active { + background-color: #eaeaea; } + #view-amount .scroll-content .keypad-container .keypad .digit { + cursor: pointer; + border-top: 1px solid #f2f2f2; + border-left: 1px solid #f2f2f2; + transition: all 0.1s ease; } + #view-amount .scroll-content .keypad-container .keypad .digit:active { + background-color: #f2f2f2; } + @media (max-height: 480px) { + #view-amount .scroll-content .keypad-container .keypad { + font-size: 12px; } } #view-confirm { - background-color: #494949; } + background-color: #ffffff; } #view-confirm .item-note { float: none; } #view-confirm .item-note .fee-rate { @@ -10812,13 +10622,6 @@ qrcode { margin-top: -3px; } #view-confirm .toggle { cursor: pointer; } - #view-confirm ion-content { - background-color: #ffffff; } - #view-confirm slide-to-accept, #view-confirm slide-to-accept-success { - margin-bottom: constant(safe-area-inset-bottom); - /* iOS 11.0 */ - margin-bottom: env(safe-area-inset-bottom); - /* iOS 11.2 */ } #copayers-invitation .button-share { color: #fff; @@ -10925,34 +10728,10 @@ qrcode { #tab-home .card-banner { padding: 0; } - #tab-home .card-banner svg { - margin: 40px auto 40px; } #tab-home .card-banner__img { width: 100%; display: block; } -#tab-home .buttons { - display: flex; - flex-direction: row; - justify-content: space-evenly; - margin: 6px auto -12px; - text-align: center; - width: 100%; } - #tab-home .buttons > .col { - padding: 5px 10px; - margin-bottom: 0; } - #tab-home .buttons .button { - border: 2px solid; - border-radius: 47px; - padding: 8px 2px 8px 2px; - text-align: center; - width: 100%; - max-width: 300px; - font-size: 19px; - font-weight: bolder; - min-height: 0; - line-height: 19px; } - #tab-home .wallet-coin-logo { vertical-align: middle; margin-right: 5px; } @@ -11018,10 +10797,6 @@ qrcode { #tab-home .release .title { font-weight: 700; color: #444; } - #tab-home .release .release-notes { - white-space: pre; - white-space: pre-line; - text-align: left; } #tab-home .release .button { width: 100%; border: none; } @@ -11034,14 +10809,6 @@ qrcode { #tab-home .badge { top: 11px; } -.popup-update .popup-buttons { - display: block; } - -.popup-update .popup-buttons .button { - display: block; - min-width: 100% !important; - margin-top: 4px; } - #tab-receive .button-share { color: #fff; box-shadow: none; @@ -11118,8 +10885,6 @@ qrcode { #tab-receive .payment-received-container { margin: 0 20px; } - #tab-receive .payment-received-container svg { - max-height: 400px; } #tab-receive .payment-received-container .payment-received-amount { font-size: 1.8em; display: block; @@ -11186,150 +10951,123 @@ qrcode { #cordova-plugin-qrscanner-still, #cordova-plugin-qrscanner-video-preview { background-color: #fab915 !important; } -#tab-send-header { - width: 100%; } +#tab-send .input input { + width: 100%; + height: auto; } -#tab-send .input { - width: 100%; } - #tab-send .input input { - width: 100%; - height: 57px; - background: #FFF; - border: 1px #D9D9D9 solid; } - #tab-send .input input::placeholder { - color: #DCDCDC; } - #tab-send .input i.left { - padding-left: 15px; } - #tab-send .input i.qr { - cursor: pointer; - cursor: hand; - padding-right: 5px; } +#tab-send .input.item { + height: 55px; } -#tab-send .send-wrapper { - padding: 18px 9px 9px 9px; +#tab-send .input i.left { + padding-left: 15px; } + +#tab-send .input i.qr { + cursor: pointer; + cursor: hand; + padding-right: 5px; } + +#tab-send .qr-scan-icon { + cursor: pointer; + cursor: hand; + border-left: 1px solid #e4e4e4; + padding-left: 10px; } + +#tab-send .qr-icon { + line-height: 20px; } + +#tab-send .zero-state-cta { + padding-bottom: 3vh; + left: 0; } + +#tab-send .send-heading { + font-size: 14px; + font-weight: bold; + padding: 0 0 16px 0; + border: none; } + +#tab-send .send-header-wrapper { + padding: 10px; + background-color: white; + box-shadow: 0px 5px 10px 0px #cccccc; } + +#tab-send .search-wrapper { background-color: #f2f2f2; border-radius: 3px; border: none; } - #tab-send .send-wrapper:after { - display: block; - position: relative; - height: 1px; - background: #DEDEDE; - bottom: 0; - content: ''; - margin: 10px 6px 0px; } - #tab-send .send-wrapper.focus .search-input { - padding-left: 30px; } - #tab-send .send-wrapper.focus .search-input:focus::-webkit-input-placeholder { - opacity: 0; } - #tab-send .send-wrapper .buttons { - margin: auto; - margin-top: 18px; } - #tab-send .send-wrapper .buttons .button { - min-height: 65px; - line-height: 16px; - margin-right: 0px; - width: 95%; - max-width: none; - padding: 2px; } - #tab-send .send-wrapper .buttons .button-clipboard-paste { - margin-left: 0; } - #tab-send .send-wrapper .buttons .button-clipboard-paste .address { - display: none; } - #tab-send .send-wrapper .buttons .button-clipboard-paste .icon { - background: url(../img/icon-clipboard-paste.svg); - width: 15px; - height: 19px; - display: inline-block; - margin-bottom: 4px; } - #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-address, #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-content { - background: #FAB915; - color: #FFF !important; - border: 0; - box-shadow: 0 2px 11px 0 #C1C1C1; } - #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-address .address, #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-content .address { - display: none; } - #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-address .icon, #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-content .icon { - background: url(../img/icon-clipboard-paste-white.svg); } - #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-address.contains-address .address, #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-content.contains-address .address { - display: inline; - border: none; - background-color: transparent; } - #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-address.contains-address .non-address, #tab-send .send-wrapper .buttons .button-clipboard-paste.contains-content.contains-address .non-address { - display: none; } - #tab-send .send-wrapper .buttons .button span { - font-size: 14px; } - #tab-send .send-wrapper .buttons .button img { - height: 16px; - width: auto; - margin: 2px 0 4px; } - #tab-send .send-wrapper .buttons .button-qr { - font-weight: bold; - max-width: none; - width: 100%; - height: 95px; - margin-top: 20px; } - #tab-send .send-wrapper .buttons .button-qr img { - vertical-align: middle; - margin-right: 12px; - width: 43px; - height: 43px; } - #tab-send .send-wrapper .buttons .button-qr span { - font-size: 19px; } + #tab-send .search-wrapper .svg#Bitcoin_Symbol { + width: 14px; } + #tab-send .search-wrapper .svg#Bitcoin_Symbol .st0 { + fill: #cccccc; } + #tab-send .search-wrapper.focus { + background: none; } + #tab-send .search-wrapper.focus .svg#Bitcoin_Symbol { + display: none; } + #tab-send .search-wrapper.focus .search-input { + padding-left: 30px; } + #tab-send .search-wrapper.focus .search-input:focus::-webkit-input-placeholder { + opacity: 0; } + +#tab-send .abs-v-center { + position: absolute; + top: 50%; + transform: translateY(-50%); } #tab-send .search-input { background-color: transparent; padding-left: 30px; } +#tab-send .separator-left { + border-left: 1px solid #d9d9df; + padding-left: 10px; + height: 70%; } + +#tab-send .bitcoin-address { + border-top: none; + padding-bottom: .5rem; } + @media (max-width: 480px) { + #tab-send .bitcoin-address input { + font-size: 14px; } } + #tab-send .bitcoin-address .icon { + line-height: 31px; + padding-top: 2px; + padding-bottom: 1px; } + +#tab-send .show-more { + text-align: center; + padding: 20px; + font-size: 16px; + color: #387ef5; + font-weight: bold; } + #tab-send .sendTip { - padding-top: 5vh; text-align: center; } + #tab-send .sendTip > .item-heading { + margin-top: 10px; + background: 0 none; } + #tab-send .sendTip img { + content: url("../img/app/tab-icons/ico-send-selected.svg"); } #tab-send .sendTip .item { border-style: none; } #tab-send .sendTip > .title { font-size: 20px; + font-weight: bold; color: #445; margin: 20px 10px; } #tab-send .sendTip > .subtitle { font-size: 1rem; line-height: 1.5em; font-weight: 300; - color: #6F6F70; + color: #445; margin: 20px 1em 2.5em; } #tab-send .sendTip .big-icon-svg .bg.green { padding: 0 10px; box-shadow: none; } - #tab-send .sendTip .buttons { - margin-top: 18px; } - #tab-send .sendTip .buttons .button { - font-weight: bold; - font-size: 19px; - line-height: 26px; - padding: 8px 6px; } - #tab-send .sendTip .button-first-contact img { - height: 19px; - width: 19px; - margin-right: 6px; - vertical-align: sub; } - -#tab-send .item-heading { - line-height: 16px; - font-size: 14px; - font-weight: bold; } - #tab-send .item-heading .subtitle { - color: #B5B2B2; - font-size: 12px; - font-weight: 300; } #tab-send .list .item { - font-weight: 600; color: #444; - padding-top: 0.6rem; - padding-bottom: 0.6rem; } - #tab-send .list .item p { - font-weight: normal; } - #tab-send .list .item.item-icon-left { - padding-left: 64px; } + border-top: none; + padding-top: 1.5rem; + padding-bottom: 1.5rem; } #tab-send .list .item .big-icon-svg { left: 5px; } #tab-send .list .item .big-icon-svg > .bg { @@ -11339,7 +11077,7 @@ qrcode { #tab-send .list .item:before { display: block; position: absolute; - width: 100%; + width: 80%; height: 1px; background: rgba(221, 221, 221, 0.3); top: 0; @@ -11358,76 +11096,6 @@ qrcode { #tab-send .scroll { height: 100%; } -#tab-send .card.contacts { - margin: 4px 4px 16px 4px; - border-radius: 6px; - box-shadow: 0px 2px 1px 0 #C1C1C1; } - #tab-send .card.contacts .gravatar { - border-radius: 30px; - height: 40px; - width: 40px; } - -@media only screen and (min-device-width: 320px) and (max-device-width: 568px) { - #tab-send .send-wrapper .buttons .button-qr { - height: 60px; } - #tab-send .send-wrapper .buttons .button-qr span { - font-size: 16px; } } - -#wallet-origin-destination .header--request { - padding: 30px 24px; - width: 100%; - height: 139px; - background-color: #fff; } - #wallet-origin-destination .header--request__title { - width: 46px; - height: 20px; - font-size: 16px; - font-weight: 600; - letter-spacing: -0.4px; - color: #000000; } - #wallet-origin-destination .header--request__amount { - font-size: 29px; - font-weight: 600; - letter-spacing: -0.7px; - color: #000000; - margin: 11px 0 2px; } - #wallet-origin-destination .header--request__amount-alt { - opacity: 0.45; - font-size: 16px; - font-weight: 600; - letter-spacing: -0.4px; - color: #000000; } - -#wallet-origin-destination .wallets-header { - margin: 20px 14px 0px; } - #wallet-origin-destination .wallets-header .title { - font-size: 16px; - font-weight: bold; - color: #445; - margin-bottom: -12px; } - -#wallet-origin-destination .card { - font-size: 12px; - margin: 20px 14px 0px; } - #wallet-origin-destination .card .item-heading { - font-weight: 600; } - #wallet-origin-destination .card .item-heading .subtitle { - font-size: 12px; } - #wallet-origin-destination .card-insufficient .wallet { - opacity: 0.4; } - #wallet-origin-destination .card-insufficient .item-heading { - font-size: 12px; } - #wallet-origin-destination .card-insufficient .item-heading > div { - display: inline-block; - vertical-align: text-bottom; } - #wallet-origin-destination .card-insufficient__dot { - display: inline-block; - width: 16px; - height: 16px; - background-color: #ec5959; - border-radius: 8px; - margin: 2px 6px 2px 2px; } - .settings .icon-bitpay { background-image: url("../img/icon-bitpay.svg"); } @@ -11936,21 +11604,12 @@ qrcode { fill: white; } #walletDetails .bp-content { position: relative; - height: 100%; - height: calc(100% - env(safe-area-inset-bottom) * 2); } + height: 100%; } #walletDetails .bp-content.status-bar { - margin-top: 20px; - margin-top: env(safe-area-inset-top); } - #walletDetails .bp-content.collapse ion-content { - margin-top: 40px; } - #walletDetails .bp-content.collapse .amount__scale, #walletDetails .bp-content.collapse .amount__error { - -webkit-transform: scale3d(0.5, 0.5, 0.5) translateY(0px); - transform: scale3d(0.5, 0.5, 0.5) translateY(0px); } - #walletDetails .bp-content.collapse .amount-alternative, #walletDetails .bp-content.collapse .send-receive-buttons, #walletDetails .bp-content.collapse .wallet-details-wallet-info { - opacity: 0; } + margin-top: 20px; } #walletDetails .bar-header { border: 0; - background: #eeb640; } + background: none; } #walletDetails .bar-header .title, #walletDetails .bar-header .button { color: #fff; } #walletDetails .bar-header .button { @@ -11959,13 +11618,9 @@ qrcode { background-color: inherit !important; } #walletDetails ion-content { padding-top: 0; - top: 0; - transition: all 0.25s ease-in-out; - margin-top: 185px; - margin-bottom: 16px; } - @media only screen and (max-height: 500px) { - #walletDetails ion-content { - margin-top: 165px; } } + top: 0; } + #walletDetails ion-content.collapsible { + margin-top: 210px; } #walletDetails ion-content .scroll { background: #f8f8f9; min-height: 300px; } @@ -11990,51 +11645,23 @@ qrcode { height: 200px; -webkit-transform: translateY(100px); transform: translateY(100px); } - #walletDetails .amount-wrapper .send-receive-buttons { - display: flex; - flex-direction: row; - justify-content: space-evenly; - width: 100%; - position: absolute; - bottom: 20px; - transition: all 0.25s ease-in-out; } - #walletDetails .amount-wrapper .send-receive-buttons > .col { - padding: 5px 10px; - margin-bottom: 0; } - #walletDetails .amount-wrapper .send-receive-buttons .button { - border: 2px solid; - border-radius: 47px; - padding: 6px 2px 6px 2px; - text-align: center; - width: 100%; - max-width: 300px; - font-size: 19px; - font-weight: bolder; - min-height: 0; - line-height: 19px; } #walletDetails .amount { - align-items: center; - color: #fff; - display: block; - height: 230px; - justify-content: center; - padding-top: 40px; + width: 100%; text-align: center; - transition: all 0.25s ease-in-out; - width: 100%; } - @media only screen and (max-height: 500px) { - #walletDetails .amount { - height: 210px; } } + color: #fff; + height: 210px; + padding-top: 40px; + display: block; + align-items: center; + justify-content: center; } #walletDetails .amount__balance { -webkit-transform: scale3d(1, 1, 1) translateY(45px); - transform: scale3d(1, 1, 1) translateY(45px); - transition: all 0.25s ease-in-out; } + transform: scale3d(1, 1, 1) translateY(45px); } #walletDetails .amount__updating { z-index: 999; margin-top: -2.1rem; } #walletDetails .amount-alternative { - line-height: 36px; - transition: all 0.25s ease-in-out; } + line-height: 36px; } #walletDetails .amount__button-balance { background-color: transparent; border: 1px solid rgba(255, 255, 255, 0.25); @@ -12044,8 +11671,7 @@ qrcode { vertical-align: middle; } #walletDetails .amount__error { font-size: 14px; - padding: 35px 20px; - opacity: 1; } + padding: 35px 20px; } #walletDetails .no-alternative { padding-top: 45px; } #walletDetails .item.item-footer { @@ -12110,9 +11736,7 @@ a.item { font-size: 0.9em; } .loading-wallet svg { - margin-top: 0; - width: 16px; - height: 16px; } + margin-top: 0; } #advanced-settings .list .item:before { display: block; @@ -12139,75 +11763,6 @@ a.item { color: #667; font-size: 0.9em; } -#shapeshift .swap-image { - width: auto; - max-width: 400px; - max-height: 25vh; } - -#shapeshift .empty-case { - padding-top: 5vh; - text-align: center; } - #shapeshift .empty-case .item { - border-style: none; } - #shapeshift .empty-case > .title { - font-size: 20px; - color: #445; - margin: 20px 10px; } - #shapeshift .empty-case > .subtitle { - font-size: 1rem; - line-height: 1.5em; - font-weight: 300; - color: #6F6F70; - margin: 20px 1em 2.5em; } - #shapeshift .empty-case .big-icon-svg .bg.green { - padding: 0 10px; - box-shadow: none; } - #shapeshift .empty-case .buttons { - margin-top: 18px; } - #shapeshift .empty-case .buttons .button { - font-weight: bold; - font-size: 19px; - line-height: 26px; - padding: 8px 6px; } - #shapeshift .empty-case .button-first-contact img { - height: 19px; - width: 19px; - margin-right: 6px; - vertical-align: sub; } - -#shapeshift .button-shapeshift { - border-color: #FFF; - background-color: #243F5D; - color: #FFF; - border: 0px; - box-shadow: 0 2px 11px 0 #C1C1C1; } - #shapeshift .button-shapeshift:hover { - color: #FFF; - text-decoration: none; } - #shapeshift .button-shapeshift.active, #shapeshift .button-shapeshift.activated { - border-color: #FFF; - background-color: #606060; } - #shapeshift .button-shapeshift.button-clear { - border-color: transparent; - background: none; - box-shadow: none; - color: #FFF; } - #shapeshift .button-shapeshift.button-icon { - border-color: transparent; - background: none; } - #shapeshift .button-shapeshift.button-outline { - border-color: #C1C1C1; - background: transparent; - color: #C1C1C1; } - #shapeshift .button-shapeshift.button-outline.active, #shapeshift .button-shapeshift.button-outline.activated { - background-color: #C1C1C1; - box-shadow: none; - color: #fff; } - -.header.shapeshift { - background: url(../img/shapeshiftbg.jpg) center center repeat #28394d; - opacity: 0.99; } - #bitpayCard { background: white; } #bitpayCard .status-label { @@ -12656,6 +12211,7 @@ a.item { position: relative; height: 70px; border-color: #fab915; + background-color: #fab915; padding-top: 20px; margin-bottom: 50px; text-align: center; } @@ -13457,13 +13013,74 @@ a.item { .onboarding-illustration-backup-warning { background-image: url(../img/app/backup-warning.svg); } -#share-app { +#rate-card .item-heading { + font-weight: 700; } + +#rate-card .row { + border: none; } + +#rate-card .item-icon-right { + margin: 0; } + +#rate-card .feedback-flow-button { + margin-bottom: 20px; } + +#rate-card .icon-svg > img { + height: 1.8rem; + margin-bottom: 5px; } + +#send-feedback { + background-color: #ffffff; } + #send-feedback .row { + border: none; } + #send-feedback .skip { + color: rgba(255, 255, 255, 0.3); } + #send-feedback .feedback-heading { + padding-top: 20px; } + #send-feedback .feedback-title { + padding-left: 10px; + font-size: 20px; + font-weight: bold; + color: #445; } + #send-feedback .rating { + text-align: right; + padding-right: 15px; } + #send-feedback .comment { + padding: 0 20px 20px; + font-size: 1rem; + line-height: 1.5em; + font-weight: 300; + color: #445; } + #send-feedback .user-feedback { + border-top: 1px solid #f2f2f2; + border-bottom: 1px solid #f2f2f2; + padding: 20px; + width: 100%; + margin-bottom: 20px; + -webkit-appearance: none; } + #send-feedback .send-feedback-star { + height: 1rem; + margin-left: 5px; } + #send-feedback .form-fade-in { + opacity: 0; + animation-name: fadeIn; + animation-duration: .5s; + animation-fill-mode: forwards; + animation-timing-function: ease-in; } + +@keyframes fadeIn { + from { + opacity: 0; } + to { + opacity: 1; } } + +#complete { background-color: #fff; } - #share-app .share-app-layout { + #complete .complete-layout { display: flex; flex-direction: column; height: 100%; } - #share-app .share-app-layout__expand { + #complete .complete-layout__expand { display: flex; flex-direction: column; flex-grow: 1; @@ -13472,27 +13089,36 @@ a.item { text-align: center; opacity: 0; transition: opacity .3s; } - #share-app .share-app-layout__expand.fade-in { + #complete .complete-layout__expand.fade-in { opacity: 1; } - #share-app .share-the-love-illustration { + #complete .share-the-love-illustration { width: 5rem; margin: 1rem; } - #share-app .subtitle { + #complete .send-feedback-illustration { + height: 16rem; + margin: 1rem; } + #complete .feedback-title { + font-size: 20px; + font-weight: bold; + color: #445; + margin: 20px 10px; + text-align: center; } + #complete .subtitle { padding: 10px 30px 20px; text-align: center; color: #667; } - #share-app .icon-svg > img { + #complete .icon-svg > img { height: 16rem; width: 16rem; margin: 10px; } - #share-app .socialsharing-icon { + #complete .socialsharing-icon { display: inline-block; width: 60px; } - #share-app .addressbook-icon-svg { + #complete .addressbook-icon-svg { display: inline-block; width: 50px; height: 50px; } - #share-app .share-buttons { + #complete .share-buttons { padding: 50px 10px 30px; background-color: #f2f2f2; text-align: center; @@ -13504,7 +13130,7 @@ a.item { animation-fill-mode: forwards; animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1); animation-delay: .2s; } - #share-app .share-buttons__action { + #complete .share-buttons__action { display: inline-block; color: #667; font-size: .9rem; @@ -13522,6 +13148,38 @@ a.item { transform: translateY(0); opacity: 1; } } +#rate-app { + background-color: #ffffff; + text-align: center; } + #rate-app .skip-rating { + color: #445; + position: absolute; + top: 5px; + right: 10px; + padding: 15px; } + #rate-app .icon-svg > img { + width: 80px; + height: 80px; + margin-top: 15px; } + #rate-app .feedback-title { + font-size: 20px; + font-weight: bold; + color: #445; + margin: 80px 50px 10px; + text-align: center; } + #rate-app .share-the-love-illustration { + width: 5rem; + margin: 1rem; } + #rate-app .subtitle { + padding: 10px 30px 20px 40px; + color: #667; } + #rate-app .rate-buttons { + bottom: 0; + width: 100%; + position: absolute; + background-color: #f2f2f2; + padding: 30px 0 15px; } + action-sheet .bp-action-sheet__sheet { background: #fff; width: calc(100% + 1px); @@ -13855,7 +13513,6 @@ click-to-accept { height: 92px; width: 100%; } click-to-accept .click-to-accept__button.button.button-primary.button-standard { - border-radius: 0; height: 100%; max-width: 9999px; width: 100%; } @@ -13962,8 +13619,6 @@ slide-to-accept { height: 92px; width: 100%; background: #494949; } - slide-to-accept .slide .button { - border-radius: 0; } slide-to-accept .slide__listener { height: 100%; width: 100%; @@ -14090,6 +13745,11 @@ slide-to-accept-success { display: flex; align-items: center; justify-content: center; } + slide-to-accept-success .slide-success__windows-background { + background: #11D1A6; + height: 100%; + width: 100%; + position: fixed; } slide-to-accept-success .slide-success__background { height: 10vmax; width: 10vmax; @@ -14106,10 +13766,8 @@ slide-to-accept-success { slide-to-accept-success .slide-success__content { position: relative; z-index: 1; - margin-top: -10vh; } + margin-top: -20vh; } slide-to-accept-success .slide-success__content > img { - width: 45vw; - max-width: 166px; margin-bottom: 1.8rem; -webkit-transform: translateY(5rem); transform: translateY(5rem); @@ -14122,7 +13780,7 @@ slide-to-accept-success { opacity: 1; } slide-to-accept-success .slide-success__content__header { color: #FFFFFF; - font-size: 29px; + font-size: 26px; -webkit-transform: translateY(5rem); transform: translateY(5rem); opacity: 0; @@ -14132,22 +13790,6 @@ slide-to-accept-success { -webkit-transform: translateY(0); transform: translateY(0); opacity: 1; } - slide-to-accept-success .slide-success__content__share { - transition: transform 400ms ease, opacity 400ms ease; - transition-delay: 600ms; - opacity: 0; - margin-top: 15vh; } - slide-to-accept-success .slide-success__content__share span { - color: #FFF; - font-size: 22px; - height: 28px; } - slide-to-accept-success .slide-success__content__share img { - height: 28px; - width: auto; - vertical-align: bottom; - margin-right: 4px; } - slide-to-accept-success .slide-success__content__share.reveal { - opacity: 0.79; } slide-to-accept-success .slide-success__footer { position: absolute; left: 0; @@ -14158,11 +13800,7 @@ slide-to-accept-success { transform: translateY(5rem); opacity: 0; transition: transform 400ms ease, opacity 400ms ease; - transition-delay: 250ms; - margin-bottom: constant(safe-area-inset-bottom); - /* iOS 11.0 */ - margin-bottom: env(safe-area-inset-bottom); - /* iOS 11.2 */ } + transition-delay: 250ms; } slide-to-accept-success .slide-success__footer.reveal { -webkit-transform: translateY(0); transform: translateY(0); @@ -14170,11 +13808,11 @@ slide-to-accept-success { slide-to-accept-success .slide-success__footer__btn { display: block; color: #FFFFFF; - font-size: 22px; + font-size: 18px; font-weight: 600; letter-spacing: 2.86px; - padding: 2rem 0 2.1rem; - border-top: 1px solid rgba(255, 255, 255, 0.25); + padding: 1rem 0 1.1rem; + border-top: 1px solid rgba(255, 255, 255, 0.45); cursor: pointer; } #tx-details .action-created.action-accepted { @@ -14220,16 +13858,16 @@ slide-to-accept-success { line-height: 30px; } #txp-details .head .amount-label .amount, #view-confirm .head .amount-label .amount { - font-size: 16px; - color: #9B9B9B; - font-family: "Roboto-Light"; } - #txp-details .head .amount-label .alternative, - #view-confirm .head .amount-label .alternative { font-size: 38px; margin-bottom: .5rem; } - #txp-details .head .amount-label .alternative > .unit, - #view-confirm .head .amount-label .alternative > .unit { + #txp-details .head .amount-label .amount > .unit, + #view-confirm .head .amount-label .amount > .unit { font-family: "Roboto-Light"; } + #txp-details .head .amount-label .alternative, + #view-confirm .head .amount-label .alternative { + font-size: 16px; + font-family: "Roboto-Light"; + color: #9B9B9B; } #txp-details .item, #view-confirm .item { border-color: #EFEFEF; } @@ -14517,10 +14155,6 @@ wallet-selector .subheader { font-weight: bold; padding-bottom: 10px; border-bottom: 1px solid #EFEFEF; } - wallet-selector .subheader .subtitle { - color: #667; - font-size: 12px; - font-weight: 300; } wallet-selector .subheader .wallet-coin-logo { vertical-align: middle; margin-right: 5px; } @@ -15116,10 +14750,17 @@ account-selector { height: 100%; } #custom-amount .address .qr-code { text-align: center; - margin-top: 6px; } - #custom-amount .address .qr-code qrcode canvas { - height: 30vh; - max-height: 220px; } + margin-top: 24vh; + margin-bottom: 7vh; } + @media (max-height: 800px) { + #custom-amount .address .qr-code { + margin-top: 18vh; } } + @media (max-height: 700px) { + #custom-amount .address .qr-code { + margin-top: 14vh; } } + @media (max-height: 600px) { + #custom-amount .address .qr-code { + margin-top: 8vh; } } #custom-amount .address .info { position: absolute; width: 100%; @@ -15159,28 +14800,6 @@ account-selector { margin-left: 10px; } #custom-amount .address .address-types { text-align: center; } - #custom-amount .address .amount { - margin-top: 20vh; - margin-bottom: 4vh; - width: 100%; - text-align: center; - display: block; - align-items: center; - justify-content: center; } - @media (max-height: 800px) { - #custom-amount .address .amount { - margin-top: 12vh; - margin-bottom: 6vh; } } - @media (max-height: 700px) { - #custom-amount .address .amount { - margin-top: 10vh; - margin-bottom: 4vh; } } - @media (max-height: 600px) { - #custom-amount .address .amount { - margin-top: 6vh; - margin-bottom: 2vh; } } - #custom-amount .address .amount-alternative { - line-height: 36px; } #pin { background-color: #FAFAFA; @@ -15395,223 +15014,10 @@ log-options #check-bar .checkbox-icon { #cash-scan a { cursor: pointer; } -#view-review slide-to-accept, #view-review slide-to-accept-success { - margin-bottom: constant(safe-area-inset-bottom); - /* iOS 11.0 */ - margin-bottom: env(safe-area-inset-bottom); - /* iOS 11.2 */ } - -#view-review .fee-summary { - bottom: 92px; - bottom: calc(92px + constant(safe-area-inset-bottom)); - /* iOS 11.0 */ - bottom: calc(92px + env(safe-area-inset-bottom)); - /* iOS 11.2 */ - position: absolute; } - -#view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner { - box-shadow: none; } - -#view-review .warning { - color: #b7664d; } - .gravatar { border-radius: 3px; display: inline-block; } -.elastic { - width: 100%; - font-size: 14px; } - -/* -* Extends Ionic v1 item -*/ -.item.item-compact { - padding: 11px 13px; } - -.item.item-gutterless { - padding: 0; } - -.item .item-content.item-content-avatar { - min-height: 69px; - padding: 13px 11px 13px 68px; } - .item .item-content.item-content-avatar > img:first-child, - .item .item-content.item-content-avatar > i:first-child { - position: absolute; - max-width: 40px; - max-height: 40px; - width: 100%; - height: 100%; - border-radius: 50%; - left: 13px; - top: 50%; - padding: 0; - -webkit-transform: translate(0, -50%); - transform: translate(0, -50%); } - -.item .item-content.item-content-compact { - min-height: 0; - padding: 13px 11px; } - -.item .item-content .highlight { - color: #FAB915; } - -.item .item-content + .item-content { - padding-top: 0; } - -/* -* Extends Ionic v1 ion-content -*/ -ion-content.bg-neutral { - background-color: #F2F2F2; } - -ion-content.padded-bottom-cta { - bottom: 92px; } - -ion-content.padded-bottom-cta-with-summary { - bottom: 134px; } - -.card.card-gutter-compact { - margin: 10px 12px; } - -.header { - padding: 29px 12px 61px; - background-color: #fab915; - color: #FFFFFF; } - .header.btc { - background-color: #535353; } - .header .title { - font-size: 18px; - font-weight: 400; - line-height: 1em; - color: #FFFFFF; - text-align: center; } - .header .title + .content { - margin-top: 23px; } - .header .content { - text-align: center; } - .header .content p { - margin: 0; - line-height: 1em; - font-size: 18px; } - .header .content p.large { - font-size: 29px; - font-weight: 600; } - .header .content p + p { - margin-top: 8px; } - -.content-frame.negative-top { - margin-top: -40px; } - .content-frame.negative-top .card:first-child { - margin-top: 0; } - -.address-frame { - background-color: #F8F8F8; - border: 0.5px solid #EDEBEB; - border-radius: 3px; - padding: 9px; - text-align: center; - font-size: 14px; - overflow: hidden; - text-overflow: ellipsis; } - .address-frame.expanded { - white-space: normal; - text-overflow: clip; } - .address-frame .prefix { - color: #000000; } - .address-frame .mid { - color: #919191; } - .address-frame .suffix { - color: #000000; } - -.action-minor { - margin: 20px 14px; - font-size: 14px; } - .action-minor.mt-negative { - margin-top: 0; } - .action-minor.text-right { - text-align: right; } - .action-minor > .action-icon { - width: 15px; - height: 15px; - vertical-align: middle; - margin-right: 3px; } - .action-minor > .action-text { - vertical-align: middle; - color: #444444; } - -.expand-content-frame { - position: relative; } - .expand-content-frame .expand-content-trigger { - position: absolute; - top: 0; - transition: opacity 0.3s ease; - right: 0; } - .expand-content-frame .expand-content-trigger.expand-content-revealed { - opacity: 0; } - .expand-content-frame .expand-content { - opacity: 0; - transform-origin: 100% 0%; - transform: scale(0, 0); - transition: opacity 0.3s ease, transform 0.3s ease; } - .expand-content-frame .expand-content.expand-content-revealed { - opacity: 1; - transform: scale(1, 1); } - -.fee-summary { - background-color: #F2F2F2; - box-sizing: border-box; - display: flex; - flex-direction: column; - padding: 5px 12px 15px; - position: relative; - width: 100%; } - .fee-summary:before { - content: ''; - position: absolute; - left: 0; - top: -15px; - width: 100%; - height: 15px; - background: linear-gradient(to bottom, rgba(242, 242, 242, 0) 0%, #f2f2f2 100%); } - .fee-summary .amount { - width: 100%; } - .fee-summary .amount .fee-fiat { - display: inline; } - .fee-summary .amount .fee-fiat.positive { - color: #70955F; } - .fee-summary .amount .fee-fiat.negative { - color: #C24633; } - .fee-summary .amount .fee-crypto { - color: #A7A7A7; - float: right; } - -.formatted-amount { - display: inline-block; } - .formatted-amount .start, - .formatted-amount .middle, - .formatted-amount .end, - .formatted-amount .currency { - display: inline-block; } - .formatted-amount .start { - font-size: 1em; } - .formatted-amount .middle { - font-size: 0.7857em; - margin-left: 5px; } - .formatted-amount .end { - font-size: 0.7857em; - margin-left: 5px; } - .formatted-amount.size-equal .middle, - .formatted-amount.size-equal .end { - font-size: 1em; } - .formatted-amount .currency { - font-size: 1em; - margin-left: 5px; - text-transform: uppercase; } - -.wallet-balance-directive { - display: inline-block; } - /* This is for rules that don't yet have a home. * Our goal is to delete this file. Search the regex: /class=".*CLASS.*?"/ */ @@ -15793,9 +15199,6 @@ input[type=number]::-webkit-inner-spin-button, input[type=number]::-webkit-outer .size-24 { font-size: 24px; } -.size-25 { - font-size: 25px; } - .size-28 { font-size: 28px; } @@ -15970,6 +15373,3 @@ input[type=file] { .white-space-initial { white-space: initial; } - -.height-spacer { - height: 15px; } diff --git a/www/img/bitpay_banner.svg b/www/img/bitpay_banner.svg deleted file mode 100644 index cf5829899..000000000 --- a/www/img/bitpay_banner.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Artboard - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/www/img/egifter_banner.png b/www/img/egifter_banner.png deleted file mode 100644 index cb2e7c11e..000000000 Binary files a/www/img/egifter_banner.png and /dev/null differ diff --git a/www/img/icon-alternative-currency-black.svg b/www/img/icon-alternative-currency-black.svg deleted file mode 100644 index e9b175256..000000000 --- a/www/img/icon-alternative-currency-black.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - 3A719124-019D-470F-908A-5D61F117A295 - Created with sketchtool. - - - - - - - - - - - - - - - - - diff --git a/www/img/icon-bookmark.svg b/www/img/icon-bookmark.svg deleted file mode 100644 index 5db1f9047..000000000 --- a/www/img/icon-bookmark.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/www/img/icon-egifter.png b/www/img/icon-egifter.png deleted file mode 100644 index 42ebb25c5..000000000 Binary files a/www/img/icon-egifter.png and /dev/null differ diff --git a/www/img/icon-sent-successful.svg b/www/img/icon-sent-successful.svg deleted file mode 100644 index 070357ddf..000000000 --- a/www/img/icon-sent-successful.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/www/img/icon-share-white.svg b/www/img/icon-share-white.svg deleted file mode 100644 index eeb3e7b6b..000000000 --- a/www/img/icon-share-white.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/www/img/shapeshift_swap.png b/www/img/shapeshift_swap.png deleted file mode 100644 index 83905b751..000000000 Binary files a/www/img/shapeshift_swap.png and /dev/null differ diff --git a/www/views/amount.html b/www/views/amount.html index 51397f3bf..af4e9d55c 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -1,100 +1,82 @@ - {{'Enter Amount' | translate}} + {{'Enter amount' | translate}} - + - + +
-
-
- Min: {{vm.minAmount}} Max: {{vm.maxAmount}} + +
+
+ Minimum amount: {{minShapeshiftAmount}}
+ Maximum amount: {{maxShapeshiftAmount}}
- - {{vm.amount || '0'}} {{vm.unit}} - + ng-class="{long: amountModel.amount.length > 5, 'very-long': amountModel.amount.length > 10}"> + {{ amountModel.amount || 0 }}{{unit}}
- + {{globalResult}} {{unit}}
- {{vm.alternativeAmount || '0.00'}} {{vm.alternativeUnit}} + {{alternativeAmount || '0.00'}} {{alternativeUnit}}
-
+
-
-
- {{vm.errorMessage}} -
+
+ +
-
-
- -
-
-
-
- Available Funds: -
-
-
- -
- -
+
-
7
-
8
-
9
+
7
+
8
+
9
-
4
-
5
-
6
+
4
+
5
+
6
-
1
-
2
-
3
+
1
+
2
+
3
-
.
-
0
-
+
.
+
0
+
-
-
- -
- -
-
-
- -
- -
-
-
- +
@@ -71,6 +57,12 @@ {{address}}
+
+ Amount + + {{amountUnitStr}} - {{altAmountStr}} + +
diff --git a/www/views/includes/community.html b/www/views/includes/community.html index ad7dcb169..86841a77c 100644 --- a/www/views/includes/community.html +++ b/www/views/includes/community.html @@ -26,7 +26,7 @@
- Share the Wallet App + Share the Wallet App
diff --git a/www/views/includes/formatted-amount.html b/www/views/includes/formatted-amount.html deleted file mode 100644 index 45451a718..000000000 --- a/www/views/includes/formatted-amount.html +++ /dev/null @@ -1,4 +0,0 @@ -
- {{start}}{{middle}}{{end}}{{vm.currency}} -
\ No newline at end of file diff --git a/www/views/includes/incomingDataMenu.html b/www/views/includes/incomingDataMenu.html index e60d7e956..ca4b78dfc 100644 --- a/www/views/includes/incomingDataMenu.html +++ b/www/views/includes/incomingDataMenu.html @@ -9,21 +9,21 @@
- {{data.original}} + {{data}}
- +
Add as a contact
 - +
Send payment to this address
 - +
Copy to clipboard
@@ -38,11 +38,11 @@
Text
- {{data.original}} + {{data}}
- +
Copy to clipboard
@@ -57,40 +57,16 @@
Private Key
- {{data.original}} + {{data}}
- +
Sweep paper wallet
 - - -
Copy to clipboard
- - - - Cancel - - - -
- - -
- - {{service.title || service.name}} - - - +
diff --git a/www/views/includes/slideToAcceptSuccess.html b/www/views/includes/slideToAcceptSuccess.html index 9995001ae..923eab25c 100644 --- a/www/views/includes/slideToAcceptSuccess.html +++ b/www/views/includes/slideToAcceptSuccess.html @@ -1,16 +1,13 @@
+ ng-class="{'fill-screen': fillScreen, 'slide-success__windows-background': isWindowsPhoneApp}">
- +
Payment Sent
-
diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html index 82391bfa2..4a1f07aaf 100644 --- a/www/views/includes/txp.html +++ b/www/views/includes/txp.html @@ -24,7 +24,7 @@ (possible double spend) - – + – {{tx.amountStr}}
diff --git a/www/views/includes/wallet-balance.html b/www/views/includes/wallet-balance.html deleted file mode 100644 index 0818bf343..000000000 --- a/www/views/includes/wallet-balance.html +++ /dev/null @@ -1,3 +0,0 @@ -
- {{· (cachedBalanceUpdatedOn * 1000 | amTimeAgo)}} -
\ No newline at end of file diff --git a/www/views/includes/walletActivity.html b/www/views/includes/walletActivity.html index e1fdb504f..3a2b78ab1 100644 --- a/www/views/includes/walletActivity.html +++ b/www/views/includes/walletActivity.html @@ -10,7 +10,7 @@
Payment Sent
-
@@ -19,7 +19,7 @@
Payment Received
- + {{notification.amountStr}}
@@ -27,7 +27,7 @@ Proposal Deleted: {{notification.message}}
- : + {{notification.amountStr}}:
@@ -35,7 +35,7 @@ Proposal Rejected: {{notification.message}}
- : + {{notification.amountStr}}:
@@ -43,7 +43,7 @@ New Proposal: {{notification.message}}
- + {{notification.amountStr}}
@@ -51,7 +51,7 @@ Proposal Accepted: {{notification.message}}
- + {{notification.amountStr}}
diff --git a/www/views/includes/walletHistory.html b/www/views/includes/walletHistory.html index 3be30c2b1..4a40e93d8 100644 --- a/www/views/includes/walletHistory.html +++ b/www/views/includes/walletHistory.html @@ -64,16 +64,17 @@ + – (possible double spend) - + {{btx.amountValueStr}} {{btx.amountUnitStr}}
- + {{btx.alternativeAmountStr}}
diff --git a/www/views/includes/walletInfo.html b/www/views/includes/walletInfo.html index f97ebf9ed..1680d2c2c 100644 --- a/www/views/includes/walletInfo.html +++ b/www/views/includes/walletInfo.html @@ -3,9 +3,9 @@ Tap to recreate Tap to retry
-↻ - +↻ +
Auditable diff --git a/www/views/includes/walletList.html b/www/views/includes/walletList.html index 2ad8f3e81..f7a061740 100644 --- a/www/views/includes/walletList.html +++ b/www/views/includes/walletList.html @@ -7,12 +7,8 @@ Incomplete - - {{(!wallet.status.totalBalanceStr && wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '')}} - - - {{( !wallet.status.totalBalanceAlternative && wallet.cachedBalance ? (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' )}} - + {{wallet.status.totalBalanceStr ? wallet.status.totalBalanceStr : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} + {{wallet.status.totalBalanceAlternative ? wallet.status.totalBalanceAlternative : ( wallet.cachedBalance ? wallet.cachedBalance + (wallet.cachedBalanceUpdatedOn ? ' · ' + ( wallet.cachedBalanceUpdatedOn * 1000 | amTimeAgo) : '') : '' ) }} {{wallet.status.alternativeIsoCode}} Scanning funds... [Balance Hidden] diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html index 237f5ace4..97dfeb552 100644 --- a/www/views/includes/walletSelector.html +++ b/www/views/includes/walletSelector.html @@ -27,8 +27,8 @@ Incomplete - - + {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} + {{wallet.status.availableBalanceStr}} [Balance Hidden] @@ -58,8 +58,8 @@ Incomplete - - + {{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} + {{wallet.status.availableBalanceStr}} [Balance Hidden] diff --git a/www/views/modals/altCurrency.html b/www/views/modals/altCurrency.html index 3ab5a884f..af8ecb083 100644 --- a/www/views/modals/altCurrency.html +++ b/www/views/modals/altCurrency.html @@ -3,7 +3,7 @@
{{'Alternative Currency'|translate}}
- @@ -11,23 +11,23 @@
-
- {{lastUsedAltCurrency.name}} {{lastUsedAltCurrency.isoCode}} +
+ {{lastUsedAltCurrency.name}} {{lastUsedAltCurrency.isoCode}}
-
{{altCurrency.name}} {{altCurrency.isoCode}} +
{{altCurrency.name}} {{altCurrency.isoCode}}
diff --git a/www/views/paperWallet.html b/www/views/paperWallet.html index 26415a5d0..a8d3d2ee4 100644 --- a/www/views/paperWallet.html +++ b/www/views/paperWallet.html @@ -1,6 +1,6 @@ - {{'Sweep Paper Wallet' | translate}} + {{'Sweep paper wallet' | translate}} @@ -45,19 +45,19 @@
- No Bitcoin Cash wallet to transfer funds to found. + No Bitcoin Cash wallet to transfer funds to found.
-

No Bitcoin Cash found.

+

No Bitcoin Cash found

-

Bitcoin Core found:

+

Bitcoin found:

{{btcBalanceText}}
@@ -95,13 +95,13 @@
- No Bitcoin Core wallet to transfer funds to found. + No Bitcoin wallet to transfer funds to found.
-

No Bitcoin Core found.

+

No Bitcoin found

- {{'Price Display'|translate}} + {{'Price display'|translate}}
- - Fiat + + fiat - - Cryptocurrency + + cryptocurrency
diff --git a/www/views/review.html b/www/views/review.html deleted file mode 100644 index 056580738..000000000 --- a/www/views/review.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - {{'Review Transaction' | translate}} - - - - - -
-
-
-

{{vm.sendingTitle}}

-

-

-
-
- -
-
-
From:
-
-
- -
- -

{{vm.originWallet.name}} ({{vm.origin.currency}})

-

{{vm.origin.balanceAmount}} {{vm.origin.balanceCurrency}}

-
-
-
- -
-
To:
-
-
- - -
- -

{{vm.destination.name}} ({{vm.destination.currency}})

-

{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}

-
-
- - -

{{vm.destination.name}}

-

Payment expires: {{vm.remainingTimeStr}}

-

Payment request has expired

-
-
-
- - {{vm.destination.address.substring(0,5)}}{{vm.destination.address.substring(5,vm.destination.address.length-4)}}{{vm.destination.address.substring(vm.destination.address.length-4)}} - - - {{vm.displayAddress.substring(0,5)}}{{vm.displayAddress.substring(5,vm.displayAddress.length-4)}}{{vm.displayAddress.substring(vm.displayAddress.length-4)}} - -
-
-
-
-
-
- - Add personal note -
-
-
Personal Note:
-
-
- -
-
-
-
-
-
- - -
-
Suggested by merchant:
-
-
Fee: Less than 1 cent
-
Fee: {{vm.feeFiat}} {{vm.feeCurrency}}
-
- -
-
-
- - - {{vm.buttonText}} - - - {{vm.buttonText}} - - - Payment Sent - Proposal Created - Transaction Created - - diff --git a/www/views/shapeshift.html b/www/views/shapeshift.html index 5d6dd3780..27be00fbd 100644 --- a/www/views/shapeshift.html +++ b/www/views/shapeshift.html @@ -1,4 +1,4 @@ - + {{'Shapeshift'|translate}} @@ -7,27 +7,108 @@ -
-
-
- -
-
-

Exchange your BTC to BCH in minutes.

-
-

To start the process you need to add funds to your wallet.

-
-
-

The process is fast and you will receive the exchanged amount in your wallet.

-
-
To get started, you'll need to create a bitcoin wallet and get some bitcoin.
-
- - - - -
+
+ +
+
+
+ No available wallets to convert between.
-
This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction.
+ +
+
+ From +
+
+ + + + {{fromWallet.name || fromWallet.id}} + +

+ {{fromWallet.status.totalBalanceStr}} + + [Balance Hidden] + + {{fromWallet.m}}-of-{{fromWallet.n}} + + {{fromWallet.error}} +   +

+ + +
+ +
+ To +
+
+ + + + {{toWallet.name || toWallet.id}} + +

+ {{toWallet.status.totalBalanceStr}} + + [Balance Hidden] + + {{toWallet.m}}-of-{{toWallet.n}} + + {{toWallet.error}} +   +

+ + +
+
+ Rate: {{rateString}} +
+
+ + + +
+ + + + + + + + + + + + + diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 7191c1c16..8df176a56 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -15,33 +15,13 @@ -
{{newReleaseText}}
-
+
{{updateText}}
- -
+
Download
-
-
-
- Receive -
-
-
-
- Buy Bitcoin -
-
- Send -
-
-
-
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html index 07cad7f7e..046a19ba8 100644 --- a/www/views/tab-receive.html +++ b/www/views/tab-receive.html @@ -31,7 +31,7 @@


@@ -61,16 +61,16 @@


Payment Received! - - + {{ paymentReceivedAmount }} {{ paymentReceivedCoin }} + {{ paymentReceivedAlternativeAmount }} Return To Address