+
+
+ Account Invitation
+
+
+ Share this address with the devices joining this account.
+
+
+
+ 
-
-[](https://circleci.com/gh/bitpay/wallet/)
-[](https://codecov.io/gh/bitpay/wallet/)
-[](https://crowdin.com/project/copay)
-
-**PLEASE NOTE WE HAVE DETECTED SOME FAKE COPAY WALLETS ON THE GOOGLE PLAY STORE FOR ANDROID, PLEASE BE SURE TO INSTALL "BITPAY WALLET" ONLY FROM THE APP STORES. APP's DEVELOPER SHOULD BE "BITPAY INC" ONLY**
-
-Bitpay Wallet (formelly Copay) is a secure Bitcoin, Bitcoin Cash, Ethereum and ERC20 wallet platform for both desktop and mobile devices. Bitpay Wallet uses [Bitcore Wallet Service](https://github.com/bitpay/bitcore/tree/master/packages/bitcore-wallet-service) (BWS) for peer synchronization and network interfacing.
-
-Binary versions of Bitpay Wallet are available for download at:
-https://bitpay.com/wallet/
-
-This project was created by BitPay Inc, and it is maintained by BitPay and hundreds of contributors.
-
-## Main Features
-
-- Bitcoin, Ethereum, Bitcoin Cash and XRP support
-- Multiple wallet creation (BTC, BCH and ETH) and management in-app
-- Intuitive, multisignature security for personal or shared wallets
-- Easy spending proposal flow for shared wallets and group payments
-- [BIP32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) Hierarchical deterministic (HD) address generation and wallet backups
-- Device-based security: all private keys are stored locally, not in the cloud
-- Support testnet wallets for all supported coins.
-- Synchronous access across all major mobile and desktop platforms
-- Payment protocol (BIP70-BIP73) support: easily-identifiable payment requests and verifiable, secure bitcoin payments
-- Support for over 150 currency pricing options and unit denomination in BTC
-- Mnemonic (BIP39) support for wallet backups
-- Paper wallet sweep support (BIP38)
-- Email for payments, transfers, confirmations, etc.
-- Push notifications (only available for ios and android versions)
-- Customizable wallet naming and background colors
-- Multiple languages supported
-
-See more details and download links at https://bitpay.com/wallet
-
-### Coin specific features
-
-#### Bitcoin
-
-- Segwit and native segwit addresses (BECH32) for sending and receiving
-- CPFP (Child pays for parent) transaction acceleration (available after 4 hours of unconfirmed TXs).
-- Transaction fee adjustmenet using 4 preset levels (using bitcoin-core estimations) OR custom fee-rate setting.
-
-#### Bitcoin Cash
-
-- Schnorr signature support
-
-#### Ethereum
-
-- Wallet connect
-- Multisig wallet (using gnosis multisig contract)
- - mainnet contract address: 0x6e95C8E8557AbC08b46F3c347bA06F8dC012763f
- - kovan testnet contract address: 0x2C992817e0152A65937527B774c7A99a84603045
-- Gas price adjustment using 4 preset levels (using custom estimation algoritm) OR custom gas price setting.
-
-## Testing in a Browser
-
-> **Note:** This method should only be used for development purposes. When running Bitpay Wallet in a normal browser environment, browser extensions and other malicious code might have access to internal data and private keys. For production use, see the latest official [releases](https://github.com/bitpay/wallet/releases/).
-
-Clone the repo and open the directory:
-
-```sh
-git clone https://github.com/bitpay/wallet.git
-cd wallet
-```
-
-Ensure you have [Node](https://nodejs.org/) installed, then install and start Wallet:
-
-```sh
-npm install
-npm run apply:bitpay
-npm run start
-```
-
-Visit [`localhost:8100`](http://localhost:8100/) to view the app.
-
-## Unit & E2E Tests (Karma & Protractor)
-
-To run the tests, run:
-
-```
- npm run test
-```
-
-## Testing on Real Devices
-
-It's recommended that all final testing be done on a real device – both to assess performance and to enable features that are unavailable to the emulator (e.g. a device camera).
+--> Ionic 5
+--> Node 14
+For MAC :
+Install bundletool --> run : brew install bundletool
### Android
-Follow the [Cordova Android Platform Guide](https://cordova.apache.org/docs/en/latest/guide/platforms/android/) to set up your development environment.
-
When your development environment is ready, run the `start:android` package script.
```sh
-npm run apply:bitpay
-npm run prepare:bitpay
-npm run start:android
-```
+npm run prepare:abcpay
+- Option 1 : Build Android with Android studio
+ + npm run start:android
+ + Open android studio --> open source abcpay/android
+ + Build and run with android studio
+- Option 2 : Render .apk file without Android studio
+ + npm run build:android (.apk file in android/app/build/outputs/aps/debug/app-debug.apk)
+ + npm run build:android-release (.apk file in android/app/build/outputs/aps/release/app-release-unsigned.apk)
+-- Note: if build error Run --> : "npx jetify" to fix
### iOS
-Follow the [Cordova iOS Platform Guide](https://cordova.apache.org/docs/en/latest/guide/platforms/ios/) to set up your development environment.
-
When your development environment is ready, run the `start:ios` package script.
```sh
-npm run apply:bitpay
-npm run prepare:bitpay
+npm run prepare:abcpay
npm run start:ios
+Build and run with Xcode
```
-
-### Desktop (Linux, macOS, and Windows)
-
-The desktop version of Bitpay Wallet currently uses Electron. To get started, first install Electron on your system from [the Electron website](https://electronjs.org/).
-
-When Electron is installed, run the `start:desktop` package script.
-
-```sh
-npm run apply:wallet
-npm run start:desktop
-```
-
-## Build Bitpay Wallet App Bundles
-
-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 uncommitted changes you've made.) This guarantees consistency across builds for the current state of this repository.
-
-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 install
-npm run apply:bitpay
-npm run prepare:bitpay
-npm run final:android
-```
-
-### iOS
-
-```sh
-npm run clean-all
-npm install
-npm run apply:bitpay
-npm run prepare:bitpay
-npm run final:ios
-```
-
-### Desktop (Linux, macOS, and Windows)
-
-```sh
-npm run clean-all
-npm install
-npm run apply:bitpay
-npm run final:desktop
-```
-
-## Desktop Data Path
-
-Per-user application data directory for BitPay distribution.
-
-```sh
-"~/Library/Containers/com.bitpay.wallet.desktop/Data/.bitpay"
-```
-
-## Configuration
-
-### Enable External Services
-
-To enable external services, set the `BITPAY_EXTERNAL_SERVICES_CONFIG_LOCATION` environment variable to the location of your configuration before running the `apply` task.
-
-```sh
-BITPAY_EXTERNAL_SERVICES_CONFIG_LOCATION="~/.bitpay/externalServices.json" npm run apply:bitpay
-```
-
-## About Bitpay Wallet
-
-### General
-
-Bitpay Wallet (formelly Copay) implements a multisig wallet using [p2sh](https://en.bitcoin.it/wiki/Pay_to_script_hash) addresses. It supports multiple wallets, each with its own configuration, such as 3-of-5 (3 required signatures from 5 participant peers) or 2-of-3. To create a multisig wallet shared between multiple participants, Bitpay Wallet requires the extended public keys of all the wallet participants. Those public keys are then incorporated into the wallet configuration and combined to generate a payment address where funds can be sent into the wallet. Conversely, each participant manages their own private key and that private key is never transmitted anywhere.
-
-To unlock a payment and spend the wallet's funds, a quorum of participant signatures must be collected and assembled in the transaction. The funds cannot be spent without at least the minimum number of signatures required by the wallet configuration (2-of-3, 3-of-5, 6-of-6, etc.). Once a transaction proposal is created, the proposal is distributed among the wallet participants for each to sign the transaction locally. Finally, when the transaction is signed, the last signing participant will broadcast the transaction to the Bitcoin network.
-
-Bitpay Wallet also implements [BIP32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) to generate new addresses for peers. The public key that each participant contributes to the wallet is a BIP32 extended public key. As additional public keys are needed for wallet operations (to produce new addresses to receive payments into the wallet, for example) new public keys can be derived from the participants' original extended public keys. Once again, it's important to stress that each participant keeps their own private keys locally - private keys are not shared - and are used to sign transaction proposals to make payments from the shared wallet.
-
-For more information regarding how addresses are generated using this procedure, see: [Structure for Deterministic P2SH Multisignature Wallets](https://github.com/bitcoin/bips/blob/master/bip-0045.mediawiki).
-
-## Bitpay Wallet Backups and Recovery
-
-Since v1.2 Bitpay Wallet uses BIP39 mnemonics for backing up wallets. The BIP44 standard is used for wallet address derivation. Multisig wallets use P2SH addresses, while non-multisig wallets use P2PKH.
-
-Information about backup and recovery procedures is available at: https://github.com/bitpay/wallet/blob/master/backupRecovery.md
-
-Previous versions of Bitpay Wallet used files as backups. See the following section.
-
-It is possible to recover funds from a Bitpay Wallet Wallet without using Bitpay Wallet or the Wallet Service, check the [Copay Recovery Tool](https://github.com/bitpay/copay-recovery/tree/master).
-
-## Wallet Export Format
-
-Bitpay Wallet encrypts the backup with the [Stanford JS Crypto Library](http://bitwiseshiftleft.github.io/sjcl/). To extract the private key of your wallet you can go to settings, choose your wallet, click in "more options", then "wallet information", scroll to the bottom and click in "Extended Private Key". That information is enough to sign any transaction from your wallet, so be careful when handling it!
-
-The backup also contains the key `publicKeyRing` that holds the extended public keys of the Copayers.
-Depending on the key `derivationStrategy`, addresses are derived using
-[BIP44](https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki) or [BIP45](https://github.com/bitcoin/bips/blob/master/bip-0045.mediawiki). Wallets created in Copay v1.2 and forward always use BIP44, all previous wallets use BIP45. Also note that since Copay version v1.2, non-multisig wallets use address types Pay-to-PublicKeyHash (P2PKH) while multisig wallets still use Pay-to-ScriptHash (P2SH) (key `addressType` at the backup):
-
-| Copay Version | Wallet Type | Derivation Strategy | Address Type |
-| ------------- | ------------------------- | ------------------- | ------------ |
-| <1.2 | All | BIP45 | P2SH |
-| ≥1.2 | Non-multisig | BIP44 | P2PKH |
-| ≥1.2 | Multisig | BIP44 | P2SH |
-| ≥1.5 | Multisig Hardware wallets | BIP44 (root m/48’) | P2SH |
-
-Using a tool like [Bitcore PlayGround](http://bitcore.io/playground) all wallet addresses can be generated. (TIP: Use the `Address` section for P2PKH address type wallets and `Multisig Address` for P2SH address type wallets). For multisig addresses, the required number of signatures (key `m` on the export) is also needed to recreate the addresses.
-
-BIP45 note: All addresses generated at BWS with BIP45 use the 'shared cosigner index' (2147483647) so Copay address indexes look like: `m/45'/2147483647/0/x` for main addresses and `m/45'/2147483647/1/y` for change addresses.
-
-Since version 1.5, Copay uses the root `m/48'` for hardware multisignature wallets. This was coordinated with Ledger and Trezor teams. While the derivation path format is still similar to BIP44, the root was in order to indicate that these wallets are not discoverable by scanning addresses for funds. Address generation for multisignature wallets requires the other copayers extended public keys.
-
-## Bitcore Wallet Service
-
-Bitpay Wallet depends on [Bitcore Wallet Service](https://github.com/bitpay/bitcore-wallet-service) (BWS) for blockchain information, networking and Copayer synchronization. A BWS instance can be setup and operational within minutes or you can use a public instance like `https://bws.bitpay.com`. Switching between BWS instances is very simple and can be done with a click from within Bitpay Wallet. BWS also allows Bitpay Wallet to interoperate with other wallets like [Bitcore Wallet CLI](https://github.com/bitpay/bitcore-wallet).
-
-Please note that Bitpay Wallet v5.3.0 and above use CSP to restrict network access. To use a custom BWS see [CSP announcement](https://github.com/bitpay/copay/blob/master/CSP.md).
-
-## Translations
-
-Bitpay Wallet uses standard gettext PO files for translations and [Crowdin](https://crowdin.com/project/copay) as the front-end tool for translators. To join our team of translators, please create an account at [Crowdin](https://crowdin.com) and translate the Bitpay Wallet documentation and application text into your native language.
-
-To download and build using the latest translations from Crowdin, please use the following commands:
-
-```sh
-cd i18n
-node crowdin_download.js
-```
-
-This will download all partial and complete language translations while also cleaning out any untranslated ones.
-
-**Translation Credits:**
-
-- Japanese: @dabura667
-- French: @kirvx
-- Portuguese: @pmichelazzo
-- Spanish: @cmgustavo
-- German: @saschad
-- Russian: @vadim0
-
-_Gracias totales!_
-
-## Release Schedules
-
-Bitpay Wallet uses the `MAJOR.MINOR.BATCH` convention for versioning. Any release that adds features should modify the MINOR or MAJOR number.
-
-### Bug Fixing Releases
-
-We release bug fixes as soon as possible for all platforms. Usually around a week after patches, a new release is made with language translation updates (like 1.1.4 and then 1.1.5). There is no coordination so all platforms are updated at the same time.
-
-### Minor and Major Releases
-
-- t+0: tag the release 1.2 and "text lock" (meaning only non-text related bug fixes. Though this rule is sometimes broken, it's good to make a rule.)
-- t+7: testing for 1.2 is finished, translation is also finished, and 1.2.1 is tagged with all translations along with bug fixes made in the last week.
-- t+7: iOS is submitted for 1.2.1. All other platforms are submitted with auto-release off.
-- t + (~17): All platforms 1.2.1 are released when Apple approves the iOS application update.
-
-Anyone and everyone is welcome to contribute. Please take a moment to
-review the [guidelines for contributing](CONTRIBUTING.md).
-
-- [Bug reports](CONTRIBUTING.md#bugs)
-- [Feature requests](CONTRIBUTING.md#features)
-- [Pull requests](CONTRIBUTING.md#pull-requests)
-
-## Current Active Developers GPG keys ID
-
-- 15EDAD8D9F2EB1AF @cmgustavo
-
-- FC283098DA862864 @gabrielbazan7
-
-- DD6D7EAADE12280D @Gamboster
-
-- D87947CC8A32D91C @msalcala11
-
-- 612C9C4DDAC47B61 @rastajpa
-
-- F8FC1D9B1B46486D @matiu
-
-## Support
-
-Please see [Support requests](CONTRIBUTING.md#support)
-
-## License
-
-Bitpay Wallet is released under the MIT License. Please refer to the [LICENSE](https://github.com/bitpay/wallet/blob/master/LICENSE) file that accompanies this project for more information including complete terms and conditions.
+ Note: if build error Run --> : "npx jetify" --> run npm run start:ios
\ No newline at end of file
diff --git a/angular.json b/angular.json
index 5379ec3055f..453bdc42973 100644
--- a/angular.json
+++ b/angular.json
@@ -1,125 +1,184 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
+ "defaultProject": "app",
"newProjectRoot": "projects",
"projects": {
- "copay": {
+ "app": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
+ "prefix": "app",
+ "schematics": {},
"architect": {
"build": {
- "builder": "@angular-devkit/build-angular:browser",
+ "builder": "ngx-build-plus:browser",
"options": {
- "outputPath": "dist",
- "index": "index.html",
- "main": "app/main.ts",
- "tsConfig": "./tsconfig.json",
- "polyfills": "polyfills.ts",
- "assets": ["assets", "favicon.ico"],
- "styles": [],
- "scripts": []
+ "outputPath": "www",
+ "polyfills": "src/polyfills.ts",
+ "index": "src/index.html",
+ "main": "src/main.ts",
+ "tsConfig": "tsconfig.app.json",
+ "assets": [
+ {
+ "glob": "**/*",
+ "input": "src/assets",
+ "output": "assets"
+ },
+ {
+ "glob": "**/*.svg",
+ "input": "node_modules/ionicons/dist/ionicons/svg",
+ "output": "./svg"
+ }
+ ],
+ "styles": [
+ "src/theme/variables.scss",
+ "src/global.scss"
+ ],
+ "scripts": [],
+ "extraWebpackConfig": "webpack.config.js",
+ "aot": false,
+ "vendorChunk": true,
+ "extractLicenses": false,
+ "buildOptimizer": false,
+ "sourceMap": true,
+ "optimization": false,
+ "namedChunks": true
},
"configurations": {
- "prod": {
- "fileReplacements": [
- {
- "replace": "environments/environment.ts",
- "with": "environments/prod.ts"
- }
- ]
- },
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
- "extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
- "buildOptimizer": true
+ "buildOptimizer": true,
+ "budgets": [
+ {
+ "type": "initial",
+ "maximumWarning": "10mb",
+ "maximumError": "10mb"
+ }
+ ]
+ },
+ "ci": {
+ "progress": false
}
}
},
"serve": {
- "builder": "@angular-devkit/build-angular:dev-server",
+ "builder": "ngx-build-plus:dev-server",
"options": {
- "browserTarget": "copay:build"
+ "browserTarget": "app:build",
+ "extraWebpackConfig": "webpack.config.js"
},
"configurations": {
- "prod": {
- "browserTarget": "copay:build:prod"
- },
"production": {
- "browserTarget": "copay:build:production"
+ "browserTarget": "app:build:production"
+ },
+ "ci": {
+ "progress": false
}
}
},
"extract-i18n": {
- "builder": "@angular-devkit/build-angular:extract-i18n",
+ "builder": "ngx-build-plus:extract-i18n",
"options": {
- "browserTarget": "copay:build"
+ "browserTarget": "app:build"
}
},
"test": {
- "builder": "@angular-devkit/build-angular:karma",
+ "builder": "ngx-build-plus:karma",
"options": {
"main": "src/test.ts",
- "karmaConfig": "test/karma.conf.js",
"polyfills": "src/polyfills.ts",
- "tsConfig": "src/tsconfig.spec.json",
- "codeCoverageExclude": [
- "src/polyfills.ts",
- "src/test.ts",
- "src/mocks.ts",
- "src/**/*.mock.ts",
- "src/**/node_modules/**"
- ],
- "scripts": [],
+ "tsConfig": "tsconfig.spec.json",
+ "karmaConfig": "karma.conf.js",
"styles": [],
- "assets": ["src/assets", "src/favicon.ico"]
+ "scripts": [],
+ "assets": [
+ {
+ "glob": "favicon.ico",
+ "input": "src/",
+ "output": "/"
+ },
+ {
+ "glob": "**/*",
+ "input": "src/assets",
+ "output": "/assets"
+ }
+ ]
+ },
+ "configurations": {
+ "ci": {
+ "progress": false,
+ "watch": false
+ }
}
},
"lint": {
- "builder": "@angular-devkit/build-angular:tslint",
+ "builder": "@angular-eslint/builder:lint",
"options": {
- "tsConfig": ["tsconfig.spec.json"],
- "exclude": ["**/node_modules/**"]
+ "lintFilePatterns": [
+ "src/**/*.ts",
+ "src/**/*.html"
+ ]
}
- }
- }
- },
- "copay-e2e": {
- "root": "e2e",
- "sourceRoot": "e2e",
- "projectType": "application",
- "architect": {
+ },
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
- "protractorConfig": "test/protractor.conf.js",
- "devServerTarget": "copay:serve"
+ "protractorConfig": "e2e/protractor.conf.js",
+ "devServerTarget": "app:serve"
+ },
+ "configurations": {
+ "production": {
+ "devServerTarget": "app:serve:production"
+ },
+ "ci": {
+ "devServerTarget": "app:serve:ci"
+ }
}
},
- "lint": {
- "builder": "@angular-devkit/build-angular:tslint",
+ "ionic-cordova-build": {
+ "builder": "@ionic/angular-toolkit:cordova-build",
"options": {
- "tsConfig": ["test/e2e/tsconfig.e2e.json"],
- "exclude": ["**/node_modules/**"]
+ "browserTarget": "app:build"
+ },
+ "configurations": {
+ "production": {
+ "browserTarget": "app:build:production"
+ }
+ }
+ },
+ "ionic-cordova-serve": {
+ "builder": "@ionic/angular-toolkit:cordova-serve",
+ "options": {
+ "cordovaBuildTarget": "app:ionic-cordova-build",
+ "devServerTarget": "app:serve"
+ },
+ "configurations": {
+ "production": {
+ "cordovaBuildTarget": "app:ionic-cordova-build:production",
+ "devServerTarget": "app:serve:production"
+ }
}
}
}
}
},
- "defaultProject": "copay",
+ "cli": {
+ "analytics": "c3118495-9c75-46a7-8375-97a7de96f816",
+ "defaultCollection": "@ionic/angular-toolkit"
+ },
"schematics": {
- "@schematics/angular:component": {
- "prefix": "app",
- "styleext": "css"
+ "@ionic/angular-toolkit:component": {
+ "styleext": "scss"
},
- "@schematics/angular:directive": {
- "prefix": "app"
+ "@ionic/angular-toolkit:page": {
+ "styleext": "scss"
}
}
-}
+}
\ No newline at end of file
diff --git a/app-template/afterPack-template.js b/app-template/afterPack-template.js
deleted file mode 100644
index e6e17659594..00000000000
--- a/app-template/afterPack-template.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const fs = require('fs');
-const fse = require('fs-extra');
-const path = require('path');
-module.exports = function (params) {
- const unpackFile = path.join(
- params.appOutDir,
- '*NAMECASENOSPACE*.app/Contents/Resources/app.asar.unpacked'
- );
- fse.removeSync(unpackFile);
-};
diff --git a/app-template/apply.js b/app-template/apply.js
deleted file mode 100755
index 262e5f98647..00000000000
--- a/app-template/apply.js
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/usr/bin/env node
-const path = require('path');
-const fs = require('fs-extra');
-const shell = require('shelljs');
-
-const configDir = process.argv[2] || 'copay';
-const config = require(`./${configDir}/appConfig.json`);
-
-const templates = {
- 'index-template.html': 'src/',
- 'config-template.xml': '/',
- 'ionic.config-template.json': '/',
- 'manifest.ionic-template.json': 'src/',
- 'build-electron-template.js': 'electron/',
- 'afterPack-template.js': 'electron/'
-};
-
-if (process.env.NODE_ENV === 'dev') {
- templates['index-dev-template.html'] = 'src/';
-}
-
-const jsonHeader = `{
- "//-": "Changes to this file will be overwritten.",
- "//--": "Modify it's template in the app-template directory.",
-`;
-
-console.log(`Applying templates for: ${config.nameCase}`);
-
-Object.keys(templates).forEach(function (k) {
- const targetDir = templates[k];
- console.log(' # ' + k + ' => ' + targetDir);
-
- let content = fs.readFileSync(k, 'utf8');
-
- if (k.indexOf('.json') > 0) {
- content = content.replace('{', jsonHeader);
- } else if (k.indexOf('Makefile') >= 0) {
- content = MakefileHeader + content;
- }
-
- Object.keys(config).forEach(function (k) {
- if (k.indexOf('_') == 0) return;
-
- const r = new RegExp('\\*' + k.toUpperCase() + '\\*', 'g');
- content = content.replace(r, config[k]);
- });
-
- const r = new RegExp('\\*[A-Z]{3,30}\\*', 'g');
- const s = content.match(r);
- if (s) {
- console.log('UNKNOWN VARIABLE', s);
- process.exit(1);
- }
-
- switch (k) {
- case 'config-template.xml': {
- k = 'config.xml';
- break;
- }
- case 'index-dev-template.html':
- case 'index-template.html': {
- k = 'index.html';
- break;
- }
- case 'ionic.config-template.json': {
- k = 'ionic.config.json';
- break;
- }
- case 'manifest.ionic-template.json': {
- k = 'manifest.json';
- break;
- }
- case 'afterPack-template.js': {
- k = 'afterPack.js';
- break;
- }
- case 'build-electron-template.js': {
- k = 'build-electron.js';
- break;
- }
- }
-
- if (!fs.existsSync('../' + targetDir)) {
- fs.mkdirSync('../' + targetDir);
- }
- fs.writeFileSync('../' + targetDir + k, content, 'utf8');
-});
-
-// Get latest commit hash
-const getCommitHash = function () {
- //exec git command to get the hash of the current commit
- const hash = shell
- .exec('git rev-parse HEAD', {
- silent: true
- })
- .stdout.trim()
- .substr(0, 7);
- return hash;
-};
-
-// Update appConfig.json
-config['commitHash'] = getCommitHash();
-console.log('Copying ' + configDir + '/appConfig.json' + ' to assets');
-fs.writeJsonSync('../src/assets/appConfig.json', config, 'utf8');
-
-let externalServices;
-try {
- const confName = configDir.toUpperCase();
- const externalServicesConf = confName + '_EXTERNAL_SERVICES_CONFIG_LOCATION';
- console.log('Looking for ' + externalServicesConf + '...');
- if (typeof process.env[externalServicesConf] !== 'undefined') {
- let location = process.env[externalServicesConf];
- if (location.charAt(0) === '~') {
- location = location.replace(
- /^\~/,
- process.env.HOME || process.env.USERPROFILE
- );
- }
- console.log('Found at: ' + location);
- console.log('Copying ' + location + ' to assets.');
- externalServices = fs.readFileSync(location, 'utf8');
- } else {
- throw externalServicesConf + ' environment variable not set.';
- }
-} catch (err) {
- console.log(err);
- externalServices = '{}';
- console.log('External services not configured.');
-}
-fs.writeFileSync('../src/assets/externalServices.json', externalServices);
-
-function copyDir(from, to, noRemove) {
- console.log(`Copying dir '${from}' to '${to}'...`);
- if (fs.existsSync(to) && !noRemove) fs.removeSync(to); // remove previous app directory
- if (!fs.existsSync(from)) return; // nothing to do
- fs.copySync(from, to);
-}
-
-// Firebase configuration
-try {
- const confName = configDir.toUpperCase();
- const externalServices = confName + '_EXTERNAL_SERVICES';
- console.log('Looking Firebase Config on ' + externalServices + '...');
- let path = process.env[externalServices];
- if (typeof path !== 'undefined') {
- if (path.charAt(0) === '~') {
- path = path.replace(/^\~/, process.env.HOME || process.env.USERPROFILE);
- }
- console.log('Found Firebase Path at: ' + path);
- fs.copySync(
- path + '/GoogleService-Info.plist',
- '../GoogleService-Info.plist'
- );
- fs.copySync(path + '/google-services.json', '../google-services.json');
- console.log('Copied Firebase Configuration.');
- } else {
- throw 'ENV variable not set for Firebase Config';
- }
-} catch (err) {
- console.log(err);
-}
-
-// XCode build.json
-let buildJsonData;
-try {
- const confName = configDir.toUpperCase();
- const buildJson = confName + '_XCODE';
- console.log('Looking for ' + buildJson + '...');
- if (typeof process.env[buildJson] !== 'undefined') {
- let location = process.env[buildJson];
- if (location.charAt(0) === '~') {
- location = location.replace(
- /^\~/,
- process.env.HOME || process.env.USERPROFILE
- );
- }
- console.log('Found at: ' + location);
- console.log('Copying ' + location + ' to assets.');
- buildJsonData = fs.readFileSync(location, 'utf8');
- fs.writeFileSync('../build.json', buildJsonData);
- } else {
- throw buildJson + ' environment variable not set.';
- }
-} catch (err) {
- console.log(err);
- console.log('External services not configured.');
-}
-
-// Google Pay
-if (configDir == 'bitpay') {
- let buildExtrasGradle;
- try {
- const googlePayPath = 'GOOGLEPAY_DIR';
- console.log('Looking for ' + googlePayPath + '...');
- if (typeof process.env[googlePayPath] !== 'undefined') {
- let location = process.env[googlePayPath];
- if (location.charAt(0) === '~') {
- location = location.replace(
- /^\~/,
- process.env.HOME || process.env.USERPROFILE
- );
- }
- console.log('Found at: ' + location);
-
- let content = fs.readFileSync('build-extras-template.gradle', 'utf8');
- content = content.replace('*GOOGLEPAY_DIR*', location);
-
- console.log(
- 'Copying build-extras-template.gradle to ./build-extras.gradle'
- );
- fs.writeFileSync('../build-extras.gradle', content);
- console.log('Google Pay is ready.');
- } else {
- fs.writeFileSync('../build-extras.gradle', '');
- throw googlePayPath + ' environment variable not set.';
- }
- } catch (err) {
- console.log(err);
- console.log('Google Pay not configured.');
- }
-}
-
-function copyDir(from, to, noRemove) {
- console.log(`Copying dir '${from}' to '${to}'...`);
- if (fs.existsSync(to) && !noRemove) fs.removeSync(to); // remove previous app directory
- if (!fs.existsSync(from)) return; // nothing to do
- fs.copySync(from, to);
-}
-
-copyDir(configDir + '/img', '../src/assets/img/app');
-copyDir(configDir + '/sass', '../src/theme', true);
-
-// Copy AppX Assets for Windows
-copyDir(`../resources/${config.name}/windows/appx`, '../build/appx', true);
-
-console.log(`Applying distribution-specific configuration to package.json...`);
-const package = require('../package.json');
-
-package.name = config.packageName;
-package.description = config.description;
-package.version = config.version;
-package.title = config.userVisibleName;
-package.homepage = config.url;
-package.repository.url = config.gitHubRepoUrl;
-package.bugs.url = config.gitHubRepoBugs;
-package.cordova.plugins['cordova-plugin-customurlscheme-ng'].SECOND_URL_SCHEME =
- config.packageName;
-package.cordova.plugins['cordova-plugin-fcm-ng'].PAGE_LINK_DOMAIN =
- config.dynamicLink;
-
-const stringifiedNpmStyle = JSON.stringify(package, null, 2) + '\n';
-fs.writeFileSync('../package.json', stringifiedNpmStyle);
-
-console.log(`
-apply.js: finished applying the ${configDir} distribution.
-
-`);
diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json
deleted file mode 100644
index 9a58b073e6f..00000000000
--- a/app-template/bitpay/appConfig.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "packageName": "bitpay",
- "packageDescription": "Secure Bitcoin Wallet",
- "packageNameId": "com.bitpay.wallet",
- "packageNameIdDesktop": "com.bitpay.wallet.desktop",
- "themeColor": "#ffffff",
- "userVisibleName": "BitPay",
- "purposeLine": "Secure Bitcoin Wallet",
- "bundleName": "wallet",
- "appUri": "bitpay",
- "name": "bitpay",
- "applePay": "
+
+
+
+
- {{ amount }}
+ {{ formatTxAmount(amount) }}
{{ unit }}
diff --git a/src/components/balance-to-show/balance-to-show.scss b/src/app/components/balance-to-show/balance-to-show.scss
similarity index 100%
rename from src/components/balance-to-show/balance-to-show.scss
rename to src/app/components/balance-to-show/balance-to-show.scss
diff --git a/src/app/components/balance-to-show/balance-to-show.ts b/src/app/components/balance-to-show/balance-to-show.ts
new file mode 100644
index 00000000000..69cfb7f7efa
--- /dev/null
+++ b/src/app/components/balance-to-show/balance-to-show.ts
@@ -0,0 +1,43 @@
+import { Component, Input, ViewEncapsulation } from '@angular/core';
+import { DecimalFormatBalance } from 'src/app/providers/decimal-format.ts/decimal-format';
+
+@Component({
+ selector: 'balance-to-show',
+ templateUrl: 'balance-to-show.html',
+ styleUrls: ['balance-to-show.scss'],
+ encapsulation: ViewEncapsulation.None,
+})
+export class BalanceToShowComponent {
+ @Input()
+ set balance(value: string) {
+ this._balance = value;
+ this.processBalance(this._balance);
+ }
+
+ get balance(): string {
+ return this._balance;
+ }
+ private _balance: string;
+ public amount: string;
+ public unit: string;
+ public resize: boolean;
+
+ constructor() {
+ this.resize = false;
+ }
+
+ public formatTxAmount(amount: any) {
+ return DecimalFormatBalance(amount);
+ }
+
+ private processBalance(balance: string) {
+ if (!balance || balance === '') return;
+
+ this.resize = Boolean(balance.length >= 18);
+ if (balance.indexOf(' ') >= 0) {
+ const spacePosition = balance.indexOf(' ');
+ this.amount = balance.substr(0, spacePosition);
+ this.unit = balance.substr(spacePosition, balance.length);
+ }
+ }
+}
diff --git a/src/components/chart-component/chart-component.html b/src/app/components/chart-component/chart-component.html
similarity index 100%
rename from src/components/chart-component/chart-component.html
rename to src/app/components/chart-component/chart-component.html
diff --git a/src/components/chart-component/chart-component.ts b/src/app/components/chart-component/chart-component.ts
similarity index 97%
rename from src/components/chart-component/chart-component.ts
rename to src/app/components/chart-component/chart-component.ts
index 405e6f08456..48966809e30 100644
--- a/src/components/chart-component/chart-component.ts
+++ b/src/app/components/chart-component/chart-component.ts
@@ -7,11 +7,11 @@ import {
SimpleChanges,
ViewChild
} from '@angular/core';
-import ApexCharts from 'apexcharts';
+import * as ApexCharts from 'apexcharts';
@Component({
selector: 'apx-chart',
- templateUrl: './chart-component.html'
+ templateUrl: './chart-component.html',
})
export class ChartComponent implements OnInit, OnChanges {
@Input() chart;
diff --git a/src/app/components/coin-icon/coin-icon.html b/src/app/components/coin-icon/coin-icon.html
new file mode 100644
index 00000000000..2988c49d8ee
--- /dev/null
+++ b/src/app/components/coin-icon/coin-icon.html
@@ -0,0 +1,20 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/components/email-component/email-component.scss b/src/app/components/email-component/email-component.scss
similarity index 96%
rename from src/components/email-component/email-component.scss
rename to src/app/components/email-component/email-component.scss
index d451c3bf4a7..de4fed1ca73 100644
--- a/src/components/email-component/email-component.scss
+++ b/src/app/components/email-component/email-component.scss
@@ -32,7 +32,7 @@ phone-page {
&__form {
&__link {
- color: $color-primary;
+ color: var(--color-primary);
}
button {
diff --git a/src/components/email-component/email-component.ts b/src/app/components/email-component/email-component.ts
similarity index 82%
rename from src/components/email-component/email-component.ts
rename to src/app/components/email-component/email-component.ts
index b435e74cffb..c3da7e12a3a 100644
--- a/src/components/email-component/email-component.ts
+++ b/src/app/components/email-component/email-component.ts
@@ -1,11 +1,13 @@
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { ExternalLinkProvider } from '../../providers/external-link/external-link';
+import { ExternalLinkProvider } from 'src/app/providers/external-link/external-link';
import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
@Component({
selector: 'email-component',
- templateUrl: 'email-component.html'
+ templateUrl: 'email-component.html',
+ styleUrls: ['email-component.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class EmailComponent extends ActionSheetParent {
public emailForm: FormGroup;
@@ -26,7 +28,7 @@ export class EmailComponent extends ActionSheetParent {
});
}
- ionViewDidLoad() {
+ ngOnInit(){
this.emailForm.setValue({
email: ''
});
diff --git a/src/app/components/encrypt-password/encrypt-password.html b/src/app/components/encrypt-password/encrypt-password.html
new file mode 100644
index 00000000000..546291d5d17
--- /dev/null
+++ b/src/app/components/encrypt-password/encrypt-password.html
@@ -0,0 +1,78 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/encrypt-password/encrypt-password.scss b/src/app/components/encrypt-password/encrypt-password.scss
new file mode 100644
index 00000000000..1199e9368dc
--- /dev/null
+++ b/src/app/components/encrypt-password/encrypt-password.scss
@@ -0,0 +1,194 @@
+encrypt-password {
+ action-sheet {
+ .action-sheet-bottom {
+ border-radius: 0px !important;
+ background: var(--bg-color-light-theme) !important;
+ display: grid;
+ padding-top: 3rem; // Fix iOS 10.3
+ padding-top: calc(4px + env(safe-area-inset-top));
+ .encrypt-password {
+ height: 100%;
+ display: grid;
+ grid-template-rows: 80% 20%;
+ .info-encrypt {
+ padding: 1rem 2rem;
+ text-align: center;
+ color: rgba(0, 30, 46, 0.6);
+ font-size: 14px;
+ line-height: 20px;
+ }
+ .encrypt-password-form {
+ display: grid;
+ grid-template-rows: max-content max-content max-content;
+ .slide-title {
+ // padding-top: 4rem;
+ display: flex;
+ flex-direction: column;
+ align-self: center;
+ align-items: center;
+ img {
+ width: 120px;
+ height: 120px;
+ }
+ h3 {
+ font-weight: 600;
+ margin-top: 2rem;
+ color: black;
+ }
+ }
+ form {
+ margin-top: 2rem;
+ width: 90%;
+ align-self: end;
+ justify-self: center;
+ ion-item {
+ margin-bottom: 2rem;
+ border: 2px solid rgba(28, 55, 69, 0.38);
+ border-radius: 4px;
+ --background: linear-gradient(
+ 0deg,
+ rgba(0, 101, 141, 0.11),
+ rgba(0, 101, 141, 0.11)
+ ),
+ #fafafb;
+ --padding-start: 1rem !important;
+ --padding-end: 1rem;
+ --inner-padding-end: 0;
+ --inner-padding-top: 14px;
+ --inner-padding-bottom: 14px;
+ ion-input {
+ font-size: 16px;
+ line-height: 24px;
+ letter-spacing: 0.5px;
+ --padding-top: 0;
+ --padding-bottom: 0;
+ }
+ ion-button {
+ margin: 0;
+ ion-icon {
+ color: rgba(28, 55, 69, 0.6);
+ width: 22px;
+ height: 22px;
+ &[name='alert'] {
+ color: var(--color-danger);
+ }
+ }
+ }
+ &.error-message {
+ border: 0 !important;
+ padding: 0;
+ --inner-padding-top: 0;
+ ion-text {
+ color: #ba1b1b;
+ font-size: 12px;
+ padding-left: 1rem;
+ }
+ }
+ }
+ .confirm-passphrase-container {
+ margin-top: 47px;
+ }
+ .mat-form-field-suffix {
+ top: -9px !important;
+ }
+ mat-form-field {
+ ion-button {
+ height: 1rem;
+ }
+ }
+ }
+ }
+ }
+ .footer {
+ height: 76px;
+ align-self: end;
+ }
+ }
+ .bp-header {
+ background: unset;
+ }
+ }
+
+ action-sheet {
+ .action-sheet-bottom {
+ border-radius: 28px 28px 0px 0px !important;
+ .encrypt-password-small {
+ padding: 24px !important;
+ display: flex;
+ flex-direction: column;
+ .encrypt-password-form {
+ .slide-title {
+ h3 {
+ font-weight: 400;
+ font-size: 24px;
+ line-height: 32px;
+ color: #1c3745;
+ margin: 0;
+ }
+ }
+ .info-encrypt {
+ font-weight: 400;
+ font-size: 14px;
+ line-height: 20px;
+ letter-spacing: 0.25px;
+ color: rgba(28, 55, 69, 0.6);
+ margin: 1rem 0;
+ }
+ ion-item {
+ margin-bottom: 2rem;
+ border: 2px solid rgba(28, 55, 69, 0.38);
+ border-radius: 4px;
+ --background: linear-gradient(
+ 0deg,
+ rgba(0, 101, 141, 0.11),
+ rgba(0, 101, 141, 0.11)
+ ),
+ #fafafb;
+ --padding-start: 1rem !important;
+ --padding-end: 1rem;
+ --inner-padding-end: 0;
+ --inner-padding-top: 4px;
+ --inner-padding-bottom: 4px;
+ ion-input {
+ font-size: 16px;
+ line-height: 24px;
+ letter-spacing: 0.5px;
+ }
+ ion-button {
+ margin: 0;
+ ion-icon {
+ color: rgba(28, 55, 69, 0.6);
+ width: 22px;
+ height: 22px;
+ }
+ }
+ &.confirm-item {
+ margin-bottom: 0;
+ }
+ &.wrong-confirm-password {
+ border-color: var(--color-danger);
+ }
+ }
+ ion-text {
+ font-size: 12px;
+ line-height: 16px;
+ letter-spacing: 0.4px;
+ margin-left: 1rem;
+ }
+ }
+ .submit-btn {
+ margin-top: 2rem;
+ align-self: end;
+ color: var(--color-primary);
+ font-weight: 600;
+ font-size: 14px;
+ line-height: 20px;
+ &[disabled] {
+ color: rgba(28, 55, 69, 0.38) !important;
+ --background: transparent !important;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/src/app/components/encrypt-password/encrypt-password.ts b/src/app/components/encrypt-password/encrypt-password.ts
new file mode 100644
index 00000000000..d920d080bea
--- /dev/null
+++ b/src/app/components/encrypt-password/encrypt-password.ts
@@ -0,0 +1,76 @@
+import { Component, ComponentRef, NgZone, ViewEncapsulation } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { AnimationController, Platform } from '@ionic/angular';
+import { InfoSheetType } from 'src/app/providers/action-sheet/action-sheet';
+import { AppProvider } from 'src/app/providers/app/app';
+import { DomProvider } from 'src/app/providers/dom/dom';
+import { InfoSheetComponent } from '../../components/info-sheet/info-sheet';
+import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
+
+@Component({
+ selector: 'encrypt-password',
+ templateUrl: 'encrypt-password.html',
+ styleUrls: ['encrypt-password.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class EncryptPasswordComponent extends ActionSheetParent {
+ public encryptPasswordForm: FormGroup;
+ public isCopay: boolean;
+ public passwordInputType: string = 'password';
+ public confirmPasswordInputType: string = 'password';
+ zone;
+ public currentTheme: string;
+ constructor(
+ private domProvider: DomProvider,
+ private fb: FormBuilder,
+ private appProvider: AppProvider,
+ public animationCtrl: AnimationController,
+ public platform: Platform
+ ) {
+ super();
+ this.zone = new NgZone({ enableLongStackTrace: false });
+ this.isCopay = this.appProvider.info.name === 'copay';
+ this.encryptPasswordForm = this.fb.group(
+ {
+ password: ['', Validators.required],
+ confirmPassword: ['', Validators.required]
+ },
+ { validator: this.matchingPasswords('password', 'confirmPassword') }
+ );
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
+ }
+
+ private matchingPasswords(passwordKey: string, confirmPasswordKey: string) {
+ return (group: FormGroup) => {
+ const password = group.controls[passwordKey];
+ const confirmPassword = group.controls[confirmPasswordKey];
+ if (password.value !== confirmPassword.value) {
+ return {
+ mismatchedPasswords: true
+ };
+ }
+ return undefined;
+ };
+ }
+
+ public createInfoSheet(type: InfoSheetType, params?): InfoSheetComponent {
+ return this.setupSheet(InfoSheetComponent, type, params)
+ .instance;
+ }
+
+ private setupSheet(
+ componentType: { new(...args): T },
+ sheetType?: string,
+ params?
+ ): ComponentRef {
+ const sheet = this.domProvider.appendComponentToBody(componentType);
+ sheet.instance.componentRef = sheet;
+ sheet.instance.sheetType = sheetType;
+ sheet.instance.params = params;
+ return sheet;
+ }
+
+ public confirm(password: string): void {
+ this.dismiss(password);
+ }
+}
diff --git a/src/app/components/exchange-rates/exchange-rates.html b/src/app/components/exchange-rates/exchange-rates.html
new file mode 100644
index 00000000000..0cc7775f2e8
--- /dev/null
+++ b/src/app/components/exchange-rates/exchange-rates.html
@@ -0,0 +1,22 @@
+
+
\ No newline at end of file
diff --git a/src/app/components/exchange-rates/exchange-rates.scss b/src/app/components/exchange-rates/exchange-rates.scss
new file mode 100644
index 00000000000..0c6e67c8c16
--- /dev/null
+++ b/src/app/components/exchange-rates/exchange-rates.scss
@@ -0,0 +1,62 @@
+exchange-rates {
+ .average-container {
+ text-align: center;
+ height: 21px;
+ float: right;
+ &.negative-avg {
+ color: #BA1B1B;
+ border-radius: 50vh;
+ }
+ &.possitive-avg {
+ color: #37A372;
+ border-radius: 50vh;
+ }
+ .average {
+ font-size: 12px;
+ line-height: 19px;
+ height: 21px;
+ font-weight: 500;
+ }
+ }
+
+ .estimate-product {
+ margin: 0;
+ text-align: right;
+ padding-right: 20px;
+ font-style: italic;
+ font-size: smaller;
+ color: #bd9452;
+ }
+
+ .estimate-sign {
+ font-size: smaller;
+ color: #bd9452;
+ }
+ .bp-list {
+ padding-top: 0;
+ padding-bottom: 0;
+ ion-item:not(.align-with-button){
+ --padding-start: 0.5rem !important;
+ --padding-end: 0 !important;
+ --inner-padding-end: 1rem;
+ padding-left: 0;
+ img {
+ width: 40px;
+ height: 40px;
+ margin: 1rem 1rem 1rem 0.5rem;
+ }
+ ion-note {
+ margin: 0;
+ }
+ .main-label {
+ letter-spacing: 0.1px;
+ }
+ .secondary-label {
+ margin-top: 4px;
+ letter-spacing: 0.4px;
+ }
+ }
+ }
+}
+
+
diff --git a/src/components/exchange-rates/exchange-rates.ts b/src/app/components/exchange-rates/exchange-rates.ts
similarity index 83%
rename from src/components/exchange-rates/exchange-rates.ts
rename to src/app/components/exchange-rates/exchange-rates.ts
index 4d046c85d4f..52eefc0528a 100644
--- a/src/components/exchange-rates/exchange-rates.ts
+++ b/src/app/components/exchange-rates/exchange-rates.ts
@@ -1,8 +1,7 @@
-import { Component } from '@angular/core';
-import { Events, NavController } from 'ionic-angular';
+import { Component, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
import * as _ from 'lodash';
-import { PricePage } from '../../pages/home/price-page/price-page';
-import { ConfigProvider, CurrencyProvider, Logger } from '../../providers';
+import { ConfigProvider, CurrencyProvider, EventManagerService, Logger } from '../../providers';
import { Coin } from '../../providers/currency/currency';
import {
DateRanges,
@@ -19,11 +18,14 @@ export interface Card {
backgroundColor: string;
gradientBackgroundColor: string;
name: string;
+ currentTime?: number;
}
@Component({
selector: 'exchange-rates',
- templateUrl: 'exchange-rates.html'
+ templateUrl: 'exchange-rates.html',
+ styleUrls: ['exchange-rates.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class ExchangeRates {
public isFiatIsoCodeSupported: boolean;
@@ -31,12 +33,12 @@ export class ExchangeRates {
public coins = [];
constructor(
- private navCtrl: NavController,
+ private router: Router,
private currencyProvider: CurrencyProvider,
private rateProvider: RateProvider,
private configProvider: ConfigProvider,
private logger: Logger,
- private events: Events
+ private events: EventManagerService
) {
const availableChains = this.currencyProvider.getAvailableChains();
for (const coin of availableChains) {
@@ -63,7 +65,11 @@ export class ExchangeRates {
}
public goToPricePage(card) {
- this.navCtrl.push(PricePage, { card });
+ this.router.navigate(['/price'], {
+ state: {
+ card: card
+ }
+ });
}
public getPrices() {
@@ -112,8 +118,12 @@ export class ExchangeRates {
return '1.4-4';
case 'doge':
return '1.4-4';
+ case 'xpi':
+ return '1.6-6';
+ case 'xec':
+ return '1.6-6';
default:
return '1.2-2';
}
}
-}
+}
\ No newline at end of file
diff --git a/src/app/components/expandable-header/expandable-header.scss b/src/app/components/expandable-header/expandable-header.scss
new file mode 100644
index 00000000000..5a0d6c9d73e
--- /dev/null
+++ b/src/app/components/expandable-header/expandable-header.scss
@@ -0,0 +1,4 @@
+::ng-deep expandable-header {
+ display: block;
+ overflow: hidden;
+}
diff --git a/src/app/components/expandable-header/expandable-header.spec.ts b/src/app/components/expandable-header/expandable-header.spec.ts
new file mode 100644
index 00000000000..88066042148
--- /dev/null
+++ b/src/app/components/expandable-header/expandable-header.spec.ts
@@ -0,0 +1,120 @@
+// import { Component, ViewChild } from '@angular/core';
+// import { async, ComponentFixture } from '@angular/core/testing';
+// import { Content, ScrollEvent } from 'ionic-angular';
+// import { TestUtils } from '../../test';
+// import {
+// ExpandableHeaderComponent,
+// ExpandableHeaderFooterComponent,
+// ExpandableHeaderPrimaryComponent
+// } from './expandable-header';
+
+// import { Subject } from 'rxjs/Subject';
+
+// let fixture: ComponentFixture;
+// let instance;
+// let contentMock;
+// let ionScrollSubject: Subject;
+
+// const scrollEventMock = {
+// domWrite: cb => {
+// cb();
+// },
+// scrollTop: 0
+// };
+// @Component({
+// template: `
+//
+// primary content
+// footer content
+//
+// `
+// })
+// class TestHostComponent {
+// @ViewChild(ExpandableHeaderComponent)
+// expandableHeader: ExpandableHeaderComponent;
+// }
+
+// describe('ExpandableHeaderComponent', () => {
+// beforeEach(async(() =>
+// TestUtils.beforeEachCompiler([
+// TestHostComponent,
+// ExpandableHeaderComponent,
+// ExpandableHeaderFooterComponent,
+// ExpandableHeaderPrimaryComponent
+// ]).then(compiled => {
+// fixture = compiled.fixture;
+// instance = compiled.instance.expandableHeader;
+// instance.themeProvider = {
+// getThemeInfo: () => {
+// return 'light';
+// }
+// };
+// ionScrollSubject = new Subject();
+// contentMock = {
+// ionScroll: ionScrollSubject.asObservable()
+// };
+// instance.scrollArea = contentMock as Content;
+// })));
+// afterEach(() => {
+// fixture.destroy();
+// });
+// describe('Initialization', () => {
+// it('should subscribe to ionScroll', () => {
+// const scrollSpy = spyOn(contentMock.ionScroll, 'subscribe');
+// fixture.detectChanges();
+// expect(instance).not.toBeNull();
+// expect(scrollSpy).toHaveBeenCalled();
+// });
+// it('should store the initial content height', () => {
+// fixture.detectChanges();
+// expect(instance.headerHeight).toBeDefined();
+// });
+// it('should apply transforms on scroll events', () => {
+// fixture.detectChanges();
+// const scrollSpy = spyOn(instance, 'applyTransforms');
+// ionScrollSubject.next(scrollEventMock as any);
+// expect(scrollSpy).toHaveBeenCalledWith(
+// scrollEventMock.scrollTop,
+// instance.getNewHeaderHeight(scrollEventMock.scrollTop)
+// );
+// });
+// });
+
+// describe('Methods', () => {
+// beforeEach(() => {
+// instance.headerHeight = 100;
+// });
+// describe('#getNewHeaderHeight', () => {
+// it('should subtract scrollTop value from headerHeight', () => {
+// const newHeight = instance.getNewHeaderHeight(10);
+// expect(newHeight).toBe(90);
+// });
+// it('should not allow negative values', () => {
+// const newHeight = instance.getNewHeaderHeight(101);
+// expect(newHeight).toBe(0);
+// });
+// });
+// describe('#computeTransformations', () => {
+// it('should not apply visible transforms if the user has not yet scrolled', () => {
+// const transformations = instance.computeTransformations(
+// 0,
+// instance.headerHeight
+// );
+// expect(transformations).toEqual([1, 1, 0]);
+// });
+// it('should completely hide content if the user has scrolled the full header height', () => {
+// const transformations = instance.computeTransformations(100, 0);
+// const [opacity, scale] = transformations;
+// expect(opacity).toBe(0);
+// expect(scale).toBe(0);
+// });
+// });
+// describe('#applyTransforms', () => {
+// it('should apply transforms to primary and footer content based on scroll position', () => {
+// const transformSpy = spyOn(instance, 'transformContent');
+// instance.applyTransforms(0, instance.headerHeight);
+// expect(transformSpy).toHaveBeenCalledWith([1, 1, 0]);
+// });
+// });
+// });
+// });
diff --git a/src/app/components/expandable-header/expandable-header.ts b/src/app/components/expandable-header/expandable-header.ts
new file mode 100644
index 00000000000..aec343e24e8
--- /dev/null
+++ b/src/app/components/expandable-header/expandable-header.ts
@@ -0,0 +1,137 @@
+import {
+ Component,
+ ContentChild,
+ ElementRef,
+ Input,
+ Renderer2
+} from '@angular/core';
+import { DomController, IonContent, Platform } from '@ionic/angular';
+// import { Content } from 'ionic-angular';
+@Component({
+ selector: 'expandable-header-primary',
+ template: '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ {{'Scan' | translate }}
+
+
+ {{clipboardData}}
+
+
+
+
+
+
diff --git a/src/components/footer-menu/footer-menu.scss b/src/app/components/footer-menu/footer-menu.scss
similarity index 84%
rename from src/components/footer-menu/footer-menu.scss
rename to src/app/components/footer-menu/footer-menu.scss
index 5d0ece6f334..59ac16df70e 100644
--- a/src/components/footer-menu/footer-menu.scss
+++ b/src/app/components/footer-menu/footer-menu.scss
@@ -1,5 +1,5 @@
footer-menu {
- .item-md [item-left] {
+ .item-md [slot="start"] {
margin: 0px 15px 0px 0px;
}
padding-bottom: calc(env(safe-area-inset-bottom));
@@ -38,7 +38,12 @@ footer-menu {
}
span {
- @extend .two-lines;
+ white-space: normal;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ line-clamp: 2;
+ -webkit-line-clamp: 2;
}
}
@@ -55,12 +60,12 @@ footer-menu {
font-weight: 500;
font-size: 14px;
background-color: #edf0fe;
- color: color($colors, primary);
+ color: var(--color-primary);
&.activated,
&:hover:not(.disable-hover) {
background-color: #edf0fe;
- color: color($colors, primary);
+ color: var(--color-primary);
box-shadow: none;
}
diff --git a/src/components/footer-menu/footer-menu.ts b/src/app/components/footer-menu/footer-menu.ts
similarity index 90%
rename from src/components/footer-menu/footer-menu.ts
rename to src/app/components/footer-menu/footer-menu.ts
index 8a1ef764579..0661ebb9341 100644
--- a/src/components/footer-menu/footer-menu.ts
+++ b/src/app/components/footer-menu/footer-menu.ts
@@ -1,14 +1,16 @@
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
-import { AnalyticsProvider } from '../../providers/analytics/analytics';
-import { AppProvider } from '../../providers/app/app';
-import { ConfigProvider } from '../../providers/config/config';
-import { PlatformProvider } from '../../providers/platform/platform';
+import { AnalyticsProvider } from 'src/app/providers/analytics/analytics';
+import { AppProvider } from 'src/app/providers/app/app';
+import { ConfigProvider } from 'src/app/providers/config/config';
+import { PlatformProvider } from 'src/app/providers/platform/platform';
import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
@Component({
selector: 'footer-menu',
- templateUrl: 'footer-menu.html'
+ templateUrl: 'footer-menu.html',
+ styleUrls: ['footer-menu.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class FooterMenuComponent extends ActionSheetParent {
public optionsMenu: object;
diff --git a/src/app/components/incoming-data-menu/incoming-data-menu.html b/src/app/components/incoming-data-menu/incoming-data-menu.html
new file mode 100644
index 00000000000..b66cfe3c123
--- /dev/null
+++ b/src/app/components/incoming-data-menu/incoming-data-menu.html
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+ {{'Text' | translate}}
+
+ {{data}}
+
+
+
+
+ Copy to clipboard
+
+
+
+
+ {{'Private Key' | translate}}
+ {{data}}
+
+
+
+ Sweep paper wallet
+
+
+
+
+ Copy to clipboard
+
+
+
+
+ {{'Close' | translate}}
+
+
+
\ No newline at end of file
diff --git a/src/app/components/incoming-data-menu/incoming-data-menu.scss b/src/app/components/incoming-data-menu/incoming-data-menu.scss
new file mode 100644
index 00000000000..b8d14054212
--- /dev/null
+++ b/src/app/components/incoming-data-menu/incoming-data-menu.scss
@@ -0,0 +1,26 @@
+incoming-data-menu {
+ .title {
+ padding: 1rem;
+ font-size: 24px;
+ line-height: 32px;
+ color: var(--color-light-on-surface-theme);
+ }
+
+ .address {
+ font-size: 14px;
+ color: var(--color-light-on-surface-theme);
+ padding: 0 1rem 1rem 1rem;
+ opacity: 0.6;
+ line-height: 20px;
+ }
+
+ .group-btn {
+ padding: 1rem;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ ion-button {
+ margin-right: 5px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/components/incoming-data-menu/incoming-data-menu.ts b/src/app/components/incoming-data-menu/incoming-data-menu.ts
new file mode 100644
index 00000000000..dd420c04121
--- /dev/null
+++ b/src/app/components/incoming-data-menu/incoming-data-menu.ts
@@ -0,0 +1,39 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { Coin, CurrencyProvider } from 'src/app/providers/currency/currency';
+import { PlatformProvider } from 'src/app/providers/platform/platform';
+import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
+
+@Component({
+ selector: 'incoming-data-menu',
+ templateUrl: 'incoming-data-menu.html',
+ styleUrls: ['./incoming-data-menu.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class IncomingDataMenuComponent extends ActionSheetParent {
+ public data: string;
+ public type: string;
+ public coin: Coin;
+ public coinName: string;
+ public fromHomeCard: boolean;
+ public isCordova: boolean;
+
+ constructor(
+ private currencyProvider: CurrencyProvider,
+ private platformProvider: PlatformProvider
+ ) {
+ super();
+ this.isCordova = this.platformProvider.isCordova;
+ }
+
+ ngOnInit() {
+ this.data = this.params.data.data;
+ this.type = this.params.data.type;
+ this.coin = this.params.data.coin;
+ this.coinName = this.coin && this.currencyProvider.getCoinName(this.coin);
+ this.fromHomeCard = this.params.data.fromHomeCard;
+ }
+
+ public close(redirTo: string, value: string) {
+ this.dismiss({ redirTo, value, coin: this.coin });
+ }
+}
diff --git a/src/app/components/info-sheet/info-sheet-template.html b/src/app/components/info-sheet/info-sheet-template.html
new file mode 100644
index 00000000000..a49311d25af
--- /dev/null
+++ b/src/app/components/info-sheet/info-sheet-template.html
@@ -0,0 +1,38 @@
+();
+ public onDismiss = this.dismissSubject.asObservable();
+
+ dismiss(option) {
+ this.dismissSubject.next(option);
+ }
+}
diff --git a/src/app/components/info-sheet/info-sheet.html b/src/app/components/info-sheet/info-sheet.html
new file mode 100644
index 00000000000..864970ebc70
--- /dev/null
+++ b/src/app/components/info-sheet/info-sheet.html
@@ -0,0 +1,679 @@
+
+
diff --git a/src/app/components/info-sheet/info-sheet.scss b/src/app/components/info-sheet/info-sheet.scss
new file mode 100644
index 00000000000..1fac68b2372
--- /dev/null
+++ b/src/app/components/info-sheet/info-sheet.scss
@@ -0,0 +1,147 @@
+action-sheet{
+ .info-container {
+ width: 100%;
+ height: 100%;
+ background-color: white;
+ // padding-bottom: calc(env(safe-area-inset-bottom));
+
+ .border-none {
+ .item-inner {
+ border-bottom: none !important;
+ }
+ }
+ .confirm-sheet {
+ padding: 25px;
+
+ .sheet-title {
+ align-items: center;
+ color: #060606;
+ font-size: 24px;
+ font-weight: 400;
+ line-height: 32px;
+ display: flex;
+ justify-content: flex-start;
+
+ .truncate {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .title-icon {
+ display: flex;
+ align-self: center;
+ img {
+ padding-right: 15px;
+ max-width: 40px;
+ }
+ }
+ }
+
+ .sheet-text {
+ font-size: 14px;
+ color: rgba(0, 30, 46, 0.6);
+ font-weight: 400;
+ padding: 16px 0px;
+ line-height: 20px;
+ letter-spacing: 0.25px;
+ &.no-show-title {
+ padding-top: 0;
+ }
+ }
+
+ .text-address {
+ letter-spacing: 1px;
+ }
+
+ .sheet-btn-group {
+ color: var(--color-primary);
+ margin: 1rem 0;
+ cursor: pointer;
+ display: flex;
+
+
+ .sheet-btn {
+ color: var(--color-primary);
+ flex-grow: 1;
+ margin-right: 10px;
+ font-size: 14px;
+ line-height: 20px;
+ font-weight: 600;
+ }
+
+ .sheet-btn.blue {
+ color: var(--color-primary);
+ }
+
+ .sheet-btn.yellow {
+ color: var(--color-warning);
+ }
+
+ .sheet-btn.red {
+ color: var(--color-danger);
+ }
+
+ .sheet-btn.default {
+ color: var(--color-primary);
+ }
+
+ .sheet-second-btn {
+ color: var(--color-primary);
+ font-size: 14px;
+ line-height: 20px;
+ font-weight: 600;
+ }
+
+ .sheet-second-btn.primary {
+ color: var(--color-primary);
+ }
+ }
+
+ .sheet-second-btn-group {
+ color: var(--color-primary);
+ margin: 1rem 0;
+ cursor: pointer;
+ display: flex;
+ justify-content: flex-end !important;
+
+ .sheet-third-btn {
+ font-size: 14px;
+ line-height: 20px;
+ font-weight: 600;
+ letter-spacing: 0.1px;
+ }
+
+ .sheet-fourth-btn {
+ margin-left: 32px;
+ font-size: 14px;
+ line-height: 20px;
+ font-weight: 600;
+ letter-spacing: 0.1px;
+ }
+ }
+ }
+ .custom-sheet {
+ .sheet-btn-group {
+ justify-content: flex-start;
+ flex-direction: row-reverse;
+ }
+ .sheet-btn {
+ flex-grow : unset !important;
+ padding: 0 1rem;
+
+ &.red {
+ color: inherit !important;
+ }
+ }
+ }
+
+ @media only screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) {
+ padding-bottom: 20px;
+ }
+ }
+}
+info-sheet{
+ z-index: 99999;
+}
diff --git a/src/app/components/info-sheet/info-sheet.ts b/src/app/components/info-sheet/info-sheet.ts
new file mode 100644
index 00000000000..372a3e95cd9
--- /dev/null
+++ b/src/app/components/info-sheet/info-sheet.ts
@@ -0,0 +1,37 @@
+import { Component, ViewChild, ViewEncapsulation } from '@angular/core';
+import { ExternalLinkProvider } from 'src/app/providers/external-link/external-link';
+import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
+import { InfoSheetTemplate } from './info-sheet-template';
+const configProvider = require('src/assets/appConfig.json')
+
+@Component({
+ selector: 'info-sheet',
+ templateUrl: 'info-sheet.html',
+ styleUrls: ['info-sheet.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class InfoSheetComponent extends ActionSheetParent {
+ @ViewChild(InfoSheetTemplate, {static: false})
+ infoSheetTemplate: InfoSheetTemplate;
+ public eTokenFee = configProvider.eTokenFee;
+ constructor(private externalLinkProvider: ExternalLinkProvider) {
+ super();
+ }
+ ngAfterViewInit() {
+ this.infoSheetTemplate.onDismiss.subscribe(option => {
+ this.dismiss(option);
+ });
+ }
+
+ public openInBrowser(url) {
+ if (!url) return;
+ this.externalLinkProvider.open(url);
+ this.dismiss();
+ }
+
+ public optionClicked(option): void {
+ this.dismiss(option);
+ }
+}
+
+export const INFO_SHEET_COMPONENTS = [InfoSheetComponent, InfoSheetTemplate];
diff --git a/src/app/components/label-tip/label-tip.scss b/src/app/components/label-tip/label-tip.scss
new file mode 100644
index 00000000000..a7786c1ce08
--- /dev/null
+++ b/src/app/components/label-tip/label-tip.scss
@@ -0,0 +1,84 @@
+
+::ng-deep label-tip {
+ color: #4a4a4a;
+ display: block;
+ padding: 20px;
+ position: relative;
+
+ width: 90%;
+ border-radius: 15px;
+
+ margin: 20px auto !important;
+
+ &.right-arrow:before {
+ right: 25px;
+ left: unset;
+ }
+
+ // Remove arrowhead from label
+ &.info.no-arrowhead:before,
+ &.warn.no-arrowhead:before,
+ &.danger.no-arrowhead:before {
+ display: none !important;
+ }
+
+ &.danger {
+ background: var(--background-colors-danger);
+
+ &:before {
+ border-bottom-color: var(--background-colors-danger);
+ }
+ }
+
+ &.warn {
+ background: var(--background-colors-warning);
+
+ &:before {
+ border-bottom-color: var(--background-colors-warning);
+ }
+ }
+
+ &.info {
+ background: var(--background-colors-info);
+
+ &:before {
+ border-bottom-color: var(--background-colors-info);
+ }
+ }
+
+ .label-header {
+ color: black;
+
+ &__icon {
+ margin-right: calc(var(--icon-height)/1.5);
+ height: var(--icon-height);
+ width: var(--icon-height);
+ }
+
+ align-items: center;
+ display: flex;
+ font-size: 16px;
+ margin-bottom: 20px;
+ }
+
+ [label-tip-body] {
+ font-size: 15px;
+
+ a.label-tip-link {
+ display: inline-block;
+ margin-top: 10px;
+ }
+ }
+
+ .blue a.label-tip-link {
+ color: var(--color-info);
+ }
+
+ .yellow a.label-tip-link {
+ color: var(--color-warning);
+ }
+
+ .red a.label-tip-link {
+ color: var(--color-danger);
+ }
+}
diff --git a/src/app/components/label-tip/label-tip.ts b/src/app/components/label-tip/label-tip.ts
new file mode 100644
index 00000000000..dd3cd6d232b
--- /dev/null
+++ b/src/app/components/label-tip/label-tip.ts
@@ -0,0 +1,49 @@
+import { Component, ElementRef, Input, Renderer2 } from '@angular/core';
+
+@Component({
+ selector: 'label-tip',
+ template: `
+
+
+ {{'Save' | translate}}
+
+
diff --git a/src/components/memo-component/memo-component.scss b/src/app/components/memo-component/memo-component.scss
similarity index 91%
rename from src/components/memo-component/memo-component.scss
rename to src/app/components/memo-component/memo-component.scss
index 341b59d812e..c0fa90084b5 100644
--- a/src/components/memo-component/memo-component.scss
+++ b/src/app/components/memo-component/memo-component.scss
@@ -3,9 +3,8 @@ memo-component {
margin-bottom: calc(1.5rem + env(safe-area-inset-bottom));
margin-bottom: -webkit-calc(1.5rem + env(safe-area-inset-bottom));
}
- .text-input {
+ .textarea-custom {
background: #f3f3f3;
- height: 60px;
padding: 8px;
margin: 16px;
width: 91%;
diff --git a/src/components/memo-component/memo-component.ts b/src/app/components/memo-component/memo-component.ts
similarity index 76%
rename from src/components/memo-component/memo-component.ts
rename to src/app/components/memo-component/memo-component.ts
index 4c9efc747bf..4f4f2f78ba5 100644
--- a/src/components/memo-component/memo-component.ts
+++ b/src/app/components/memo-component/memo-component.ts
@@ -1,10 +1,12 @@
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
@Component({
selector: 'memo-component',
- templateUrl: 'memo-component.html'
+ templateUrl: 'memo-component.html',
+ styleUrls: ['memo-component.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class MemoComponent extends ActionSheetParent {
public memoForm: FormGroup;
diff --git a/src/components/miner-fee-warning/miner-fee-warning.html b/src/app/components/miner-fee-warning/miner-fee-warning.html
similarity index 77%
rename from src/components/miner-fee-warning/miner-fee-warning.html
rename to src/app/components/miner-fee-warning/miner-fee-warning.html
index 49fafcc4cd0..a9aca24e994 100644
--- a/src/components/miner-fee-warning/miner-fee-warning.html
+++ b/src/app/components/miner-fee-warning/miner-fee-warning.html
@@ -12,12 +12,12 @@
\ No newline at end of file
diff --git a/src/components/miner-fee-warning/miner-fee-warning.scss b/src/app/components/miner-fee-warning/miner-fee-warning.scss
similarity index 96%
rename from src/components/miner-fee-warning/miner-fee-warning.scss
rename to src/app/components/miner-fee-warning/miner-fee-warning.scss
index 3be4c500939..5de1a5b2cae 100644
--- a/src/components/miner-fee-warning/miner-fee-warning.scss
+++ b/src/app/components/miner-fee-warning/miner-fee-warning.scss
@@ -18,6 +18,8 @@ miner-fee-warning {
.img-container {
align-self: end;
justify-self: center;
+ position: relative;
+ top: 20px;
img {
margin: auto;
max-height: 23rem;
diff --git a/src/app/components/miner-fee-warning/miner-fee-warning.ts b/src/app/components/miner-fee-warning/miner-fee-warning.ts
new file mode 100644
index 00000000000..9dd6e3fb772
--- /dev/null
+++ b/src/app/components/miner-fee-warning/miner-fee-warning.ts
@@ -0,0 +1,32 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { AppProvider } from 'src/app/providers/app/app';
+import { ExternalLinkProvider } from 'src/app/providers/external-link/external-link';
+import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
+
+@Component({
+ selector: 'miner-fee-warning',
+ templateUrl: 'miner-fee-warning.html',
+ styleUrls: ['miner-fee-warning.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class MinerFeeWarningComponent extends ActionSheetParent {
+ public appName: string;
+
+ constructor(
+ private appProvider: AppProvider,
+ private externalLinkProvider: ExternalLinkProvider
+ ) {
+ super();
+ this.appName = this.appProvider.info.nameCase;
+ }
+
+ public confirm(): void {
+ this.dismiss();
+ }
+
+ public openExternalLink(): void {
+ const url =
+ 'https://support.bitpay.com/hc/en-us/articles/115004439366-Why-is-my-recommended-bitcoin-miner-fee-so-high-';
+ this.externalLinkProvider.open(url);
+ }
+}
diff --git a/src/app/components/multisign-info/multisign-info.component.html b/src/app/components/multisign-info/multisign-info.component.html
new file mode 100644
index 00000000000..54625cd8f4a
--- /dev/null
+++ b/src/app/components/multisign-info/multisign-info.component.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ Contact Information
+
+
+ Please provide your email address to receive payment notifications
+
+
+
+
+ {{'Save' | translate}}
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+ + {{'Add Encryption' | translate}} +
+
+ {{'An encrypted passphrase is an extra layer of security that can prevent hackers from accessing your cryptocurrency if this device were ever stolen or compromised by malicious software' | translate }}
+
+
+
+
+ {{'Save' | translate}}
+
+
+
+
+
+
+ Your account key will be encrypted. The encrypt password cannot be recovered. Be sure to write it down
+
+
+
+
+ 
+
+
+
+
+
+
+
+ {{coin.name}}
+ {{coin.unitCode | uppercase}}
+
+ *
+ ${{ coin.currentPrice | number: getDigitsInfo(coin.unitCode) }}
+ {{ fiatIsoCode }}
+ USD
+
+
+ +{{ coin.totalBalanceChange | number:'1.2-2' }}%
+
+ {{opt.value.mainLabel}}
+ {{opt.value.secondaryLabel}}
+
+ {{'Scan' | translate }}
+
+ {{'Scanned address'}}
+
+
+ {{data}}
+
+
+
+
+ {{"Copy" | translate}}
+
+
+ {{"Send" | translate}}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/info-sheet/info-sheet-template.ts b/src/app/components/info-sheet/info-sheet-template.ts
new file mode 100644
index 00000000000..d654cd4b959
--- /dev/null
+++ b/src/app/components/info-sheet/info-sheet-template.ts
@@ -0,0 +1,33 @@
+import { Component, Input } from '@angular/core';
+import { Subject } from 'rxjs';
+
+export enum AlertType {
+ info = 'info',
+ success = 'success',
+ warning = 'warning',
+ danger = 'danger',
+ love = 'love',
+ safeguard = 'safeguard'
+}
+
+@Component({
+ selector: 'info-sheet-template',
+ templateUrl: 'info-sheet-template.html',
+})
+export class InfoSheetTemplate {
+ @Input()
+ type: AlertType | any;
+
+ @Input()
+ sheetSecondBtnGroup: any = 'false';
+
+ @Input()
+ isShowTitle: any = 'true';
+
+ private dismissSubject = new Subject
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'Copied {coin} address' | translate: {coin: params.coin | uppercase }
+ }}
+ {{params.address}}
+ OK
+
+
+
+ Needs Backup
+
+ Congratulations! It looks like you've recently received money. It's highly advised that you verify your recovery phrase so that your funds can be recovered in case your phone was lost or stolen.
+
+ Continue
+ Not right now
+
+
+
+ Miner Fee Notice
+
+ {{'Because you are sending the maximum amount contained in this account, the {coinName} miner fee ({fee} {coin}) will be deducted from the total. {msg}' | translate: {coinName: params.coinName, fee: params.fee, coin:params.coin, msg: params.msg} }}
+
+ GOT IT
+
+
+
+
+ Miner Fee Notice
+
+ {{'Because you are speeding up this transaction, the {coinName} miner fee ({fee} {coin}) will be deducted from the total.' | translate: {coinName: params.coinName, fee: params.fee, coin:params.coin} }}
+
+ GOT IT
+
+
+
+
+ Insufficient funds for fee
+ Insufficient funds for fee in your ETH linked wallet
+
+ {{ 'Current fee value:' | translate }} {{params.fee}} ({{params.feeAlternative}})
+
+
+ {{ 'Keep in mind fees are not charged by AbcPay.' | translate }} +
+
+ {{ 'Before sending more funds to complete this transaction we recommend you read more about miner fees.' | translate }} +
+
+ {{ "If you don't mind waiting longer for this transaction to confirm you can change to a lower miner fee level." | translate }} + +
+
+ {{ 'Current fee value:' | translate }} {{params.fee}} ({{params.feeAlternative}})
+
+ {{ 'Keep in mind fees are not charged by AbcPay.' }} + +
+ Learn More
+ CANCEL
+ CHOOSE FEE LEVEL
+
+
+
+ Not enough funds
+
+ {{ 'You are trying to send more funds than you have available. Make sure you do not have funds locked by pending transaction proposals. You can also try with a lower amount or send max.' | translate }}
+
+ Change Amount
+ Send Max
+
+
+
+ We couldn't find your account!
+
+ {{ 'There are no records of your account on our servers. If you are importing a BIP44 compatible account from a 3rd party you can continue to recreate it. If you account is not BIP44 compatible, you will not be able to access its funds.' | translate }}
+
+ Go Back
+ Continue Anyway
+
+
+
+ {{params.title}}
+ {{params.msg}}
+ GOT IT
+
+ {{ params.secondBtnText }}
+
+
+
+ {{params.title}}
+ {{params.msg}}
+ Cancel
+ Try agian
+
+
+
+ Are you sure?
+
+ Receiving funds will be temporarily disabled until you can verify your key has been stored away securely. You can always complete this later.
+
+ I'M SURE
+ GO BACK
+
+
+
+ {{'Your {walletType} account is backed up!' | translate : {walletType: params.walletType} }}
+
+ Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recovered without it.
+
+ GOT IT
+
+
+
+
+ Recovery Key
+
+ Your recovery key is composed of 12 randomly selected words. Please carefully write down each word in the order it appears.
+
+ OK
+
+
+
+ Sensitive Data
+
+ The information you are about to share/export may contain sensitive data such us account IDs, addresses, balances, etc. Please be sure you trust the person or entity with whom you are sharing this information.
+
+ Cancel
+ I understand
+
+
+
+ Copied to Clipboard
+ {{params?.msg}}
+ GOT IT
+
+
+
+ Delete Contact
+ Are you sure you want to delete this contact?
+ Cancel
+ Ok
+
+
+
+ Permanently delete?
+ All accounts using this key are permanently deleted. This action cannot be reversed
+ Cancel
+ Delete
+
+
+
+ Reset All Settings
+ Do you want to reset all settings to default value?
+ Cancel
+ Ok
+
+
+
+ Help and support information is avalable at the website
+ Cancel
+ Open
+
+
+
+ Insufficient funds
+ In order to send eToken, your eCash (XEC) account must have the minimum balance greater than {{eTokenFee}} XEC. Please see #send-etoken for more detail!
+ Got it
+
+
+
+ {{'Copied: {claimCode}' | translate: params }}
+
+
+
+
+ Select an Ethereum Wallet
+ Ethereum wallet required
+ Which Ethereum wallet would you like this token to use for transaction costs?
+ Which Ethereum wallet would you like this multisig wallet to use for transaction costs?
+
+
+ In order to create a token wallet, an Ethereum (ETH) wallet is required. Please create an ETH wallet first. Only one {{ params.token.name }} wallet is allowed per ETH wallet.
+
+
+ In order to create this multisig wallet, an Ethereum (ETH) wallet with enough funds is required.
+
+
+
+
+
+
+
+ Copied: {{params.invoiceUrl}}
+
+
+ Error: {{params.error}}
+
+
+
+
+
+ {{'Archive All {brand} Gift Cards?' | translate: params }}
+ {{'Have you redeemed all of your {brand} Gift Cards? Archived gift cards will still be accessible in settings.' | translate: params }}
+ YES
+
+
+
+ Archive this Card?
+ Have you redeemed the entire balance of this gift card?
+ YES
+
+
+
+ Hide discount?
+ Would you like to hide this gift card discount?
+ YES
+
+
+
+ Card Archived
+ You can continue to view your archived cards here if you need to access them.
+ OK
+
+
+
+ Activation Fee
+ {{'{displayName} gift cards contain an additional activation fee of {fee} {currency}.' | translate: params }}
+ OK
+
+
+
+ Temporarily Unavailable
+ Gift card purchases are temporarily unavailable. Please try again later.
+ OK
+
+
+
+ Below Minimum Amount
+ {{'The purchase amount must be at least {minAmount} {currency}. Please modify your amount.' | translate: params }}
+ GOT IT
+
+
+
+
+ Purchase Limit Reached
+
+ {{'The purchase amount is limited to {maxAmount} {currency} per day. Please modify your amount.' | translate:params }}
+
+ GOT IT
+
+
+
+
+ {{'{appName} BCH wallets use the CashAddr format by default' | translate: {appName:params.appName} }}
+
+ If you need to send to "old" addresses (like the one you just pasted), and you are SURE those are BCH addresses, you can "translate" them to the corresponding address in CashAddr format.
+
+ Translate address
+ GOT IT
+
+
+
+ We appreciate your review
+
+ 5-star ratings help us get AbcPay Wallet into more hands, and more users means more resources can be committed to the app!
+
+ {{'Continue to {storeName}' | translate: {storeName: params?.storeName}
+ }}
+
+
+
+ Payment Request info
+
+ {{'Share this QR code to receive {amount} in your account {name}.' | translate: {amount: params.amount, name:params.name} }}
+
+ GOT IT
+
+
+
+ Payment method updated
+
+ {{'Only the payment methods supported to buy {coin} with {currency} will be shown.' | translate: {coin: params.coin | uppercase, currency:params.currency | uppercase} }}
+
+
+ {{'SEPA Bank Transfer purchases are not supported outside the European Union.' | translate: {coin: params.coin | uppercase, currency:params.currency | uppercase} }}
+
+ GOT IT
+
+
+
+
+ {{params.countryCode === 'US' ? 'U.S.' : params.countryCode}} Phone Required
+
+ {{'Only a {name} phone number can be used for this purchase.' | translate: {name:params.country.name} }}
+
+ GOT IT
+
+
+
+
+ Printed Gift Card Required
+
+ {{'{displayName} requires you to present a printed gift card at redemption.' | translate: params }}
+
+ You will be able to print this gift card upon completing your purchase. + + GOT IT + +
+
+
+ {{params.title}}
+ {{params.body}}
+ OK
+
+
+
+ Request a new feature
+
+ If you need immediate help with a problem you are having, then get help by contacting our support team.
+
+ Get help
+ Request feature
+
+
+
+ Report an issue
+
+ Found something broken? Please report it as a bug. If you need immediate help with a problem you are having, then get help by contacting our support team.
+
+ Get help
+ Report issue
+
+
+
+ Store this key separately
+
+ This is a new 12-word key that manages its own set of accounts. It is unrelated to any 12 word key you may have previously created. Store and manage it accordingly.
+
+ Learn More
+ GOT IT
+
+
+
+ Warning!
+
+ Legacy address types in Bitcoin Cash are OBSOLETE. Only use this feature if you are required to provide a legacy address to the sending party
+
+ I Understand
+ Cancel
+
+
+
+ Warning!
+
+ Sending BTC to a Bitcoin Cash legacy address will result on permanent lost of funds. This feature is only for advanced users.
+
+ Cancel
+ Show me the legacy address
+
+
+
+
+ Warning!
+
+ {{'Depositing any other crypto asset besides {coin} to this address may result in the total loss of your funds. AbcPay is not responsible for any funds loss due to the deposit of a different asset, wallet or network.' | translate: {coin: params.coin } }}
+
+
+
+ + {{'Important note: Keep in mind AbcPay has suspended XRP as a payment method, this includes loads to the AbcPay Card, AbcPay invoices and in-app purchases' | translate }} + + + +
+
+ {{'Depositing any other crypto asset besides {coin} to this address or doing it through any other network than ERC20 may result in the total loss of your funds. AbcPay is not responsible for any funds loss due to the deposit of a different asset, wallet or network.' | translate: {coin: params.coin } }}
+
+
+ I Understand
+
+
+
+ Wrong password
+
+ Forgot your password?
+
+
+
+ Transaction still unconfirmed
+
+ This transaction is taking longer than usual to confirm. You can try to speed it up by using a higher fee.
+
+ Speed up transaction
+ View details
+
+
+
+ RBF transaction
+
+ Be careful. Until it confirms, the transaction could be replaced/redirected by the sender. You can try to speed it up by using a higher fee.
+ Read more
+
+ Speed up transaction
+ View details
+
+
+
+ Unconfirmed inputs
+
+ Be careful. Some inputs of this transaction have no confirmations. Please wait until they are confirmed.
+
+ View details
+
+
+
+ {{ 'Subtotal' | translate }}
+
+ {{ 'For AbcPay invoices and gift cards the subtotal amount is the product or service amount plus network costs.' | translate }}
+ Read more
+
+ GOT IT
+
+
+
+
+ {{ 'Total' | translate }}
+
+ {{ 'The total amount is the subtotal amount plus transaction fees.' | translate }}
+ Read more
+
+ GOT IT
+
+
+
+
+ No accounts available
+
+ What could have happened?
+
+
+
+ Something went wrong
+
+ What could have happened?
+
+
+
+ No account available
+
+ {{'You do not have a {coin} account able to receive funds. If you decide to create it, remember it needs to be backed up.' | translate: {coin: params.coin ? params.coin : ''} }}
+
+ Create Account
+ GOT IT
+
+
+
+ Payment Error
+
+ There was an error with the payment process through Wyre.
+
+ Visit Help Center
+ GOT IT
+
+
+
+ Protect your money
+
+ First, lets ensure no one can easily access your crypto funds when you’re away from your device by adding biometric security.
+
+ OK
+
+
+
+ Maybe a pincode instead?
+
+ A pincode will ensure no one can easily access your crypto funds when you're away from your device.
+
+ Continue
+
+
+
+ Key verification required
+
+ In order to begin purchasing and receiving cryptocurrencies you will need to verify your key. This could take up to 3 minutes long to complete.
+
+ VERIFY NOW
+ DO THIS LATER
+
+
+
+ Are you sure?
+
+ Without encrypting your account, a thief or another app on this device could potentially access your money.
+
+ I'M SURE
+ GO BACK
+
+
+
+ Connect Your AbcPay ID
+
+ To complete this payment, please login with your AbcPay ID.
+
+ CONTINUE
+
+
+
+ Verification Required
+
+ To complete this payment, a verified account is required.
+
+ CONTINUE
+
+
+
+ Incorrect Recovery Phrase
+
+ The recovery phrase you provided was incorrect. Lets review that you have written down the correct words in the correct order.
+
+ TRY AGAIN
+
+
+
+ Perfect!
+
+ In order to protect your funds from being accessible to hackers and thieves, store this recovery phrase in a safe and secure place.
+
+ OK
+
+
+
+ {{ params.error ? 'Error' : 'Warning!' }}
+
+ {{params.name}} ({{params.isoCode}}) is no longer supported. Please select another alternative currency.
+
+ GOT IT
+ CONTINUE
+ DO THIS LATER
+
+
+
+ Warning!
+
+ The fee you are using is lower than the Super Economy level, we do not recommend doing this as the transaction will take very long to confirm or may never do it. You can continue at your own responsibility.
+
+ Change Miner Fee
+ GOT IT
+
+
+
+ Error
+
+ As the estimated miner fee to complete the transaction is {{params.fee}} {{params.coin}}, the maximum spendable amount of your account is {{params.amount}} {{params.coin}} which is lower than the minimum allowed by the exchange: {{params.minAmount}} {{params.coin}}
+ {{params.msg}}
+
+ GOT IT
+
+
+
+ Error
+
+ The amount entered is lower than the minimum allowed: {{params.minAmount}} {{params.coin}}
+
+ Use Min Amount
+ GOT IT
+
+
+
+ Error
+
+ The amount entered is greater than the maximum allowed: {{params.maxAmount}} {{params.coin}}
+
+ Use Max Amount
+ GOT IT
+
+
+
+
+ Reminder
+
+ Keep in mind that once the funds are received in your {{params.coin}} wallet, to move them you will need to have enough funds in your Ethereum linked wallet ({{params.linkedEthWalletName}}) to pay the ETH miner fees.
+
+ GOT IT
+
+
+
+ {{params.title}}
+ {{params.msg}}
+ OK
+
+
+
+ Warning!
+
+ {{ 'Testnet is an alternative {coinName} block chain meant for testing. This allows application developers and testers to experiment without having to use real {coinName}. Testnet coins are different from actual {coinName}, and do not have any value. They cannot be converted into "real" coins and cannot be exchanged or sold as they have no value.' | translate : {coinName: params.coinName } }}
+
+ I Understand
+ Cancel
+
+
+
+ The transaction is taking longer than usual to confirm
+ When your transaction is confirmed, the multisig account will show up in the account list. You can check the transaction status in the account history.
+ OK
+
+
+
+ Someone asked you to join a multisig account?
+ You are about to join a shared account. This is an advanced feature, make sure you understand how multisig accounts work before putting funds in it. If a third party invited you to join, make sure you trust them, if you have purchased cryptocurrency they may be scamming you.
+
+ READ MORE
+ GOT IT
+
+
++
+ {{ 'Keep in mind fees are not charged by AbcPay.' | translate }} +
+
+ {{ 'Before sending more funds to complete this transaction we recommend you read more about miner fees.' | translate }} +
+
+ {{ "If you don't mind waiting longer for this transaction to confirm you can change to a lower miner fee level." | translate }} + +
+
+ {{ 'Keep in mind fees are not charged by AbcPay.' }} + +
+
+
+
+
+
+ GO BACK
+ GOT IT
+
+
+ +
+ You will be able to print this gift card upon completing your purchase. + + GOT IT + +
+
+ + {{'Important note: Keep in mind AbcPay has suspended XRP as a payment method, this includes loads to the AbcPay Card, AbcPay invoices and in-app purchases' | translate }} + + + +
-
+
- + Try entering any passwords you may have set in the past + +
- + Remember there are no special requirements for the password (numbers, symbols, etc.) + +
- + Keep in mind your encrypt password is not the 12-word recovery phrase + +
- + You can always reset your encrypt password on your key settings under the option Clear Encrypt Password using your 12 words recovery phrase + +
-
+
- + There are no accounts with enough funds to make the payment + +
- + Part or the entirety of the funds in your account/s are unconfirmed + +
- Your wallet is testnet +
-
+
- You have entered the phrase without spaces +
- The recovery phrase is invalid +
- + {{'You have only entered {wordListLength} word, please follow the recommendations provided' | translate: params }} + +
- + {{'You have only entered {wordListLength} words, please follow the recommendations provided' | translate: params }} + +
+
+ `,
+ styleUrls: ['label-tip.scss']
+})
+export class LabelTip {
+ @Input()
+ type: string;
+ @Input()
+ header: string;
+
+ constructor(private element: ElementRef, private renderer: Renderer2) {}
+
+ ngOnChanges() {
+ this.renderer.addClass(this.element.nativeElement, this.type);
+ }
+}
diff --git a/src/app/components/memo-component/memo-component.html b/src/app/components/memo-component/memo-component.html
new file mode 100644
index 00000000000..a3fb6d7e0be
--- /dev/null
+++ b/src/app/components/memo-component/memo-component.html
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+ Memo
+
+
+
+ Transaction fees are currently high
+
+{{ 'Multisig {m} - {n}' | translate: {m: wallet.m , n: wallet.n} }}
+{{'This account requires {m} copayers to sign a transaction (out of {n} copayers in total).' | + translate :{m: wallet.m , n: wallet.n} }}
+
+
+ {{'Got it' | translate}}
+
+
+
+
+
+
+
+ {{'Write Down Recovery Phrase' | translate}}
+
+
+
+ 
+
+
+
+ Needs Backup
+
+
+ Before retrieving your account address, it's recommended that you first write down your recovery phrase and store it securely so that your account can be recovered in the case your device was lost or stolen.
+
+
+
+
+
+
+ Request Specific Amount
+
+
+
+
+
+
+
+ Share Address
+
+
+
+
+
+
+
+
+
+ Archive Card
+
+
+
+
+
+
+
+ Unarchive Card
+
+
+
+
+
+
+
+ View Invoice
+
+
+
+
+
+
+
+ Share Claim Code
+
+
+
+
+
+
+
+ Print Card
+
+
+
+
+
+
+
+ Send {{params?.coin}} to contact
+
+
+
+
+
+ Delete
+
+
+
+
+
+
+
+ Transfer to Multiple Recipients
+
+
+
+
+
+
+
+ Select inputs for transaction
+
+
+
+ Select Your Country
diff --git a/src/components/phone-sheet/phone-sheet.scss b/src/app/components/phone-sheet/phone-sheet.scss
similarity index 93%
rename from src/components/phone-sheet/phone-sheet.scss
rename to src/app/components/phone-sheet/phone-sheet.scss
index 8e9f3483023..eafafa6bd93 100644
--- a/src/components/phone-sheet/phone-sheet.scss
+++ b/src/app/components/phone-sheet/phone-sheet.scss
@@ -1,13 +1,13 @@
phone-sheet {
.no-thanks {
- color: $color-primary;
+ color: var(--color-primary);
text-align: center;
font-size: 17px;
font-weight: 600;
margin-top: 24px;
}
- search-bar {
+ ion-searchbar {
color: black;
padding-left: 0;
padding-right: 0;
@@ -27,7 +27,7 @@ phone-sheet {
font-weight: 500;
&__code {
- color: $color-primary;
+ color: var(--color-primary);
padding-left: 10px;
font-weight: 600;
}
diff --git a/src/components/phone-sheet/phone-sheet.ts b/src/app/components/phone-sheet/phone-sheet.ts
similarity index 82%
rename from src/components/phone-sheet/phone-sheet.ts
rename to src/app/components/phone-sheet/phone-sheet.ts
index 0bc128cf85f..dadc0f79627 100644
--- a/src/components/phone-sheet/phone-sheet.ts
+++ b/src/app/components/phone-sheet/phone-sheet.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
import { Subject } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
import { getPhoneCountryCodes } from '../../providers/phone/phone';
@@ -6,7 +6,9 @@ import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
@Component({
selector: 'phone-sheet',
- templateUrl: 'phone-sheet.html'
+ templateUrl: 'phone-sheet.html',
+ styleUrls: ['phone-sheet.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class PhoneSheet extends ActionSheetParent {
public countries;
@@ -25,7 +27,8 @@ export class PhoneSheet extends ActionSheetParent {
this.updateCountryList();
}
- public onSearch(query: string) {
+ public onSearch(event: any) {
+ const query = event.target.value;
this.searchQuerySubject.next(query);
}
diff --git a/src/components/price-chart/price-chart.html b/src/app/components/price-chart/price-chart.html
similarity index 82%
rename from src/components/price-chart/price-chart.html
rename to src/app/components/price-chart/price-chart.html
index 7ea2b2157c3..5be88392a20 100644
--- a/src/components/price-chart/price-chart.html
+++ b/src/app/components/price-chart/price-chart.html
@@ -1,5 +1,5 @@
;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ RecipientComponent ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(RecipientComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/recipient/recipient.component.ts b/src/app/components/recipient/recipient.component.ts
new file mode 100644
index 00000000000..6906b33670e
--- /dev/null
+++ b/src/app/components/recipient/recipient.component.ts
@@ -0,0 +1,767 @@
+import { Component, EventEmitter, Input, OnInit, Output, SimpleChange, ViewChild, ViewEncapsulation } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import * as _ from 'lodash';
+
+
+// Providers
+import { ActionSheetProvider } from '../../providers/action-sheet/action-sheet';
+import { AddressProvider } from '../../providers/address/address';
+import { AppProvider } from '../../providers/app/app';
+import { Config, ConfigProvider } from '../../providers/config/config';
+import { Coin, CurrencyProvider } from '../../providers/currency/currency';
+import { ErrorsProvider } from '../../providers/errors/errors';
+import { IncomingDataProvider } from '../../providers/incoming-data/incoming-data';
+import { Logger } from '../../providers/logger/logger';
+import { PlatformProvider } from '../../providers/platform/platform';
+import { TxFormatProvider } from '../../providers/tx-format/tx-format';
+import { ModalController, NavParams } from '@ionic/angular';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { Router } from '@angular/router';
+import { ProfileProvider } from 'src/app/providers/profile/profile';
+import { timer } from 'rxjs';
+import { RecipientModel } from './recipient.model';
+import { FilterProvider } from 'src/app/providers/filter/filter';
+import { RateProvider } from 'src/app/providers/rate/rate';
+import { AddressBookProvider, ClipboardProvider, ThemeProvider } from 'src/app/providers';
+import { Token } from 'src/app/models/tokens/tokens.model';
+import { TransferToModalPage } from 'src/app/pages/send/transfer-to-modal/transfer-to-modal';
+
+@Component({
+ selector: 'recipient-component',
+ templateUrl: './recipient.component.html',
+ styleUrls: ['./recipient.component.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class RecipientComponent implements OnInit {
+ public search: string = '';
+ public amount: string = '';
+ navParamsData: any;
+ public isCordova: boolean;
+ public expression;
+ public onlyIntegers: boolean;
+ public allowSend: boolean;
+ public globalResult: string;
+ private availableUnits;
+ private altUnitIndex: number;
+ private unitIndex: number;
+ public fiatCode: string;
+ private alternativeCurrency;
+ public config: Config;
+ public fixedUnit: boolean;
+ public unit: string;
+ private unitDecimals: number;
+ altCurrencyInitial: any;
+ public alternativeUnit: string;
+ private unitToSatoshi: number;
+ private satToUnit: number;
+ public alternativeAmount: string;
+ public useSendMax: boolean;
+ public validDataFromClipboard;
+ public darkThemeString: string;
+ public searchValue: string;
+ validAddress = false;
+ validAmount = false;
+ isSelectedTotalAmout: boolean = false;
+ remaining: number;
+ isShowReceiveLotus: boolean;
+ receiveLotus: string;
+ receiveAmountLotus: number;
+ formatRemaining: string;
+ messagesReceiveLotus: boolean = false;
+ @Input()
+ recipient: RecipientModel;
+
+ @Input()
+ isShowSendMax: boolean;
+
+ @Input()
+ isShowDelete: boolean;
+
+ @Input()
+ wallet: any;
+
+ @Input()
+ token: Token;
+
+ @Input()
+ amountFromSelectedInput?: number;
+
+ @Input()
+ isShowSelectInput?: boolean;
+
+ @Input()
+ isDonation?: boolean;
+
+ @Output() deleteEvent?= new EventEmitter();
+ @Output() sendMaxEvent?= new EventEmitter();
+
+ private validDataTypeMap: string[] = [
+ 'BitcoinAddress',
+ 'BitcoinCashAddress',
+ 'ECashAddress',
+ 'LotusAddress',
+ 'EthereumAddress',
+ 'EthereumUri',
+ 'RippleAddress',
+ 'DogecoinAddress',
+ 'LitecoinAddress',
+ 'RippleUri',
+ 'BitcoinUri',
+ 'BitcoinCashUri',
+ 'DogecoinUri',
+ 'LitecoinUri',
+ 'BitPayUri',
+ 'ECashUri',
+ 'LotusUri'
+ ];
+ @ViewChild('transferTo')
+ transferTo;
+ constructor(
+ private configProvider: ConfigProvider,
+ private currencyProvider: CurrencyProvider,
+ private router: Router,
+ private navParams: NavParams,
+ private incomingDataProvider: IncomingDataProvider,
+ private profileProvider: ProfileProvider,
+ private addressProvider: AddressProvider,
+ private appProvider: AppProvider,
+ private translate: TranslateService,
+ private errorsProvider: ErrorsProvider,
+ private actionSheetProvider: ActionSheetProvider,
+ private platformProvider: PlatformProvider,
+ private txFormatProvider: TxFormatProvider,
+ private logger: Logger,
+ private filterProvider: FilterProvider,
+ private rateProvider: RateProvider,
+ private events: EventManagerService,
+ private clipboardProvider: ClipboardProvider,
+ private themeProvider: ThemeProvider,
+ private modalCtrl: ModalController,
+ private addressBookProvider: AddressBookProvider
+ ) {
+ this.darkThemeString = this.themeProvider.currentAppTheme === 'dark' ? 'dark' : 'light';
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state;
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ this.isCordova = this.platformProvider.isCordova;
+ this.expression = '';
+ this.onlyIntegers = this.navParamsData.onlyIntegers
+ ? this.navParamsData.onlyIntegers
+ : false;
+ this.alternativeCurrency = this.navParamsData.alternativeCurrency;
+ this.config = this.configProvider.get();
+ this.fixedUnit = this.navParamsData.fixedUnit;
+ this.events.subscribe('Local/AddressScan', this.updateAddressHandler);
+ this.isDonation = this.navParamsData.isDonation;
+ if (this.isDonation) {
+ this.remaining = this.navParamsData.remaining;
+ this.receiveAmountLotus = this.navParamsData.receiveLotus;
+ const coin = _.get(this.navParams, 'data.donationCoin', 'xpi');
+ const precision = this.currencyProvider.getPrecision(coin as Coin).unitToSatoshi;
+ this.formatRemaining = this.txFormatProvider.formatAmount(coin, precision * this.remaining);
+ }
+
+ }
+
+ ngOnInit() {
+ this.setAvailableUnits(!!(this.token && this.token.tokenId));
+ this.updateUnitUI(!!(this.token && this.token.tokenId));
+ if (this.recipient && this.recipient.toAddress && !this.isDonation) {
+ this.searchValue = this.recipient.toAddress;
+ this.processInput();
+ }
+ }
+
+ ngOnChanges(changes: { [property: string]: SimpleChange }) {
+ if (this.isSelectedTotalAmout) {
+ const currentAmountInput = _.get(changes, 'amountFromSelectedInput.currentValue', undefined)
+ if (!_.isUndefined(currentAmountInput)) {
+ this.expression = this.amountFromSelectedInput;
+ this.processAmount()
+ }
+ }
+ }
+
+ public changeUnit(isToken?: boolean, isSendMax?: boolean): void {
+ if (this.fixedUnit) return;
+
+ this.unitIndex++;
+ if (this.unitIndex >= this.availableUnits.length) this.unitIndex = 0;
+
+ if (this.availableUnits[this.unitIndex].isFiat) {
+ // Always return to BTC... TODO?
+ this.altUnitIndex = 0;
+ } else {
+ this.altUnitIndex = _.findIndex(this.availableUnits, {
+ isFiat: true
+ });
+ }
+
+ this.expression = '';
+ this.updateUnitUI(!!isToken, !!isSendMax);
+ }
+
+ private updateAddressHandler: any = data => {
+ if (data.recipientId === this.recipient.id) {
+ this.searchValue = data.value;
+ }
+ };
+
+ private updateUnitUI(isToken?: boolean, isSendMax?: boolean): void {
+ this.unit = this.availableUnits[this.unitIndex].shortName;
+ this.alternativeUnit = this.availableUnits[this.altUnitIndex].shortName;
+ if (!isToken) {
+ const { unitToSatoshi, unitDecimals } = this.availableUnits[this.unitIndex]
+ .isFiat
+ ? this.currencyProvider.getPrecision(
+ this.availableUnits[this.altUnitIndex].id
+ )
+ : this.currencyProvider.getPrecision(this.unit.toLowerCase() as Coin);
+ this.unitToSatoshi = unitToSatoshi;
+ this.satToUnit = 1 / this.unitToSatoshi;
+ this.unitDecimals = unitDecimals;
+ }
+ this.processAmount(isSendMax ? true : false);
+ this.logger.debug(
+ 'Update unit coin @amount unit:' +
+ this.unit +
+ ' alternativeUnit:' +
+ this.alternativeUnit
+ );
+ }
+
+ private setAvailableUnits(isToken?: boolean): void {
+ this.availableUnits = [];
+
+ const parentWalletCoin = !isToken ? (this.navParamsData.wallet
+ ? this.navParamsData.wallet.coin
+ : this.wallet && this.wallet.coin)
+ : this.token.tokenInfo.coin;
+
+ if (isToken) {
+ this.availableUnits.push({
+ name: this.token.tokenInfo.name,
+ id: this.token.tokenId,
+ shortName: this.token.tokenInfo.symbol
+ });
+ } else {
+ for (const coin of this.currencyProvider.getAvailableCoins()) {
+ if (parentWalletCoin === coin || !parentWalletCoin) {
+ const { unitName, unitCode } = this.currencyProvider.getPrecision(coin);
+ this.availableUnits.push({
+ name: this.currencyProvider.getCoinName(coin),
+ id: unitCode,
+ shortName: unitName
+ });
+ }
+ }
+ }
+
+
+ this.unitIndex = 0;
+
+ if (this.navParamsData.coin) {
+ let coins = this.navParamsData.coin.split(',');
+ let newAvailableUnits = [];
+
+ _.each(coins, (c: string) => {
+ let coin = _.find(this.availableUnits, {
+ id: c
+ });
+ if (!coin) {
+ this.logger.warn(
+ 'Could not find desired coin:' + this.navParamsData.coin
+ );
+ } else {
+ newAvailableUnits.push(coin);
+ }
+ });
+
+ if (newAvailableUnits.length > 0) {
+ this.availableUnits = newAvailableUnits;
+ }
+ }
+
+ // currency have preference
+ let fiatName;
+ if (this.navParamsData.currency) {
+ this.fiatCode = this.navParamsData.currency;
+ this.altUnitIndex = this.unitIndex;
+ this.unitIndex = this.availableUnits.length;
+ } else {
+ this.fiatCode =
+ this.alternativeCurrency ||
+ this.config.wallet.settings.alternativeIsoCode ||
+ 'USD';
+ fiatName = this.config.wallet.settings.alternativeName || this.fiatCode;
+ this.altUnitIndex = this.availableUnits.length;
+ }
+
+ this.availableUnits.push({
+ name: fiatName || this.fiatCode,
+ // TODO
+ id: this.fiatCode,
+ shortName: this.fiatCode,
+ isFiat: true
+ });
+
+ if (this.navParamsData.fixedUnit) {
+ this.fixedUnit = true;
+ }
+ if (this.token) {
+ if (!this.rateProvider.getRate(this.fiatCode, this.token.tokenInfo.symbol)) {
+ this.fixedUnit = true;
+ }
+ }
+ }
+
+ private isExpression(val: string): boolean {
+ const regex = /^\.?\d+(\.?\d+)?([\/\-\+\*x]\d?\.?\d+)+$/;
+ return regex.test(val);
+ }
+
+ private isOperator(val: string): boolean {
+ const regex = /[\/\-\+\x\*]/;
+ return regex.test(val);
+ }
+
+ private evaluate(val: string) {
+ let result;
+ try {
+ result = eval(val);
+ } catch (e) {
+ return 0;
+ }
+ if (!_.isFinite(result)) return 0;
+ return result;
+ }
+
+ private format(val: string): string {
+ if (!val) return undefined;
+
+ let result = val.toString();
+
+ if (this.isOperator(_.last(val))) result = result.slice(0, -1);
+
+ return result.replace('x', '*');
+ }
+
+ private processResult(val): number {
+ if (this.availableUnits[this.unitIndex].isFiat)
+ return +this.filterProvider.formatFiatAmount(val);
+ else
+ return +this.txFormatProvider.formatAmount(
+ this.unit.toLowerCase(),
+ val.toFixed(this.unitDecimals) * this.unitToSatoshi,
+ true
+ );
+ }
+
+ private fromFiat(val: number, coin?: Coin): number {
+ coin = coin || this.availableUnits[this.altUnitIndex].id;
+ return parseFloat(
+ (
+ this.rateProvider.fromFiat(val, this.fiatCode, coin) * this.satToUnit
+ ).toFixed(this.unitDecimals)
+ );
+ }
+
+ private fromFiatToken(val: number, tokenSymbol): number {
+ return parseFloat(
+ (
+ this.rateProvider.fromFiatToken(val, this.fiatCode, tokenSymbol)
+ ).toFixed(2)
+ );
+ }
+
+ changeSelectedAmount(event) {
+ if (this.isSelectedTotalAmout) {
+ this.expression = this.amountFromSelectedInput;
+ this.processAmount()
+ }
+ }
+
+ private toFiat(val: number, coin?: Coin): number {
+ if (
+ !this.rateProvider.getRate(
+ this.fiatCode,
+ coin || this.availableUnits[this.unitIndex].id
+ )
+ )
+ return undefined;
+
+ const rateProvider = this.rateProvider
+ .toFiat(
+ val * this.unitToSatoshi,
+ this.fiatCode,
+ coin || this.availableUnits[this.unitIndex].id
+ )
+ if (_.isNil(rateProvider)) return undefined;
+ return parseFloat(rateProvider.toString());
+ }
+
+ public processAmount(isSendMax?: boolean): void {
+ if(this.token && isSendMax){
+ this.expression = this.token.amountToken;
+ }
+ let formatedValue = this.format(this.expression);
+ let result = this.evaluate(formatedValue);
+ this.allowSend = this.onlyIntegers
+ ? _.isNumber(result) && +result > 0 && Number.isInteger(+result)
+ : _.isNumber(result) && +result > 0;
+
+ if (_.isNumber(result)) {
+
+ this.globalResult = this.isExpression(this.expression)
+ ? '= ' + this.processResult(result)
+ : '';
+
+
+ if (this.availableUnits[this.unitIndex].isFiat) {
+ let a = result === 0 ? 0 : this.fromFiat(result);
+ if (a) {
+ this.alternativeAmount = this.txFormatProvider.formatAmount(
+ this.availableUnits[this.altUnitIndex].id,
+ a * this.unitToSatoshi,
+ true
+ );
+ } else {
+ this.alternativeAmount = result ? 'N/A' : '0.00';
+ this.allowSend = false;
+ }
+ if (this.isDonation) {
+ this.handleReceiveLotus(result);
+ }
+ } else {
+ this.alternativeAmount = this.filterProvider.formatFiatAmount(
+ this.toFiat(result)
+ );
+ if (this.isDonation) {
+ this.handleReceiveLotus(this.toFiat(result));
+ }
+ }
+ }
+ let unit = this.availableUnits[this.unitIndex];
+ let amount = result;
+ if (this.token) {
+ const decimals = _.get(this.token, 'tokenInfo.decimals', undefined);
+ const unitDecimal = Math.pow(10, decimals);
+ if (!unit.isFiat) {
+ if (decimals && result > 0) amount = (amount * unitDecimal).toFixed(0);
+ this.recipient.amount = parseInt(amount, 10);
+ const alternativeAmount = this.rateProvider.toFiatToken(
+ result,
+ this.wallet.cachedStatus.alternativeIsoCode,
+ this.token.tokenInfo.symbol
+ );
+ this.alternativeAmount = this.filterProvider.formatFiatAmount(alternativeAmount);
+ this.recipient.altAmountStr = this.alternativeAmount;
+ }
+ else {
+ amount = this.fromFiatToken(amount, this.token.tokenInfo.symbol);
+ this.recipient.amount = parseInt((amount * unitDecimal).toFixed(0), 10);
+ this.alternativeAmount = this.filterProvider.formatFiatAmount(amount).toString();
+ this.recipient.altAmountStr = this.alternativeAmount;
+ }
+ } else {
+ amount = unit.isFiat
+ ? (this.fromFiat(amount) * this.unitToSatoshi).toFixed(0)
+ : (amount * this.unitToSatoshi).toFixed(0);
+ this.recipient.amountToShow = result;
+ this.recipient.altAmountStr = this.alternativeAmount;
+ this.recipient.currency = this.unit;
+ this.recipient.amount = parseInt(amount, 10);
+ }
+ this.validAmount = result > 0;
+ this.checkRecipientValid();
+ if (isSendMax) {
+ this.sendMaxEvent.emit(true);
+ }
+ }
+
+ public async processInput() {
+ if (this.recipient.name) this.validAddress = true;
+ else {
+ let address = this.searchValue;
+ let tokenAddress: string = '';
+ if (address == '') this.validAddress = false;
+ if (this.token && this.wallet.coin == 'xec') {
+ // handle etoken
+ const { prefix, type, hash } = this.addressProvider.decodeAddress(address);
+ if (prefix == 'etoken') {
+ tokenAddress = address;
+ address = this.addressProvider.encodeAddress('ecash', type, hash, address);
+ } else {
+ this.validAddress = false;
+ return;
+ }
+ }
+ const parsedData = this.incomingDataProvider.parseData(address);
+ if (
+ parsedData &&
+ _.indexOf(this.validDataTypeMap, parsedData.type) != -1
+ ) {
+ const isValid = this.checkCoinAndNetwork(address);
+ if (isValid) {
+ this.validAddress = true;
+ let addressFinal = tokenAddress.trim().length > 0 ? tokenAddress : address;
+ this.addressBookProvider.get(addressFinal, this.wallet.network).then(
+ contactSelected => {
+ if (contactSelected) {
+ this.recipient.toAddress = contactSelected.address;
+ this.recipient.name = contactSelected.name;
+ this.recipient.recipientType = 'contact';
+ }
+ }
+ );
+ this.recipient.toAddress = address;
+ if (this.token && this.wallet.coin) this.recipient.toAddress = tokenAddress;
+ this.redir();
+ }
+ }
+ else if (parsedData && parsedData.type == 'PrivateKey') {
+ this.validAddress = true
+ } else {
+ this.validAddress = false;
+ }
+ }
+
+ this.checkRecipientValid();
+ }
+
+ private redir() {
+ this.incomingDataProvider.redir(this.searchValue, {
+ activePage: 'SendPage',
+ amount: this.navParams.data.amount,
+ coin: this.navParams.data.coin, // TODO ???? what is this for ?
+ recipientId: !this.isShowSendMax ? this.recipient.id : null
+ });
+ this.search = '';
+ }
+
+
+ checkRecipientValid() {
+ if (!this.isDonation) {
+ this.recipient.isValid = this.validAddress && this.validAmount;
+ } else {
+ if (this.isShowReceiveLotus) {
+ this.recipient.isValid = this.validAddress && this.validAmount;
+ } else {
+ this.recipient.isValid = this.validAmount;
+ }
+ }
+ }
+
+ public async checkIfContact() {
+ await timer(50).toPromise();
+ return this.transferTo.hasContactsOrWallets;
+ }
+
+ private checkCoinAndNetwork(data, isPayPro?): boolean {
+ let isValid, addrData;
+ if (isPayPro) {
+ isValid =
+ data &&
+ data.chain == this.currencyProvider.getChain(this.wallet.coin) &&
+ data.network == this.wallet.network;
+ } else {
+ addrData = this.addressProvider.getCoinAndNetwork(
+ data,
+ this.wallet.network
+ );
+ isValid =
+ this.currencyProvider.getChain(this.wallet.coin).toLowerCase() ==
+ addrData.coin && addrData.network == this.wallet.network;
+ }
+
+ if (isValid) {
+ this.validAddress = true;
+ return true;
+ } else {
+ this.validAddress = true;
+ let network = isPayPro ? data.network : addrData.network;
+
+ if (this.wallet.coin === 'bch' && this.wallet.network === network) {
+ const isLegacy = this.checkIfLegacy();
+ isLegacy ? this.showLegacyAddrMessage() : this.showErrorMessage();
+ } else {
+ this.showErrorMessage();
+ }
+ }
+
+ return false;
+ }
+ private checkIfLegacy(): boolean {
+ return (
+ this.incomingDataProvider.isValidBitcoinCashLegacyAddress(this.recipient.toAddress) ||
+ this.incomingDataProvider.isValidBitcoinCashUriWithLegacyAddress(
+ this.recipient.toAddress
+ )
+ );
+ }
+ private showLegacyAddrMessage() {
+ const appName = this.appProvider.info.nameCase;
+ const infoSheet = this.actionSheetProvider.createInfoSheet(
+ 'legacy-address-info',
+ { appName }
+ );
+ infoSheet.present();
+ infoSheet.onDidDismiss(option => {
+ if (option) {
+ const legacyAddr = this.recipient.toAddress;
+ const cashAddr = this.addressProvider.translateToCashAddress(
+ legacyAddr
+ );
+ this.recipient.toAddress = cashAddr;
+ this.processInput();
+ }
+ });
+ }
+
+ private showErrorMessage() {
+ const msg = this.translate.instant(
+ 'The wallet you are using does not match the network and/or the currency of the address provided'
+ );
+ const title = this.translate.instant('Error');
+ this.errorsProvider.showDefaultError(msg, title, () => {
+ this.recipient.toAddress = '';
+ });
+ }
+
+ public cleanSearch(isSpecificRecipient?: boolean) {
+ this.recipient.toAddress = '';
+ this.recipient.name = '';
+ this.validAddress = false;
+ this.recipient.recipientType = '';
+ this.searchValue = '';
+ if (isSpecificRecipient) {
+ this.recipient.isSpecificAmount = false;
+ this.expression = 0;
+ this.processAmount();
+ }
+ this.checkRecipientValid();
+ }
+
+ public openScanner(): void {
+ this.router.navigate(['/scan'], { state: { fromRecipientComponent: true, recipientId: this.recipient.id } });
+ }
+
+ public shouldShowZeroState() {
+ return (
+ this.wallet &&
+ this.wallet.cachedStatus &&
+ !this.wallet.cachedStatus.totalBalanceSat
+ );
+ }
+
+ public showOptions(coin: Coin) {
+ return (
+ (this.currencyProvider.isMultiSend(coin) ||
+ this.currencyProvider.isUtxoCoin(coin)) &&
+ !this.shouldShowZeroState()
+ );
+ }
+
+ public informDelete() {
+ this.deleteEvent.emit(this.recipient.id);
+ }
+
+ public sendMax(): void {
+ if (this.token) {
+ if (this.availableUnits[this.unitIndex].isFiat) {
+ this.changeUnit(true, true);
+ } else {
+ this.processAmount(true);
+ }
+ this.sendMaxEvent.emit(true);
+ } else {
+ this.sendMaxEvent.emit(false);
+ }
+ }
+
+ public goToAddressBook() {
+ this.router.navigate(['/addressbook'], { state: { fromSend: true, recipientId: this.recipient.id } });
+ }
+
+ public async openTransferToModal(): Promise {
+ const modal = await this.modalCtrl.create({
+ component: TransferToModalPage,
+ componentProps: {
+ completeHistory: this.wallet.completeHistory,
+ walletId: this.wallet.credentials.walletId,
+ recipientId: this.recipient.id,
+ fromSend: true,
+ }
+ });
+ modal.onDidDismiss().then((recipient) => {
+ if (recipient.data && recipient.data.id == this.recipient.id) {
+ this.recipient.toAddress = recipient.data.toAddress;
+ this.recipient.name = recipient.data.name;
+ this.recipient.recipientType = recipient.data.recipientType;
+ }
+ });
+
+ return await modal.present();
+ }
+
+ public async pasteFromClipboard() {
+ this.validDataFromClipboard = await this.clipboardProvider.getValidData(
+ this.wallet.coin
+ );
+ this.cleanSearch();
+ this.recipient.toAddress = this.validDataFromClipboard || '';
+ this.validDataFromClipboard = null;
+ this.clipboardProvider.clear();
+ this.processInput();
+ }
+
+ private handleReceiveLotus(amountDonation) {
+ this.receiveLotus = '';
+ const availableUnit = this.availableUnits[this.unitIndex].isFiat ? this.availableUnits[this.altUnitIndex].id : this.availableUnits[this.unitIndex].id;
+ const minMoneydonation = this.fromSatToFiat(this.rateProvider.fromFiat(this.navParamsData.minMoneydonation, 'USD', availableUnit));
+ const remaining = this.navParamsData.remaining;
+ const receiveLotus = this.navParamsData.receiveLotus;
+ this.isShowReceiveLotus = amountDonation >= minMoneydonation && remaining >= receiveLotus;
+ if (this.isShowReceiveLotus) {
+ this.receiveLotus = `You will receive ${receiveLotus} Lotus`;
+ this.messagesReceiveLotus = false;
+ } else if (amountDonation <= minMoneydonation && amountDonation != 0) {
+ this.receiveLotus = `You will receive 0 Lotus`;
+ this.messagesReceiveLotus = false;
+ } else if (amountDonation >= minMoneydonation && remaining < receiveLotus) {
+ this.messagesReceiveLotus = true;
+ }
+ }
+
+ private fromSatToFiat(val: number, coin?: Coin): number {
+ const availableUnit = this.availableUnits[this.unitIndex].isFiat ? this.availableUnits[this.altUnitIndex].id : this.availableUnits[this.unitIndex].id;
+ if (
+ !this.rateProvider.getRate(
+ this.fiatCode,
+ coin || availableUnit
+ )
+ )
+ return undefined;
+
+ const rateProvider = this.rateProvider
+ .toFiat(
+ val,
+ this.fiatCode,
+ coin || availableUnit
+ )
+ if (_.isNil(rateProvider)) return undefined;
+ return parseFloat(rateProvider.toString());
+ }
+
+ public updateRecipient(recipient: RecipientModel) {
+ this.searchValue = recipient.toAddress;
+ this.recipient.toAddress = recipient.toAddress;
+ this.expression = recipient.amount;
+ this.recipient.isSpecificAmount = recipient.isSpecificAmount;
+ this.processInput();
+ this.processAmount();
+ this.checkRecipientValid();
+ }
+}
diff --git a/src/app/components/recipient/recipient.model.ts b/src/app/components/recipient/recipient.model.ts
new file mode 100644
index 00000000000..d0755c436e7
--- /dev/null
+++ b/src/app/components/recipient/recipient.model.ts
@@ -0,0 +1,24 @@
+export class RecipientModel {
+ public toAddress: string;
+ public amount: number;
+ public amountToShow: string;
+ public altAmountStr: string;
+ public isValid?: boolean;
+ public id?: number = Date.now();
+ public name?:string;
+ public recipientType: string;
+ public currency?: string;
+ public isSpecificAmount?: boolean;
+ constructor(data) {
+ this.id = Date.now();
+ this.toAddress = data.toAddress || "";
+ this.amount = data.amount || 0;
+ this.amountToShow = data.amountToShow || "";
+ this.isValid = data.isValid || false;
+ this.altAmountStr = data.altAmountStr || "";
+ this.name = data.name || "";
+ this.recipientType = data.recipientType || "";
+ this.currency = data.currency || "";
+ this.isSpecificAmount = data.isSpecificAmount || false;
+ }
+}
\ No newline at end of file
diff --git a/src/app/components/search-bar/search-bar.scss b/src/app/components/search-bar/search-bar.scss
new file mode 100644
index 00000000000..e3fafc14aa4
--- /dev/null
+++ b/src/app/components/search-bar/search-bar.scss
@@ -0,0 +1,17 @@
+ion-input {
+ --background: #f3f4f6;
+ --padding-start: 0;
+ --placeholder-color: #9ba3ae;
+ border-radius: 8px;
+ font-size: 16px;
+ padding: 4px 20px !important;
+
+ &:after {
+ content: url('../../../assets/img/controls-ico-search.svg');
+ opacity: 0.7;
+ position: absolute;
+ top: calc(50% + 2px);
+ transform: translate(0, -50%);
+ right: 16px;
+ }
+}
diff --git a/src/components/search-bar/search-bar.ts b/src/app/components/search-bar/search-bar.ts
similarity index 89%
rename from src/components/search-bar/search-bar.ts
rename to src/app/components/search-bar/search-bar.ts
index 588f5da06ad..9b5f8ffdbb9 100644
--- a/src/components/search-bar/search-bar.ts
+++ b/src/app/components/search-bar/search-bar.ts
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Content } from 'ionic-angular';
+import { IonContent } from '@ionic/angular';
import { Subject } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
@@ -11,14 +11,15 @@ import { debounceTime } from 'rxjs/operators';
[placeholder]="placeholder"
(input)="onSearch($event)"
>
- `
+ `,
+ styleUrls: ['search-bar.scss'],
})
export class SearchBarComponent implements OnInit {
@Input()
placeholder: string;
@Input()
- scrollArea: Content;
+ scrollArea: IonContent;
@Output()
search: EventEmitter = new EventEmitter();
diff --git a/src/app/components/slider-captcha/slider-captcha.html b/src/app/components/slider-captcha/slider-captcha.html
new file mode 100644
index 00000000000..fbaeb689bd9
--- /dev/null
+++ b/src/app/components/slider-captcha/slider-captcha.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/slider-captcha/slider-captcha.scss b/src/app/components/slider-captcha/slider-captcha.scss
new file mode 100644
index 00000000000..a59f62bb9de
--- /dev/null
+++ b/src/app/components/slider-captcha/slider-captcha.scss
@@ -0,0 +1,152 @@
+/* Mixin */
+
+
+@mixin mobile { @media (max-width: #{var(--mobile-width) - 1px}) {
+ @content;
+ }
+}
+
+@mixin tablet { @media (min-width: #{var(--tablet-width)}) and (max-width: #{var(--desktop-width) - 1px}) {
+ @content;
+ }
+}
+
+@mixin desktop { @media (min-width: #{var(--desktop-width)}) {
+ @content;
+ }
+}
+.modal-wrapper {
+ @include tablet {
+ opacity: 1;
+ transform: translateY(0px);
+ height: 42%;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%) !important;
+ }
+ @include desktop {
+ opacity: 1;
+ height: 42%;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%) !important;
+ }
+}
+
+slider-captcha {
+ #modalCaptcha {
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ background-color: rgba(73, 73, 73, 0.1);
+ #sliderContent {
+ background: #fff;
+ padding-bottom: 20px;
+ @include mobile {
+ padding-top: 15px;
+ }
+ @include tablet {
+ padding-top: 20px;
+ }
+ @include desktop {
+ padding-top: 20px;
+ }
+ }
+ #footerCaptcha {
+ background: #fff;
+ color: dimgray;
+ box-shadow: 0 4px 4px black;
+ border-top: groove;
+ @include mobile {
+ padding-left: 17px;
+ }
+ @include tablet {
+ padding-left: 124px;
+ }
+ @include desktop {
+ padding-left: 124px;
+ }
+ }
+ }
+ .refreshIcon {
+ position: absolute;
+ right: 0;
+ top: 0;
+ color: #fff;
+ font-size: 1.5rem;
+ width: 1.7rem;
+ cursor: pointer;
+ filter: drop-shadow(1px 1px 1px black);
+ }
+ #ImgVerif {
+ canvas:nth-of-type(2n) {
+ position: absolute;
+ left: 0;
+ top: 0;
+ cursor: grab;
+ }
+ div:nth-of-type(2n) {
+ position: relative;
+ text-align: center;
+ width: 315px;
+ height: 40px;
+ line-height: 35px;
+ margin-top: 13px;
+ margin-left: -3px;
+ background: #DFE1E2;
+ color: #45494c;
+ border-radius: 20px;
+ border: 1px solid #e4e7eb;
+ box-sizing: border-box;
+ .sliderMask {
+ position: absolute;
+ left: 0;
+ top: 0;
+ height: 40px;
+ border: 0 solid #1991FA;
+ border-top-left-radius: 20px;
+ -webkit-border-top-left-radius: 20px;
+ -moz-border-radius-topleft: 20px;
+ border-bottom-left-radius: 20px;
+ -webkit-border-bottom-left-radius: 20px;
+ -moz-border-radius-bottomleft: 20px;
+ background: #D1E9FE;
+ .slider {
+ z-index: 1000;
+ position: absolute;
+ top: -9px;
+ left: 0;
+ width: 56px;
+ height: 56px;
+ background: #fff;
+ border-radius: 33px;
+ box-shadow: 0 0 3px;
+ transition: background .2s linear;
+ cursor: grab;
+ .sliderIcon {
+ position: relative;
+ line-height: 56px;
+ font-size: 27px;
+ color: #1E90FF;
+ }
+ }
+ }
+ .sliderText {
+ position: relative;
+ text-align: center;
+ width: 315px;
+ height: 40px;
+ line-height: 35px;
+ margin-top: 13px;
+ margin-left: -3px;
+ background: #DFE1E2;
+ color: #45494c;
+ border-radius: 20px;
+ border: 1px solid #e4e7eb;
+ box-sizing: border-box;
+ }
+ }
+ }
+}
diff --git a/src/app/components/slider-captcha/slider-captcha.ts b/src/app/components/slider-captcha/slider-captcha.ts
new file mode 100644
index 00000000000..7e2eaf3377e
--- /dev/null
+++ b/src/app/components/slider-captcha/slider-captcha.ts
@@ -0,0 +1,43 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import SlideVerify from 'slide-verify';
+
+/**
+ * Generated class for the SliderCaptchaComponent component.
+ *
+ * See https://angular.io/api/core/Component for more info on Angular
+ * Components.
+ */
+@Component({
+ selector: 'slider-captcha',
+ templateUrl: 'slider-captcha.html',
+ styleUrls: ['slider-captcha.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class SliderCaptchaComponent {
+
+ constructor(
+ private viewContrl: ModalController
+
+ ) { }
+
+ ngOnInit() {
+ let photosList = ['assets/img/slide-captcha/moon_and_earth.jpg']
+
+ new SlideVerify({
+ elementId: "slider",
+ lang: 'en',
+ onSuccess: () => {
+ console.log('success');
+ this.viewContrl.dismiss('success');
+ },
+ onFail: () => { console.log("fail") },
+ onRefresh: () => { console.log('refresh')},
+ photo: photosList
+ });
+ }
+
+ closeModal() {
+ this.viewContrl.dismiss();
+ }
+}
diff --git a/src/app/components/wallet-detail-card/wallet-detail-card.component.html b/src/app/components/wallet-detail-card/wallet-detail-card.component.html
new file mode 100644
index 00000000000..ee35ca15a3e
--- /dev/null
+++ b/src/app/components/wallet-detail-card/wallet-detail-card.component.html
@@ -0,0 +1,159 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/wallet-detail-card/wallet-detail-card.component.scss b/src/app/components/wallet-detail-card/wallet-detail-card.component.scss
new file mode 100644
index 00000000000..33cc00294cc
--- /dev/null
+++ b/src/app/components/wallet-detail-card/wallet-detail-card.component.scss
@@ -0,0 +1,273 @@
+wallet-detail-card {
+ width: 100%;
+ .wallet-card {
+ width: 100%;
+ border-radius: 16px;
+ color: #edeff0;
+ box-shadow: 0px 2px 6px 2px rgb(0 0 0 / 15%);
+ .wallet-card-header {
+ display: flex;
+ justify-content: space-between;
+ padding: 20px;
+ .wallet-icon {
+ display: flex;
+ align-items: center;
+ .icon {
+ position: relative;
+ margin-top: 6px;
+ img {
+ width: 40px !important;
+ height: 40px !important;
+ }
+ .audit {
+ width: 16px;
+ height: 16px;
+ position: absolute;
+ bottom: 5px;
+ right: 0;
+ }
+ }
+ .wallet-name {
+ margin-left: 0.5rem;
+ max-width: 240px;
+ p {
+ margin: 0;
+ }
+ img {
+ width: 20px;
+ height: 20px;
+ }
+ .wallet-info {
+ display: flex;
+ align-items: baseline;
+ .audit-table {
+ background: rgba(0, 30, 46, 0.24);
+ padding: 0 4px;
+ color: rgba(237, 239, 240, 0.6);
+ border-radius: 6px;
+ font-size: 12px;
+ letter-spacing: 0.4px;
+ margin-right: 5px;
+ }
+ .secondary-label {
+ display: flex;
+ align-items: center;
+ background: rgba(0, 30, 46, 0.24);
+ color: rgba(237, 239, 240, 0.6);
+ padding: 0 4px;
+ border-radius: 6px;
+ font-size: 12px;
+ letter-spacing: 0.4px;
+ img {
+ margin-left: 5px;
+ width: 16px;
+ height: 16px;
+ }
+ }
+ }
+ }
+ }
+ .ngx-qrcode-address {
+ opacity: 0.5;
+ width: 55px !important;
+ height: 40px !important;
+ img {
+ border-radius: 8px;
+ }
+ }
+ }
+ .balance-content {
+ padding: 20px;
+ padding-top: 0;
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+ flex-flow: column;
+ .eye {
+ margin-left: 0;
+ margin-left: 4px;
+ width: 20px;
+ height: 20px;
+ opacity: 0.6;
+ }
+ balance-to-show {
+ font-weight: 600;
+ font-size: 28px;
+ .unit {
+ font-size: 16px;
+ font-weight: 600;
+ margin-top: 0px;
+ opacity: 0.6 !important;
+ margin-left: 4px;
+ }
+ }
+ .balance-str {
+ cursor: pointer;
+ font-size: 38px;
+ font-weight: 500;
+ display: flex;
+ align-items: center;
+ img {
+ margin-left: 6px;
+ }
+ }
+
+ .balance-alt-str {
+ padding-top: 0.5rem;
+ font-size: 16px;
+ font-weight: 600;
+ opacity: 0.6 !important;
+ line-height: 24px;
+ }
+ }
+ &.bg {
+ &-bch {
+ background: url(../../../assets/img/wallet-details/bg-bch.svg) no-repeat;
+ background-size: cover;
+ }
+ &-xec {
+ background: url(../../../assets/img/wallet-details/bg-xec.svg) no-repeat;
+ background-size: cover;
+ }
+ &-xpi {
+ background: url(../../../assets/img/wallet-details/bg-xpi.svg) no-repeat;
+ background-size: cover;
+ }
+ &-doge {
+ background: url(../../../assets/img/wallet-details/bg-doge.svg)
+ no-repeat;
+ background-size: cover;
+ }
+ &-ltc {
+ background: url(../../../assets/img/wallet-details/bg-ltc.svg) no-repeat;
+ background-size: cover;
+ }
+ &-bcPro {
+ background: url(../../../assets/img/wallet-details/bg-xec.svg) no-repeat;
+ background-size: cover;
+ }
+ &-EAT {
+ background: url(../../../assets/img/wallet-details/bg-xec.svg) no-repeat;
+ background-size: cover;
+ }
+ &-ABCSLP {
+ background: url(../../../assets/img/wallet-details/bg-xec.svg) no-repeat;
+ background-size: cover;
+ }
+ &-DoC {
+ background: url(../../../assets/img/wallet-details/bg-xec.svg) no-repeat;
+ background-size: cover;
+ }
+ &-default {
+ background: url(../../../assets/img/wallet-details/bg-xec.svg) no-repeat;
+ background-size: cover;
+ }
+ }
+ }
+
+ .wallet-address {
+ text-align: end;
+ background: linear-gradient(270deg, rgba(0, 30, 46, 0.24) 2.04%, rgba(0, 30, 46, 0) 100%);
+ border-radius: 0px 8px 8px 0px;
+ padding: 5px 20px 5px 8px;
+ .wallet-add {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ font-size: 12px;
+ color: rgba(237, 239, 240, 0.6);
+ letter-spacing: 0.4px;
+ margin: 0;
+ font-weight: 500;
+ span {
+ margin-left: 5px;
+ }
+ .addr-update {
+ margin-left: 18px;
+ }
+ }
+ ion-icon {
+ color: #edeff0;
+ width: 12px;
+ height: 12px;
+ &.icon-refresh {
+ width: 20px;
+ height: 20px;
+ }
+ }
+ .addr-update {
+ --padding-start: 0;
+ --padding-end: 0;
+ width: 20px;
+ height: 20px;
+ margin: 0;
+ .spin-backwards {
+ animation: spin-backwards 0.5s ease-out 1;
+ }
+ @keyframes spin-backwards {
+ from {
+ transform: rotate(210deg);
+ }
+ to {
+ transform: rotate(-360deg);
+ }
+ }
+ .fade-in-out {
+ opacity: 0.1;
+ }
+ @keyframes bounce-down {
+ 0% {
+ transform: translateY(0);
+ }
+ 50% {
+ transform: translateY(15%);
+ }
+ 100% {
+ transform: translateY(0);
+ }
+ }
+
+ .spin-icon {
+ height: 18px;
+ }
+ .spinner {
+ float: right;
+ padding-bottom: 0px;
+ border: 1px solid orange;
+ border-top: 1px solid red;
+ border-radius: 50%;
+ width: 18px;
+ height: 18px;
+ margin: 2px;
+ color: red;
+ background-color: red;
+ }
+ .spin-fast {
+ animation: spin-fast 0.3s linear infinite;
+ }
+ @keyframes spin-fast {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
+ }
+ }
+ }
+
+ .wallet-setting {
+ display: flex;
+ margin-left: 5px;
+ ion-icon {
+ width: 16px;
+ height: 16px;
+ }
+ }
+
+ @media screen and (max-width: 376px) {
+ .wallet-name {
+ max-width: 200px !important;
+ }
+ }
+}
diff --git a/src/app/components/wallet-detail-card/wallet-detail-card.component.spec.ts b/src/app/components/wallet-detail-card/wallet-detail-card.component.spec.ts
new file mode 100644
index 00000000000..1ea538a5321
--- /dev/null
+++ b/src/app/components/wallet-detail-card/wallet-detail-card.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { WalletDetailCardComponent } from './wallet-detail-card.component';
+
+describe('WalletDetailCardComponent', () => {
+ let component: WalletDetailCardComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ WalletDetailCardComponent ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(WalletDetailCardComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/wallet-detail-card/wallet-detail-card.component.ts b/src/app/components/wallet-detail-card/wallet-detail-card.component.ts
new file mode 100644
index 00000000000..da2608bc6b7
--- /dev/null
+++ b/src/app/components/wallet-detail-card/wallet-detail-card.component.ts
@@ -0,0 +1,255 @@
+import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+import { ActionSheetProvider, AddressProvider, AppProvider, BwcErrorProvider, CurrencyProvider, ErrorsProvider, EventManagerService, Logger, ProfileProvider, RateProvider, TokenProvider, WalletProvider } from 'src/app/providers';
+import { DecimalFormatBalance } from 'src/app/providers/decimal-format.ts/decimal-format';
+import * as _ from 'lodash';
+import { TokenInforPage } from 'src/app/pages/token-info/token-info';
+import { ModalController } from '@ionic/angular';
+import { NgxQrcodeErrorCorrectionLevels } from '@techiediaries/ngx-qrcode';
+import { timer } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+
+const MIN_UPDATE_TIME = 2000;
+
+@Component({
+ selector: 'wallet-detail-card',
+ templateUrl: './wallet-detail-card.component.html',
+ styleUrls: ['./wallet-detail-card.component.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class WalletDetailCardComponent implements OnInit {
+ @Input()
+ wallet: any;
+
+ @Input()
+ address: any;
+
+ @Input()
+ walletNotRegistered: any;
+
+ @Input()
+ token: any;
+
+ @Input()
+ isToken: boolean = false;
+
+ @Input()
+ amountToken: any;
+
+ public currentTheme: string;
+ public hiddenBalance: boolean;
+ private listEToken = ['EAT', 'DoC', 'bcPro'];
+ public typeErrorQr = NgxQrcodeErrorCorrectionLevels;
+ public loading: boolean;
+ public newAddressError: boolean;
+ public playAnimation: boolean;
+ private retryCount: number = 0;
+ public bchAddrFormat: string;
+ public bchCashAddress: string;
+
+ constructor(
+ private appProvider: AppProvider,
+ private actionSheetProvider: ActionSheetProvider,
+ private currencyProvider: CurrencyProvider,
+ private events: EventManagerService,
+ private modalCtrl: ModalController,
+ private profileProvider: ProfileProvider,
+ private router: Router,
+ private walletProvider: WalletProvider,
+ private logger: Logger,
+ private bwcErrorProvider: BwcErrorProvider,
+ private addressProvider: AddressProvider,
+ private translate: TranslateService,
+ private errorsProvider: ErrorsProvider,
+ ) {
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
+ }
+
+ ngOnInit() {
+ this.hiddenBalance = this.wallet.balanceHidden;
+ this.bchAddrFormat = 'cashAddress';
+ }
+
+
+ public updateAll = _.debounce(
+ (opts?) => {
+ opts = opts || {};
+ this.events.publish('Local/WalletFocus', {
+ walletId: this.wallet.credentials.walletId,
+ force: true
+ });
+ },
+ MIN_UPDATE_TIME,
+ {
+ leading: true
+ }
+ );
+
+ public formatTxAmount(amount: any) {
+ return DecimalFormatBalance(amount);
+ }
+
+ public getAlternativeBalance() {
+ const totalBalanceAlternative =
+ this.wallet.cachedStatus &&
+ this.wallet.cachedStatus.totalBalanceAlternative;
+ return DecimalFormatBalance(totalBalanceAlternative);
+ }
+
+ public isUtxoCoin(): boolean {
+ return this.currencyProvider.isUtxoCoin(this.wallet.coin);
+ }
+
+ public getBalance() {
+ const lastKnownBalance = this.wallet.lastKnownBalance;
+ if (this.wallet.coin === 'xrp') {
+ const availableBalanceStr =
+ this.wallet.cachedStatus &&
+ this.wallet.cachedStatus.availableBalanceStr;
+ return availableBalanceStr || lastKnownBalance;
+ } else {
+ const totalBalanceStr =
+ this.wallet.cachedStatus && this.wallet.cachedStatus.totalBalanceStr;
+ return totalBalanceStr || lastKnownBalance;
+ }
+ }
+
+ public toggleBalance() {
+ this.hiddenBalance = !this.hiddenBalance;
+ this.profileProvider.toggleHideBalanceFlag(
+ this.wallet.credentials.walletId
+ );
+ }
+
+ public openWalletSettings(id) {
+ this.router.navigate(['/wallet-settings'], {
+ state: {
+ walletId: id
+ }
+ });
+ }
+
+ public goToTokenInfo() {
+ this.modalCtrl.create(
+ {
+ component: TokenInforPage,
+ componentProps: {
+ walletId: this.wallet.credentials.walletId,
+ tokenInfo: this.token.tokenInfo
+ }
+ }).then(res => {
+ res.present();
+ })
+ }
+
+ public setIconToken(token) {
+ const isValid = this.listEToken.includes(token?.tokenInfo?.symbol);
+ return isValid ? `assets/img/currencies/${token?.tokenInfo?.symbol}.svg` : 'assets/img/currencies/xec.svg';
+ }
+
+ public goToMultisignInfo() {
+ const receive = this.actionSheetProvider.createMultisignInfo(this.wallet);
+ receive.present();
+ receive.onDidDismiss(data => {
+ if (data) console.log('close action multisig');
+ });
+ }
+
+ public async setAddress(newAddr?: boolean, failed?: boolean): Promise {
+ if (
+ !this.wallet ||
+ !this.wallet.isComplete() ||
+ (this.wallet.needsBackup && this.wallet.network == 'livenet')
+ )
+ return;
+
+ this.loading = newAddr || _.isEmpty(this.address) ? true : false;
+
+ this.walletProvider
+ .getAddress(this.wallet, newAddr)
+ .then(addr => {
+ this.newAddressError = false;
+ this.loading = false;
+ if (!addr) return;
+ const address = this.walletProvider.getAddressView(
+ this.wallet.coin,
+ this.wallet.network,
+ addr
+ );
+ if (this.address && this.address != address) {
+ this.playAnimation = true;
+ }
+ if (this.wallet.coin === 'bch' || this.wallet.coin === 'xec') this.bchCashAddress = address;
+
+ this.updateQrAddress(address, newAddr);
+ })
+ .catch(err => {
+ this.logger.warn('Retrying to create new adress:' + ++this.retryCount);
+ if (this.retryCount > 3) {
+ this.retryCount = 0;
+ this.loading = false;
+ // this.dismiss(err);
+ } else if (err == 'INVALID_ADDRESS') {
+ // Generate new address if the first one is invalid ( fix for concatenated addresses )
+ if (!failed) {
+ this.setAddress(newAddr, true);
+ this.logger.warn(this.bwcErrorProvider.msg(err, 'Receive'));
+ return;
+ }
+ this.setAddress(false); // failed to generate new address -> get last saved address
+ } else {
+ this.setAddress(false); // failed to generate new address -> get last saved address
+ }
+ this.logger.warn(this.bwcErrorProvider.msg(err, 'Receive'));
+ });
+ }
+
+ private async updateQrAddress(address, newAddr?: boolean): Promise {
+ if (this.wallet.coin === 'bch') {
+ address =
+ this.bchAddrFormat === 'legacy'
+ ? this.addressProvider.getLegacyBchAddressFormat(this.bchCashAddress)
+ : this.bchCashAddress;
+ }
+ if (newAddr) {
+ await timer(400).toPromise();
+ }
+ this.address = address;
+
+ await timer(200).toPromise();
+ this.playAnimation = false;
+ }
+
+ public goToReceivePage() {
+ if (this.wallet && this.wallet.isComplete() && this.wallet.needsBackup) {
+ const needsBackup = this.actionSheetProvider.createNeedsBackup();
+ needsBackup.present();
+ needsBackup.onDidDismiss(data => {
+ if (data === 'goToBackup') this.goToBackup();
+ });
+ } else {
+ const params = {
+ wallet: this.wallet
+ };
+ const receive = this.actionSheetProvider.createWalletReceive(params);
+ receive.present();
+ receive.onDidDismiss(data => {
+ if (data) this.showErrorInfoSheet(data);
+ });
+ }
+ }
+
+ public goToBackup(): void {
+ this.router.navigate(['/backup-key'], {
+ state: { keyId: this.wallet.credentials.keyId }
+ });
+ }
+
+ public showErrorInfoSheet(error: Error | string): void {
+ const infoSheetTitle = this.translate.instant('Error');
+ this.errorsProvider.showDefaultError(
+ this.bwcErrorProvider.msg(error),
+ infoSheetTitle
+ );
+ }
+}
diff --git a/src/app/components/wallet-item-content/wallet-item-content.html b/src/app/components/wallet-item-content/wallet-item-content.html
new file mode 100644
index 00000000000..293d2b567ea
--- /dev/null
+++ b/src/app/components/wallet-item-content/wallet-item-content.html
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/components/wallet-item-content/wallet-item-content.scss b/src/app/components/wallet-item-content/wallet-item-content.scss
new file mode 100644
index 00000000000..2dea7e9d27c
--- /dev/null
+++ b/src/app/components/wallet-item-content/wallet-item-content.scss
@@ -0,0 +1,81 @@
+wallet-item-content {
+ .wallet-warning {
+ color: var(--color-danger);
+ }
+
+ .key-tab {
+ margin: 14px 12px 14px 8px;
+ padding: 0;
+ width: 40px;
+ height: 40px;
+ }
+
+ .wallet-for-address-book {
+ --background: transparent !important;
+ border-bottom: 1px solid rgba(112, 129, 138, 0.38) !important;
+
+ margin-right: 0 !important;
+ border-radius: 0 !important;
+ margin-bottom: 0 !important;
+ margin-top: 0 !important;
+ box-shadow: none !important;
+ padding: 1rem 0;
+ --padding-start: 0 !important;
+ --padding-end: 0 !important;
+ .main-label {
+ font-size: 16px;
+ }
+ .secondary-note {
+ font-size: 11px;
+ color: rgba(237, 239, 240, 0.6);
+ }
+ ion-note {
+ padding-top: 0;
+ padding-bottom: 0;
+ }
+ }
+
+ .last-child {
+ border-bottom: none !important;
+ }
+
+ .secondary-note {
+ font-size: 12px !important;
+ color: rgba(0, 30, 46, 0.6) !important;
+ .negative-avg {
+ color: var(--color-danger);
+ border-radius: 50vh;
+ padding-right: 10px;
+ padding-left: 10px;
+ font-size: 11px;
+ }
+ .possitive-avg {
+ color: #37a372;
+ border-radius: 50vh;
+ padding-right: 10px;
+ padding-left: 10px;
+ font-size: 11px;
+ }
+ }
+ .main-label {
+ letter-spacing: 0.1px;
+ }
+ .secondary-label {
+ color: rgba(0, 30, 46, 0.6) !important;
+ margin-top: 4px;
+ letter-spacing: 0.4px;
+ .secondary-label-multisign {
+ background: #e6eef2;
+ color: rgba(0, 30, 46, 0.6);
+ padding: 2px 6px;
+ border-radius: 8px;
+ margin-left: 4px;
+ letter-spacing: 0.4px;
+ }
+ }
+
+ .wallet-hidden {
+ font-size: 14px;
+ color: rgba(0, 30, 46, 0.6);
+ }
+}
diff --git a/src/app/components/wallet-item-content/wallet-item-content.ts b/src/app/components/wallet-item-content/wallet-item-content.ts
new file mode 100644
index 00000000000..b2670a1ee30
--- /dev/null
+++ b/src/app/components/wallet-item-content/wallet-item-content.ts
@@ -0,0 +1,81 @@
+import { Component, Input, ViewEncapsulation } from '@angular/core';
+import { ConfigProvider } from 'src/app/providers';
+import { DecimalFormatBalance } from 'src/app/providers/decimal-format.ts/decimal-format';
+
+@Component({
+ selector: 'wallet-item-content',
+ templateUrl: 'wallet-item-content.html',
+ styleUrls: ['wallet-item-content.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class WalletItemContent {
+ @Input()
+ wallet: any;
+
+ @Input()
+ isCustomForAddressBook = false;
+
+ @Input()
+ isLastChild = false;
+
+ @Input()
+ coins: any;
+
+ @Input()
+ isKeyTab: any;
+
+ @Input()
+ isShowBalance: any = true;
+
+ public symbolCurrency;
+
+ constructor(private configProvider: ConfigProvider) {
+ let config = this.configProvider.get();
+ const currentCurrency = config.wallet.settings.alternativeIsoCode;
+ switch (currentCurrency) {
+ case 'VND':
+ this.symbolCurrency = '₫';
+ break;
+ default:
+ this.symbolCurrency = '$';
+ }
+ }
+
+ getBalance(wallet, currency) {
+ const lastKnownBalance = this.getLastKownBalance(wallet, currency);
+ const totalBalanceStr =
+ wallet.cachedStatus &&
+ wallet.cachedStatus.totalBalanceStr &&
+ wallet.cachedStatus.totalBalanceStr.replace(` ${currency}`, '');
+
+ // New created wallet does not have "lastkKnownBalance"
+ if (
+ totalBalanceStr == '0.00' &&
+ (lastKnownBalance == '0.00' || !lastKnownBalance)
+ )
+ return '0';
+ return DecimalFormatBalance(totalBalanceStr) || DecimalFormatBalance(lastKnownBalance);
+ }
+
+ getBalanceChange(unitCode) {
+ const coin = this.coins.find(ele => {
+ return ele.unitCode === unitCode;
+ });
+ const totalBalanceChange = coin.totalBalanceChange ? coin.totalBalanceChange : 0;
+ return totalBalanceChange;
+ }
+
+ getAlternativeBalance(wallet, currency) {
+ const totalBalanceAlternative =
+ wallet.cachedStatus && wallet.cachedStatus.totalBalanceAlternative;
+ if (totalBalanceAlternative == '0.00') return '0';
+ return DecimalFormatBalance(totalBalanceAlternative);
+ }
+
+ getLastKownBalance(wallet, currency) {
+ return (
+ wallet.lastKnownBalance &&
+ wallet.lastKnownBalance.replace(` ${currency}`, '')
+ );
+ }
+}
diff --git a/src/app/components/wallet-receive/wallet-receive.html b/src/app/components/wallet-receive/wallet-receive.html
new file mode 100644
index 00000000000..337764e80f2
--- /dev/null
+++ b/src/app/components/wallet-receive/wallet-receive.html
@@ -0,0 +1,71 @@
+
+
\ No newline at end of file
diff --git a/src/app/components/wallet-receive/wallet-receive.scss b/src/app/components/wallet-receive/wallet-receive.scss
new file mode 100644
index 00000000000..983b90a403e
--- /dev/null
+++ b/src/app/components/wallet-receive/wallet-receive.scss
@@ -0,0 +1,216 @@
+
+wallet-receive,
+page-choose-fee-level {
+ padding-bottom: calc(env(safe-area-inset-bottom));
+ .error {
+ color: var(--colors-danger);
+ }
+ .title {
+ font-weight: 500;
+ > img {
+ vertical-align: sub;
+ margin-right: 5px;
+ }
+ }
+ .back-button {
+ background-color: var(--background-color);
+ display: inline-block;
+ width: 100%;
+ ion-icon {
+ padding: 1.5rem 20px 1.5rem 20px;
+ cursor: pointer;
+ }
+ }
+ .addr-sub-title {
+ font-size: 14px;
+ color: rgba(28, 55, 69, 0.6);
+ padding: 0 1.5rem;
+ margin: 1rem 0;
+ padding-bottom: 1.5rem;
+ letter-spacing: 0.25px;
+ }
+ .addr-header {
+ margin: 1rem 0;
+ padding: 0 1.5rem;
+ .addr-title {
+ height: 30px;
+ width: 86px;
+ font-size: 23px;
+ font-weight: 500;
+ line-height: 30px;
+ color: black;
+ }
+
+ .addr-update {
+ height: 31px;
+ width: 32px;
+ background-color: #edf0fe;
+ border-radius: 50%;
+ margin-top: 0;
+ .spin-backwards {
+ animation: spin-backwards 0.5s ease-out 1;
+ }
+ @keyframes spin-backwards {
+ from {
+ transform: rotate(210deg);
+ }
+ to {
+ transform: rotate(-360deg);
+ }
+ }
+ .fade-in-out {
+ opacity: 0.1;
+ }
+ @keyframes bounce-down {
+ 0% {
+ transform: translateY(0);
+ }
+ 50% {
+ transform: translateY(15%);
+ }
+ 100% {
+ transform: translateY(0);
+ }
+ }
+
+ .spin-icon {
+ height: 18px;
+ }
+ .spinner {
+ float: right;
+ padding-bottom: 0px;
+ border: 1px solid orange;
+ border-top: 1px solid red;
+ border-radius: 50%;
+ width: 18px;
+ height: 18px;
+ margin: 2px;
+ color: red;
+ background-color: red;
+ }
+ .spin-fast {
+ animation: spin-fast 0.3s linear infinite;
+ }
+ @keyframes spin-fast {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
+ }
+ }
+ }
+ .addr-content {
+ margin: 0 15px 15px 15px;
+ .addr-container {
+ text-align: center;
+ font-size: 15px;
+ .text-address {
+ background-color: #f8f8f8;
+ color: var(--color-light-grey);
+ padding: 1.3rem 1rem;
+ border-radius: 6px;
+ position: relative;
+ .address-text {
+ width: 100%;
+ vertical-align: middle;
+ display: inline-block;
+ opacity: 1;
+ transition: opacity 500ms ease;
+ padding-left: 30px;
+ .address-placeholder {
+ font-size: 14px;
+ @media (max-height: 530px) {
+ font-size: 11.5px;
+ }
+ }
+ }
+ .copy-to-clip {
+ position: absolute;
+ left: 10px;
+ margin-top: 2px;
+ }
+ }
+ }
+ }
+ .blur {
+ filter: blur(10px);
+ }
+ .segment-button {
+ color: black;
+ }
+ .safe-area {
+ margin-bottom: calc(1.5rem + env(safe-area-inset-bottom));
+ margin-bottom: -webkit-calc(1.5rem + env(safe-area-inset-bottom));
+ }
+ .qr-container {
+ padding: 0 1.5rem;
+ padding-bottom: 1rem;
+ .qr-card {
+ position: relative;
+ border-radius: 1rem;
+ padding: 1rem 2rem 0 2rem;
+ .addr-update {
+ --padding-start: 0;
+ --padding-end: 0;
+ width: 20px;
+ height: 20px;
+ position: absolute;
+ right: 5px;
+ top: 5px;
+ }
+ p {
+ margin: 0;
+ font-size: 12px;
+ text-align: center;
+ color: rgba(0, 30, 46, 0.6);
+ }
+ }
+ .action-buttons {
+ margin-left: 1.5rem;
+ .action-button {
+ text-align: center;
+ ion-button {
+ --background: #D2E5F4;
+ min-width: 56px;
+ min-height: 56px;
+ ion-icon {
+ color: #0B1D28;
+ }
+ }
+ &.share-button {
+ margin-top: 2rem;
+ }
+ .ellipsis {
+ color: #0B1D28;
+ }
+ }
+ }
+ }
+
+ .loading-address {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 2rem;
+ p {
+ margin: 2rem !important;
+ }
+ }
+
+ ion-segment {
+ background: linear-gradient(0deg, rgba(0, 101, 141, 0.11), rgba(0, 101, 141, 0.11)), #FAFAFB !important;
+ ion-segment-button {
+ min-height: 3rem;
+ background: linear-gradient(0deg, rgba(0, 101, 141, 0.11), rgba(0, 101, 141, 0.11)), #FAFAFB !important;
+ color: #0B1D28;
+ &::part(indicator-background) {
+ background: none !important;
+ border-bottom: 2px solid var(--color-primary);
+ box-shadow: none !important;
+ border-radius: 0 !important;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/components/wallet-receive/wallet-receive.ts b/src/app/components/wallet-receive/wallet-receive.ts
new file mode 100644
index 00000000000..259c13b104f
--- /dev/null
+++ b/src/app/components/wallet-receive/wallet-receive.ts
@@ -0,0 +1,238 @@
+import { Component, ComponentRef, ViewEncapsulation } from '@angular/core';
+import { Subscription, timer } from 'rxjs';
+import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
+
+// Providers
+
+import * as _ from 'lodash';
+import { InfoSheetType } from 'src/app/providers/action-sheet/action-sheet';
+import { InfoSheetComponent } from '../info-sheet/info-sheet';
+import { Platform } from '@ionic/angular';
+import { Logger } from 'src/app/providers/logger/logger';
+import { WalletProvider } from 'src/app/providers/wallet/wallet';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { BwcErrorProvider } from 'src/app/providers/bwc-error/bwc-error';
+import { Coin, CurrencyProvider } from 'src/app/providers/currency/currency';
+import { AddressProvider } from 'src/app/providers/address/address';
+import { DomProvider } from 'src/app/providers/dom/dom';
+import { ConfigProvider } from 'src/app/providers/config/config';
+import { NgxQrcodeErrorCorrectionLevels } from '@techiediaries/ngx-qrcode';
+import { ProfileProvider } from 'src/app/providers/profile/profile';
+
+@Component({
+ selector: 'wallet-receive',
+ templateUrl: 'wallet-receive.html',
+ styleUrls: ['wallet-receive.scss'],
+ encapsulation : ViewEncapsulation.None
+})
+export class WalletReceiveComponent extends ActionSheetParent {
+ public protocolHandler: string;
+ public address: string;
+ public qrAddress: string;
+ public wallet;
+ public showShareButton: boolean;
+ public loading: boolean;
+ public playAnimation: boolean;
+ public newAddressError: boolean;
+ public bchCashAddress: string;
+ public bchAddrFormat: string;
+ public disclaimerAccepted: boolean;
+ public showingWarning: boolean;
+ public ecashFormat ;
+ public isShowEtoken;
+
+ private onResumeSubscription: Subscription;
+ private retryCount: number = 0;
+ typeErrorQr = NgxQrcodeErrorCorrectionLevels;
+
+ constructor(
+ private logger: Logger,
+ private walletProvider: WalletProvider,
+ private events: EventManagerService,
+ private bwcErrorProvider: BwcErrorProvider,
+ private platform: Platform,
+ public currencyProvider: CurrencyProvider,
+ private addressProvider: AddressProvider,
+ private domProvider: DomProvider,
+ private configProvider: ConfigProvider
+ ) {
+ super();
+ }
+
+ ngOnInit() {
+ this.wallet = this.params.wallet;
+ this.bchAddrFormat = 'cashAddress';
+ this.ecashFormat = 'ecashAddress';
+ this.disclaimerAccepted = false;
+ this.setAddress();
+ this.isShowEtoken = this.wallet.coin == 'xec' && this.wallet.isSlpToken;
+ }
+
+ changeToTokenAddress(ecashAdress) {
+ const { prefix, type, hash } = this.addressProvider.decodeAddress(ecashAdress);
+ const etoken = this.addressProvider.encodeAddress('etoken', type, hash, ecashAdress);
+ this.updateQrAddress(etoken, null);
+ }
+ changetokenEcashAddress(eTokenAdress) {
+ const { prefix, type, hash } = this.addressProvider.decodeAddress(eTokenAdress);
+ const ecashAdress = this.addressProvider.encodeAddress('ecash', type, hash, eTokenAdress);
+ this.updateQrAddress(ecashAdress, null);
+ }
+
+ public setQrAddressToken(address) {
+ if (this.ecashFormat === 'eTokenAddress') {
+ this.changeToTokenAddress(address)
+ }
+ else {
+ this.changetokenEcashAddress(address)
+ }
+ }
+
+ ionViewWillLeave() {
+ this.onResumeSubscription.unsubscribe();
+ this.events.unsubscribe('bwsEvent', this.bwsEventHandler);
+ }
+
+ ionViewWillEnter() {
+ this.events.subscribe('bwsEvent', this.bwsEventHandler);
+ this.onResumeSubscription = this.platform.resume.subscribe(() => {
+ this.setAddress();
+ this.events.subscribe('bwsEvent', this.bwsEventHandler);
+ });
+ }
+
+ private bwsEventHandler: any = (walletId, type, n) => {
+ if (
+ this.wallet.credentials.walletId == walletId &&
+ type == 'NewIncomingTx' &&
+ n.data
+ ) {
+ let addr =
+ this.address.indexOf(':') > -1
+ ? this.address.split(':')[1]
+ : this.address;
+ if (n.data.address == addr) this.setAddress(true);
+ }
+ };
+
+ public async setAddress(newAddr?: boolean, failed?: boolean): Promise {
+ if (
+ !this.wallet ||
+ !this.wallet.isComplete() ||
+ (this.wallet.needsBackup && this.wallet.network == 'livenet')
+ )
+ return;
+
+ this.loading = newAddr || _.isEmpty(this.address) ? true : false;
+
+ this.walletProvider
+ .getAddress(this.wallet, newAddr)
+ .then(addr => {
+ this.newAddressError = false;
+ this.loading = false;
+ if (!addr) return;
+ const address = this.walletProvider.getAddressView(
+ this.wallet.coin,
+ this.wallet.network,
+ addr
+ );
+ if (this.address && this.address != address) {
+ this.playAnimation = true;
+ }
+ if (this.wallet.coin === 'bch' || this.wallet.coin === 'xec') this.bchCashAddress = address;
+
+ this.updateQrAddress(address, newAddr);
+ })
+ .catch(err => {
+ this.logger.warn('Retrying to create new adress:' + ++this.retryCount);
+ if (this.retryCount > 3) {
+ this.retryCount = 0;
+ this.loading = false;
+ this.dismiss(err);
+ } else if (err == 'INVALID_ADDRESS') {
+ // Generate new address if the first one is invalid ( fix for concatenated addresses )
+ if (!failed) {
+ this.setAddress(newAddr, true);
+ this.logger.warn(this.bwcErrorProvider.msg(err, 'Receive'));
+ return;
+ }
+ this.setAddress(false); // failed to generate new address -> get last saved address
+ } else {
+ this.setAddress(false); // failed to generate new address -> get last saved address
+ }
+ this.logger.warn(this.bwcErrorProvider.msg(err, 'Receive'));
+ });
+ }
+
+ private async updateQrAddress(address, newAddr?: boolean): Promise {
+ if (this.wallet.coin === 'bch') {
+ address =
+ this.bchAddrFormat === 'legacy'
+ ? this.addressProvider.getLegacyBchAddressFormat(this.bchCashAddress)
+ : this.bchCashAddress;
+ }
+ if (newAddr) {
+ await timer(400).toPromise();
+ }
+ this.address = address;
+
+ await timer(200).toPromise();
+ this.playAnimation = false;
+ }
+
+ public setQrAddress() {
+ if (this.bchAddrFormat === 'legacy') this.showFirstWarning();
+ else {
+ this.disclaimerAccepted = false;
+ this.updateQrAddress(this.bchCashAddress, false);
+ }
+ }
+
+ public createInfoSheet(type: InfoSheetType, params?): InfoSheetComponent {
+ return this.setupSheet(InfoSheetComponent, type, params)
+ .instance;
+ }
+
+ private setupSheet(
+ componentType: { new (...args): T },
+ sheetType?: string,
+ params?
+ ): ComponentRef {
+ const sheet = this.domProvider.appendComponentToBody(componentType);
+ sheet.instance.componentRef = sheet;
+ sheet.instance.sheetType = sheetType;
+ sheet.instance.params = params;
+ return sheet;
+ }
+
+ private showFirstWarning() {
+ const infoSheet = this.createInfoSheet('bch-legacy-warning-1');
+ infoSheet.present();
+ infoSheet.onDidDismiss(option => {
+ if (option) {
+ this.showSecondWarning();
+ } else {
+ this.disclaimerAccepted = false;
+ this.bchAddrFormat = 'cashAddress';
+ }
+ });
+ }
+
+ public showSecondWarning() {
+ const infoSheet = this.createInfoSheet('bch-legacy-warning-2');
+ infoSheet.present();
+ infoSheet.onDidDismiss(option => {
+ if (option) {
+ const legacyAddr = this.addressProvider.getLegacyBchAddressFormat(
+ this.bchCashAddress
+ );
+ this.disclaimerAccepted = true;
+ this.updateQrAddress(legacyAddr, false);
+ } else {
+ this.disclaimerAccepted = false;
+ this.bchAddrFormat = 'cashAddress';
+ }
+ });
+ }
+
+}
diff --git a/src/app/components/wallet-selector/wallet-selector.html b/src/app/components/wallet-selector/wallet-selector.html
new file mode 100644
index 00000000000..fe4d4a5bbde
--- /dev/null
+++ b/src/app/components/wallet-selector/wallet-selector.html
@@ -0,0 +1,50 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/wallet-selector/wallet-selector.scss b/src/app/components/wallet-selector/wallet-selector.scss
new file mode 100644
index 00000000000..226dd86ee93
--- /dev/null
+++ b/src/app/components/wallet-selector/wallet-selector.scss
@@ -0,0 +1,37 @@
+wallet-selector {
+ padding-bottom: calc(env(safe-area-inset-bottom));
+ .error {
+ color: var(--color-danger);
+ }
+ .title {
+ font-weight: 500;
+ > img {
+ vertical-align: sub;
+ margin-right: 5px;
+ }
+ }
+ .no-wallets {
+ text-align: center;
+ padding: 20px;
+ color: var(--color-danger);
+ }
+ .bp-header {
+ margin: 32px 0 20px 3px;
+ }
+ .key-divider {
+ display: flex;
+ align-items: center;
+ padding: 5px 0;
+ margin: 1px 15px;
+ color: var(--color-grey);
+ border-bottom: 1px solid rgba(155, 163, 174, 0.2);
+ span {
+ margin-left: 10px;
+ }
+
+ .icon-key-custom {
+ padding-left: 0px;
+ margin-right: 0px;
+ }
+ }
+}
diff --git a/src/components/wallet-selector/wallet-selector.ts b/src/app/components/wallet-selector/wallet-selector.ts
similarity index 85%
rename from src/components/wallet-selector/wallet-selector.ts
rename to src/app/components/wallet-selector/wallet-selector.ts
index de8960342cb..279d1a9ff10 100644
--- a/src/components/wallet-selector/wallet-selector.ts
+++ b/src/app/components/wallet-selector/wallet-selector.ts
@@ -1,10 +1,12 @@
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
import * as _ from 'lodash';
import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
@Component({
selector: 'wallet-selector',
- templateUrl: 'wallet-selector.html'
+ templateUrl: 'wallet-selector.html',
+ styleUrls: ['wallet-selector.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class WalletSelectorComponent extends ActionSheetParent {
public walletsByKeys: any[];
diff --git a/src/app/components/wallet-tab-options/wallet-tab-options.html b/src/app/components/wallet-tab-options/wallet-tab-options.html
new file mode 100644
index 00000000000..a8b349ebe3c
--- /dev/null
+++ b/src/app/components/wallet-tab-options/wallet-tab-options.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Create a new account
+
+
+
+
+
+
+ Create or Import a Key
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/wallet-tab-options/wallet-tab-options.scss b/src/app/components/wallet-tab-options/wallet-tab-options.scss
new file mode 100644
index 00000000000..b0656b23ef5
--- /dev/null
+++ b/src/app/components/wallet-tab-options/wallet-tab-options.scss
@@ -0,0 +1,34 @@
+wallet-tab-options-component {
+ .bp-list {
+ .main-label {
+ font-weight: 400;
+ }
+
+ ion-item-divider {
+ margin-top: 0px;
+ padding: 12.5px 0px 12.5px 20px;
+ background: #f8f8f9;
+ }
+
+ ion-icon {
+ padding: 14.5px;
+ font-size: 20px;
+ width: 20px !important;
+ height: 20px !important;
+ }
+
+ ion-note {
+ background: #f4f5fb;
+ color: #565d6d;
+ font-weight: 300;
+ padding: 6px 10px;
+ border-radius: 4px;
+ font-size: 14px;
+ }
+ }
+
+ ion-item [button]{
+ --border-color: transparent;
+ --padding-start: 0px
+ }
+}
\ No newline at end of file
diff --git a/src/app/components/wallet-tab-options/wallet-tab-options.ts b/src/app/components/wallet-tab-options/wallet-tab-options.ts
new file mode 100644
index 00000000000..c6f2ad3db83
--- /dev/null
+++ b/src/app/components/wallet-tab-options/wallet-tab-options.ts
@@ -0,0 +1,19 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { ActionSheetParent } from '../action-sheet/action-sheet-parent';
+
+@Component({
+ selector: 'wallet-tab-options-component',
+ templateUrl: 'wallet-tab-options.html',
+ styleUrls: ['wallet-tab-options.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class WalletTabOptionsComponent extends ActionSheetParent {
+ public walletsGroups: any;
+
+ constructor() {
+ super();
+ }
+ ngOnInit() {
+ this.walletsGroups = this.params.walletsGroups;
+ }
+}
diff --git a/src/constants.ts b/src/app/constants.ts
similarity index 100%
rename from src/constants.ts
rename to src/app/constants.ts
diff --git a/src/directives/animate/animate.scss b/src/app/directives/animate/animate.scss
similarity index 100%
rename from src/directives/animate/animate.scss
rename to src/app/directives/animate/animate.scss
diff --git a/src/directives/animate/animate.ts b/src/app/directives/animate/animate.ts
similarity index 100%
rename from src/directives/animate/animate.ts
rename to src/app/directives/animate/animate.ts
diff --git a/src/app/directives/copy-to-clipboard/copy-to-clipboard.ts b/src/app/directives/copy-to-clipboard/copy-to-clipboard.ts
new file mode 100644
index 00000000000..98694a4bcd5
--- /dev/null
+++ b/src/app/directives/copy-to-clipboard/copy-to-clipboard.ts
@@ -0,0 +1,67 @@
+import { Directive, Inject } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { Clipboard } from '@ionic-native/clipboard/ngx';
+import { TranslateService } from '@ngx-translate/core';
+import { PlatformProvider } from 'src/app/providers/platform/platform';
+import { Logger } from 'src/app/providers/logger/logger';
+import { ActionSheetProvider } from 'src/app/providers/action-sheet/action-sheet';
+import { ClipboardProvider } from 'src/app/providers/clipboard/clipboard';
+
+// providers
+
+
+@Directive({
+ selector: '[copy-to-clipboard]', // Attribute selector
+ inputs: ['value: copy-to-clipboard', 'hideToast: hide-toast'],
+ host: {
+ '(click)': 'copy()'
+ }
+})
+export class CopyToClipboard {
+ public value: string;
+ public hideToast: boolean;
+ private dom: Document;
+
+ constructor(
+ @Inject(DOCUMENT) dom: Document,
+ public clipboard: Clipboard,
+ public platform: PlatformProvider,
+ public logger: Logger,
+ public translate: TranslateService,
+ private actionSheetProvider: ActionSheetProvider,
+ private clipboardProvider: ClipboardProvider
+ ) {
+ this.dom = dom;
+ }
+
+ private copyBrowser() {
+ if(!navigator.clipboard){
+ let textarea = this.dom.createElement('textarea');
+ this.dom.body.appendChild(textarea);
+ textarea.value = this.value;
+ textarea.select();
+ this.dom.execCommand('copy');
+ this.dom.body.removeChild(textarea);
+ }
+ else{
+ navigator.clipboard.writeText(this.value);
+ }
+ }
+
+ public copy() {
+ if (!this.value) return;
+ try {
+ this.clipboardProvider.copy(this.value);
+ } catch (e) {
+ if (e) this.logger.warn(e.message);
+ this.copyBrowser();
+ }
+ if (this.hideToast) return;
+
+ const infoSheet = this.actionSheetProvider.createInfoSheet(
+ 'copy-to-clipboard',
+ { msg: this.value }
+ );
+ infoSheet.present();
+ }
+}
diff --git a/src/directives/externalize-links/externalize-links.ts b/src/app/directives/externalize-links/externalize-links.ts
similarity index 85%
rename from src/directives/externalize-links/externalize-links.ts
rename to src/app/directives/externalize-links/externalize-links.ts
index 4c807faf22a..4588b7c844a 100644
--- a/src/directives/externalize-links/externalize-links.ts
+++ b/src/app/directives/externalize-links/externalize-links.ts
@@ -1,6 +1,6 @@
import { AfterViewInit, Directive, ElementRef, OnDestroy } from '@angular/core';
-import { Observable } from 'rxjs';
-import { ExternalLinkProvider } from '../../providers';
+import { timer } from 'rxjs';
+import { ExternalLinkProvider } from 'src/app/providers/external-link/external-link';
@Directive({
selector: '[externalize-links]'
@@ -12,7 +12,7 @@ export class ExternalizeLinks implements AfterViewInit, OnDestroy {
) {}
async ngAfterViewInit() {
- await Observable.timer(500).toPromise();
+ await timer(500).toPromise();
this.getAllLinks().forEach(aTag =>
aTag.addEventListener('click', this.handleClick.bind(this))
);
diff --git a/src/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.spec.ts b/src/app/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.spec.ts
similarity index 100%
rename from src/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.spec.ts
rename to src/app/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.spec.ts
diff --git a/src/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.ts b/src/app/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.ts
similarity index 81%
rename from src/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.ts
rename to src/app/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.ts
index cdd196c813d..9c8de749965 100644
--- a/src/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.ts
+++ b/src/app/directives/fixed-scroll-bg-color/fixed-scroll-bg-color.ts
@@ -1,5 +1,5 @@
import { Directive, ElementRef, Input } from '@angular/core';
-import { ThemeProvider } from '../../providers/theme/theme';
+import { ThemeProvider } from 'src/app/providers/theme/theme';
/*
Sometimes the user can overshoot when scrolling, which can cause gaps to appear between
@@ -30,12 +30,7 @@ export class FixedScrollBgColor {
}
setFixedAndScrollContentBgColor(color: string): void {
- const scrollContent = this.element.nativeElement.getElementsByClassName(
- 'scroll-content'
- )[0];
- const fixedContent = this.element.nativeElement.getElementsByClassName(
- 'fixed-content'
- )[0];
+ const scrollContent = this.element.nativeElement
const wrapperContent = this.element.nativeElement.getElementsByClassName(
'wrapper'
)[0];
@@ -44,14 +39,12 @@ export class FixedScrollBgColor {
if (color) {
scrollContent.style.setProperty('background-image', linearGradient);
- fixedContent.style.setProperty('background-image', linearGradient);
if (wrapperContent && wrapperContent.style) {
wrapperContent.style.setProperty('background', this.bottomColor);
wrapperContent.style.setProperty('min-height', '100%');
}
} else {
scrollContent.style.removeProperty('background-image');
- fixedContent.style.removeProperty('background-image');
if (wrapperContent && wrapperContent.style) {
wrapperContent.style.removeProperty('background');
wrapperContent.style.removeProperty('min-height');
diff --git a/src/directives/ion-content-background-color/ion-content-background-color.ts b/src/app/directives/ion-content-background-color/ion-content-background-color.ts
similarity index 93%
rename from src/directives/ion-content-background-color/ion-content-background-color.ts
rename to src/app/directives/ion-content-background-color/ion-content-background-color.ts
index 09f894013d9..317f33126bf 100644
--- a/src/directives/ion-content-background-color/ion-content-background-color.ts
+++ b/src/app/directives/ion-content-background-color/ion-content-background-color.ts
@@ -1,5 +1,5 @@
import { Directive, ElementRef, Input } from '@angular/core';
-import { AppProvider } from '../../providers/app/app';
+import { AppProvider } from 'src/app/providers/app/app';
@Directive({
selector: '[ion-content-background-color]',
diff --git a/src/directives/ion-mask/ion-mask.ts b/src/app/directives/ion-mask/ion-mask.ts
similarity index 86%
rename from src/directives/ion-mask/ion-mask.ts
rename to src/app/directives/ion-mask/ion-mask.ts
index 48675064382..51653abb421 100644
--- a/src/directives/ion-mask/ion-mask.ts
+++ b/src/app/directives/ion-mask/ion-mask.ts
@@ -1,19 +1,19 @@
import { Directive, Input } from '@angular/core';
-import { TextInput } from 'ionic-angular';
+import { IonInput } from '@ionic/angular';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { createTextMaskInputElement } from 'text-mask-core';
@Directive({
selector: '[ionMask]',
- providers: [TextInput]
+ providers: [IonInput]
})
export class IonMask {
@Input('ionMask')
private mask: any[] = [];
private clearInputListeners: Subject = new Subject();
- constructor(public ionInput: TextInput) {}
+ constructor(public ionInput: IonInput) {}
public ngOnInit() {
this.configureInput();
@@ -29,7 +29,7 @@ export class IonMask {
}
public async configureInput() {
- const input = await this.ionInput.getNativeElement();
+ const input = await this.ionInput.getInputElement();
const maskedInput = createTextMaskInputElement({
inputElement: input,
mask: this.mask,
diff --git a/src/app/directives/long-press/long-press.ts b/src/app/directives/long-press/long-press.ts
new file mode 100644
index 00000000000..6aefd9bf371
--- /dev/null
+++ b/src/app/directives/long-press/long-press.ts
@@ -0,0 +1,66 @@
+import {
+ Directive,
+ ElementRef,
+ Input,
+ AfterViewInit,
+ NgZone,
+ EventEmitter,
+ Output
+} from "@angular/core";
+import { Gesture, GestureController } from "@ionic/angular";
+
+@Directive({
+ selector: '[longPress]'
+})
+export class LongPress {
+
+ @Output() longPress: EventEmitter = new EventEmitter();
+ @Input("delay") delay = 1000;
+ action: any; //not stacking actions
+
+ private longPressActive = false;
+ gesture: Gesture;
+ constructor(
+ private el: ElementRef,
+ private gestureCtrl: GestureController,
+ private zone: NgZone
+ ) { }
+
+ ngOnInit() {
+ this.loadLongPressOnElement();
+ }
+
+ loadLongPressOnElement() {
+ this.gesture = this.gestureCtrl.create({
+ el: this.el.nativeElement,
+ threshold: 0,
+ gestureName: 'long-press',
+ onStart: ev => {
+ this.longPressActive = true;
+ this.longPressAction();
+ },
+ onEnd: ev => {
+ this.longPressActive = false;
+ }
+ });
+ this.gesture.enable(true);
+ }
+
+ private longPressAction() {
+ if (this.action) {
+ clearInterval(this.action);
+ }
+ this.action = setTimeout(() => {
+ this.zone.run(() => {
+ if (this.longPressActive === true) {
+ this.longPressActive = false;
+ this.longPress.emit();
+ }
+ });
+ }, this.delay);
+ }
+
+ ngOnDestroy() {
+ this.gesture.destroy();
+ }
+}
diff --git a/src/app/directives/navbar-bg/navbar-bg.spec.ts b/src/app/directives/navbar-bg/navbar-bg.spec.ts
new file mode 100644
index 00000000000..1c40f0bd7c8
--- /dev/null
+++ b/src/app/directives/navbar-bg/navbar-bg.spec.ts
@@ -0,0 +1,41 @@
+// import { Component, ElementRef } from '@angular/core';
+// import { async, ComponentFixture } from '@angular/core/testing';
+// import { TestUtils } from '../../test';
+// import { NavbarBg } from './navbar-bg';
+
+// let fixture: ComponentFixture;
+// let instance;
+// let toolbarBg;
+
+// @Component({
+// template: ` = new EventEmitter();
+
+ constructor(private elm: ElementRef) { }
+
+ ngAfterViewInit() {
+ this.checkIfElementInView();
+ this.scrollArea.ionScroll.subscribe((el) => this.checkIfElementInView(el));
+ }
+ checkIfElementInView(el?: any) {
+ const scanButtonAreaHeight = 70;
+ const contentHeight = _.get(this.scrollArea, 'el.offsetHeigh', 0);
+ const scrollTop = el ? el.detail.scrollTop : 0;
+ const { offsetTop, offsetHeight } = this.elm.nativeElement;
+ if (
+ scrollTop + contentHeight - scanButtonAreaHeight >
+ offsetTop + offsetHeight
+ ) {
+ if (this.inView) return;
+ this.viewEnter.emit(true);
+ this.inView = true;
+ }
+ }
+}
diff --git a/src/app/explore-container/explore-container.component.html b/src/app/explore-container/explore-container.component.html
new file mode 100644
index 00000000000..bbadb7d643c
--- /dev/null
+++ b/src/app/explore-container/explore-container.component.html
@@ -0,0 +1,4 @@
+;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ExploreContainerComponent ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(ExploreContainerComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/explore-container/explore-container.component.ts b/src/app/explore-container/explore-container.component.ts
new file mode 100644
index 00000000000..60554cbd002
--- /dev/null
+++ b/src/app/explore-container/explore-container.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit, Input } from '@angular/core';
+
+@Component({
+ selector: 'app-explore-container',
+ templateUrl: './explore-container.component.html',
+ styleUrls: ['./explore-container.component.scss'],
+})
+export class ExploreContainerComponent implements OnInit {
+ @Input() name: string;
+
+ constructor() { }
+
+ ngOnInit() {}
+
+}
diff --git a/src/app/explore-container/explore-container.module.ts b/src/app/explore-container/explore-container.module.ts
new file mode 100644
index 00000000000..43762961fbd
--- /dev/null
+++ b/src/app/explore-container/explore-container.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ExploreContainerComponent } from './explore-container.component';
+
+@NgModule({
+ imports: [ CommonModule, FormsModule, IonicModule],
+ declarations: [ExploreContainerComponent],
+ exports: [ExploreContainerComponent]
+})
+export class ExploreContainerComponentModule {}
diff --git a/src/app/main.ts b/src/app/main.ts
deleted file mode 100644
index a66f9db57d3..00000000000
--- a/src/app/main.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-// tslint:disable-next-line:no-submodule-imports
-import 'web-animations-js/web-animations.min';
-
-import { AppModule } from './app.module';
-
-// Note: loader import location set using "esmLoaderPath" within the output target confg
-// tslint:disable-next-line:no-submodule-imports
-import { defineCustomElements as BpQRCode } from 'qr-code-component-ng/dist/loader';
-
-platformBrowserDynamic().bootstrapModule(AppModule);
-BpQRCode(window);
diff --git a/src/models/in-app-browser/in-app-browser-ref.model.ts b/src/app/models/in-app-browser/in-app-browser-ref.model.ts
similarity index 100%
rename from src/models/in-app-browser/in-app-browser-ref.model.ts
rename to src/app/models/in-app-browser/in-app-browser-ref.model.ts
diff --git a/src/models/profile/profile.model.ts b/src/app/models/profile/profile.model.ts
similarity index 100%
rename from src/models/profile/profile.model.ts
rename to src/app/models/profile/profile.model.ts
diff --git a/src/app/models/tokens/tokens.model.ts b/src/app/models/tokens/tokens.model.ts
new file mode 100644
index 00000000000..27c411acc70
--- /dev/null
+++ b/src/app/models/tokens/tokens.model.ts
@@ -0,0 +1,41 @@
+export interface TokenInfo {
+ coin: string;
+ blockCreated?: number;
+ circulatingSupply?: number;
+ containsBaton: true;
+ decimals: number;
+ documentHash?: string;
+ documentUri: string;
+ id: string;
+ initialTokenQty: number;
+ name: string;
+ symbol: string;
+ timestamp: string;
+ timestamp_unix?: number;
+ totalBurned: number;
+ totalMinted: number;
+ versionType: number;
+}
+
+export interface UtxoToken {
+ txid: string;
+ outIdx: number;
+ value: number;
+ isNonSLP?: boolean;
+ slpMeta?: any;
+ tokenId?: string;
+ amountToken?: number;
+ tokenQty?: number,
+ decimals?: number,
+}
+
+export interface Token {
+ amountToken?: number;
+ tokenId: string;
+ tokenInfo?: TokenInfo;
+ utxoToken?: UtxoToken[];
+ alternativeBalance? : number;
+}
+
+
+
diff --git a/src/models/user/user.model.ts b/src/app/models/user/user.model.ts
similarity index 100%
rename from src/models/user/user.model.ts
rename to src/app/models/user/user.model.ts
diff --git a/src/app/pages/accounts/accounts.html b/src/app/pages/accounts/accounts.html
new file mode 100644
index 00000000000..51fabc73ae5
--- /dev/null
+++ b/src/app/pages/accounts/accounts.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/accounts/accounts.scss b/src/app/pages/accounts/accounts.scss
new file mode 100644
index 00000000000..685752cf992
--- /dev/null
+++ b/src/app/pages/accounts/accounts.scss
@@ -0,0 +1,342 @@
+accounts-page {
+ @mixin center {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .toolbar-title-ios {
+ text-align: center;
+ }
+
+ .wallets-list {
+ margin-top: 12px;
+ }
+ .key-name {
+ flex: 1;
+ }
+
+ .title {
+ font-weight: 500;
+
+ >img {
+ margin-right: 7px;
+ }
+ }
+
+ .error {
+ color: var(--color-danger);
+ }
+
+ page-wallet-activity,
+ page-txp {
+ @media (max-width: 350px) {
+ .item-title {
+ font-size: 13px;
+ }
+
+ ion-note .date {
+ font-size: 11.5px;
+ }
+ }
+ }
+
+ page-txp:first-child,
+ page-wallet-activity:first-child {
+ & .item-ios {
+ border-top: 0.55px solid #f4f4f4;
+ }
+ }
+
+ page-txp:last-child,
+ page-wallet-activity:last-child {
+ border: 0;
+
+ & .item-inner {
+ border: 0 !important;
+ }
+ }
+
+ .no-header {
+ margin-top: 2.6rem;
+ }
+
+ // Styles for integrations
+ .sliding-container {
+ border-radius: 5px;
+ display: block;
+ }
+
+ .wallets ion-item-sliding.item-wrapper {
+ button.item.item-block .item-inner {
+ align-items: start;
+ }
+ }
+
+ .wallets ion-item-sliding.reorder-active {
+ box-shadow: none;
+
+ button.item.item-block {
+ box-shadow: 0 5px 18px 0 rgba(0, 0, 0, 0.06);
+ transform: scale3d(1.05, 1.05, 1.05);
+ transition: box-shadow 300ms ease, transform 300ms ease;
+ }
+ }
+
+ ion-item-sliding.item-wrapper {
+ --gift-card-item-side-padding: 4%;
+ --gift-card-item-height: 59px;
+
+ background: none;
+ padding-left: var(--gift-card-item-side-padding);
+ padding-right: var(--gift-card-item-side-padding);
+
+ ion-item-options {
+ border-bottom: 0;
+ margin-top: 1px;
+ height: var(--gift-card-item-height) + 16px;
+
+ &[side*='right'] {
+ padding-right: var(--gift-card-item-side-padding);
+ }
+
+ &[side*='left'] {
+ padding-left: var(--gift-card-item-side-padding);
+ }
+
+ button.button {
+ border-radius: 5px;
+ font-weight: 400;
+ min-width: 73px;
+ padding: 15px;
+
+ .archive {
+ &__icon {
+ font-size: 20px;
+ margin-top: -1px;
+ }
+
+ &__text {
+ font-size: 13px;
+ }
+ }
+ }
+ }
+
+ button.item.item-block {
+ font-size: 16px;
+ box-shadow: 0 5px 18px 0 rgba(0, 0, 0, 0.03);
+
+ .item-inner {
+ height: var(--gift-card-item-height) + 16px;
+
+ ion-label {
+
+ &.label-ios,
+ &.label-md {
+ display: flex;
+ height: var(--gift-card-item-height);
+ align-items: center;
+ margin: 0;
+ }
+ }
+ }
+ }
+ }
+
+ ion-item-sliding.card-item-sliding {
+ padding-bottom: 1rem;
+
+ button.item.item-block {
+ border-radius: 5px;
+
+ .item-inner {
+ border: 0;
+ }
+ }
+ }
+
+ ion-fab {
+ ion-icon.icon {
+ font-size: 0;
+ }
+
+ width: 100px;
+ border-radius: 30px;
+
+ button {
+ padding: 0px 50px 0px 55px;
+ border-radius: 30px;
+
+ .fab-text {
+ margin-left: 5px;
+ font-weight: 500;
+ font-size: 16px;
+ }
+ }
+ }
+
+ @media only screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) {
+ ion-fab[right] {
+ right: env(safe-area-inset-bottom);
+ }
+
+ ion-fab[bottom] {
+ bottom: env(safe-area-inset-bottom);
+ }
+ }
+
+ @keyframes bounce-card {
+ 0% {
+ transform: translateY(0);
+ }
+
+ 10% {
+ transform: translateY(0);
+ }
+
+ 30% {
+ transform: translateY(40px);
+ }
+
+ 50% {
+ transform: translateY(0);
+ }
+
+ 57% {
+ transform: translateY(5px);
+ }
+
+ 64% {
+ transform: translateY(0);
+ }
+
+ 100% {
+ transform: translateY(0);
+ }
+ }
+
+ .wallets-container {
+ .wallet-wrapper {
+ ion-item-sliding:last-child {
+ padding-bottom: 2rem;
+ margin-bottom: -2rem;
+ }
+ }
+
+ .bp-list ion-item {
+ cursor: pointer;
+ }
+ }
+
+ .section-header {
+ margin: 0 1rem;
+ padding: 0;
+ }
+
+ .sliding-container {
+ height: auto;
+
+ .wallet-wrapper:first-child .item.item-block {
+ border-top-left-radius: 5px;
+ border-top-right-radius: 5px;
+ }
+
+ .wallet-wrapper:last-child .item.item-block {
+ border-bottom-left-radius: 5px;
+ border-bottom-right-radius: 5px;
+
+ .item-inner {
+ border: 0;
+ }
+ }
+
+ .item-inner {
+ text-align: right;
+ margin: 0 2px 0 0;
+ }
+
+ .action {
+ &.button.button-default {
+ padding: 0;
+ }
+
+ &--receive {
+ background-color: #edf7f9;
+
+ &.activated,
+ &:hover:not(.disable-hover) {
+ background-color: #e8f4f7;
+ }
+ }
+
+ &--send {
+ background-color: #eff1fe;
+
+ &.activated,
+ &:hover:not(.disable-hover) {
+ background-color: #e9ebf9;
+ }
+ }
+
+ &__icon {
+ img {
+ height: 35px;
+ }
+ }
+
+ &__text {
+ color: #434d59;
+ font-size: 14px;
+ font-weight: 500;
+ margin-top: 3px;
+ }
+ }
+
+ &.wallets {
+ button.item.item-block {
+ div.item-inner {
+ display: flex;
+ align-items: center;
+ }
+ }
+ }
+
+ ion-reorder {
+ flex-basis: 60px;
+ margin-left: 3px;
+
+ ion-icon {
+ margin-bottom: 2px;
+ }
+ }
+
+ label-tip {
+ margin-top: 12px;
+ width: calc(92% - 10px);
+ left: calc(4% + 5px);
+ }
+ }
+
+ .zero-state-coinbase {
+ background-color: rgba(22, 82, 240, 0.7);
+ overflow: hidden;
+ width: 100%;
+ height: 90px;
+
+ .zero-state-image {
+ text-align: center;
+
+ img {
+ width: 160px;
+ margin-top: -7px;
+ }
+ }
+ }
+
+ .no-wallet {
+ font-size: 18px;
+ text-align: center;
+ color: var(--ion-color-primary);
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/accounts/accounts.ts b/src/app/pages/accounts/accounts.ts
new file mode 100644
index 00000000000..23740042176
--- /dev/null
+++ b/src/app/pages/accounts/accounts.ts
@@ -0,0 +1,428 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, NgZone, ViewChild, ViewEncapsulation } from '@angular/core';
+
+import * as _ from 'lodash';
+import { Subscription } from 'rxjs';
+
+// Pages
+import { CopayersPage } from '../add/copayers/copayers';
+
+// Providers
+import { AnalyticsProvider } from '../../providers/analytics/analytics';
+// import { BwcErrorProvider } from '../../providers/bwc-error/bwc-error';
+import { Logger } from '../../providers/logger/logger';
+import { PersistenceProvider } from '../../providers/persistence/persistence';
+import { PlatformProvider } from '../../providers/platform/platform';
+import { ProfileProvider } from '../../providers/profile/profile';
+import { WalletProvider } from '../../providers/wallet/wallet';
+import { LoadingController, ModalController, NavParams, Platform } from '@ionic/angular';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { Router } from '@angular/router';
+
+interface UpdateWalletOptsI {
+ walletId: string;
+ force?: boolean;
+ alsoUpdateHistory?: boolean;
+}
+
+@Component({
+ selector: 'accounts-page ',
+ templateUrl: 'accounts.html',
+ styleUrls: ['accounts.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class AccountsPage {
+ @ViewChild('priceCard')
+ priceCard;
+ public wallets;
+ public walletsGroups = [];
+ public txpsN: number;
+
+ public collapsedGroups;
+
+ private zone;
+ private onResumeSubscription: Subscription;
+ private onPauseSubscription: Subscription;
+ isDonation;
+ donationSupportCoins = [];
+ navParamsData;
+ public isShowCreateNewWallet = false;
+ public network: string ;
+ public coin: string ;
+ public titlePage : string = 'Send from';
+ constructor(
+ public http: HttpClient,
+ private plt: Platform,
+ private router: Router,
+ private profileProvider: ProfileProvider,
+ private walletProvider: WalletProvider,
+ private platformProvider: PlatformProvider,
+ private analyticsProvider: AnalyticsProvider,
+ private logger: Logger,
+ private events: EventManagerService,
+ private persistenceProvider: PersistenceProvider,
+ private modalCtrl: ModalController,
+ private loadingCtr: LoadingController,
+ private navParams: NavParams
+ ) {
+ this.collapsedGroups = {};
+ this.zone = new NgZone({ enableLongStackTrace: false });
+
+ }
+
+ getWalletGroup(name: string) {
+ return this.profileProvider.getWalletGroup(name)
+ }
+
+ ionViewDidEnter() {
+ this._didEnter();
+ }
+
+ ionViewWillEnter() {
+
+ }
+
+ private getWalletsGroups() {
+ const walletsGroups = this.profileProvider.orderedWalletsByGroup;
+ if (this.isDonation) {
+ this.walletProvider.getDonationInfo().then((data: any) => {
+ this.donationSupportCoins = data.donationSupportCoins;
+ this.walletsGroups = this.filterValidWallet(walletsGroups);
+ });
+ }
+ else {
+ this.walletsGroups = this.filterValidWallet(walletsGroups);
+ if(this.walletsGroups.length === 1 && this.walletsGroups[0].length ===1){
+ this.goToSendPage(this.walletsGroups[0][0]);
+ }
+ }
+ }
+
+ private filterValidWallet(walletGroups: any) {
+ const walletsGroup = [];
+ walletGroups.forEach((el: any) => {
+ const wallet = el.filter(wallet => {
+ if (this.isDonation) {
+ return wallet.isComplete() && !wallet.needsBackup && _.some(this.donationSupportCoins, (item: any) => item.network == wallet.network && item.coin == wallet.coin);
+ } else {
+ if (this.network && this.coin) {
+ return wallet.isComplete() && !wallet.needsBackup && this.network == wallet.network && this.coin == wallet.coin;
+ } else {
+ return wallet.isComplete() && !wallet.needsBackup;
+ }
+ }
+ })
+ walletsGroup.push(wallet);
+ })
+ this.isShowCreateNewWallet = _.isEmpty(walletsGroup);
+ return walletsGroup;
+ }
+
+ private async walletAudienceEvents() {
+ try {
+ const deviceUUID = this.platformProvider.getDeviceUUID();
+ const hasCreatedWallet = await this.persistenceProvider.getHasReportedFirebaseWalletCreateFlag();
+ const hasSecuredWalletFlag = await this.persistenceProvider.getHasReportedFirebaseSecuredWallet();
+ const hasFundedWallet = await this.persistenceProvider.getHasReportedFirebaseHasFundedWallet();
+ const hasNotFundedWallet = await this.persistenceProvider.getHasReportedFirebasedNonFundedWallet();
+ const keys = await this.persistenceProvider.getKeys();
+
+ if (!hasCreatedWallet) {
+ if (keys && keys.length > 0) {
+ this.analyticsProvider.logEvent('user_has_created_wallet', {
+ uuid: deviceUUID,
+ timestamp: Date.now()
+ });
+ this.persistenceProvider.setHasReportedFirebaseWalletCreateFlag();
+ }
+ }
+
+ if (!hasSecuredWalletFlag) {
+ let hasAtLeastOneMnemonicEncrypted = keys.some(
+ key => key.mnemonicEncrypted
+ );
+ if (hasAtLeastOneMnemonicEncrypted) {
+ this.analyticsProvider.logEvent('user_has_secured_wallet', {
+ uuid: deviceUUID
+ });
+ this.persistenceProvider.setHasReportedFirebaseSecuredWallet();
+ }
+ }
+
+ if (!hasFundedWallet) {
+ let totalBalance = await this.persistenceProvider.getTotalBalance();
+ if (parseFloat(totalBalance.totalBalanceAlternative)) {
+ this.analyticsProvider.logEvent('user_has_funded_wallet', {
+ uuid: deviceUUID
+ });
+ this.persistenceProvider.setHasReportedFirebaseHasFundedWallet();
+ } else {
+ if (!hasNotFundedWallet) {
+ this.analyticsProvider.logEvent('user_has_not_funded_wallet', {
+ uuid: deviceUUID
+ });
+ this.persistenceProvider.setHasReportedFirebaseNonFundedWallet();
+ }
+ }
+ }
+ } catch (e) {
+ this.logger.debug(
+ 'Error occurred during wallet audience events: ' + e.message
+ );
+ }
+ }
+
+ private _didEnter() {
+ this.updateTxps();
+ this.walletAudienceEvents();
+ }
+
+ private walletFocusHandler = opts => {
+ this.logger.debug('RECV Local/WalletFocus @home', opts);
+ opts = opts || {};
+ opts.alsoUpdateHistory = true;
+ this.fetchWalletStatus(opts);
+ };
+
+ private walletActionHandler = opts => {
+ this.logger.debug('RECV Local/TxAction @home', opts);
+ opts = opts || {};
+ opts.alsoUpdateHistory = true;
+ this.fetchWalletStatus(opts);
+ };
+
+ ngOnInit() {
+
+ const subscribeEvents = () => {
+
+ this.events.subscribe('Local/TxAction', this.walletActionHandler);
+
+ this.events.subscribe('Local/WalletFocus', this.walletFocusHandler);
+ };
+
+ subscribeEvents();
+ this.onResumeSubscription = this.plt.resume.subscribe(() => {
+ subscribeEvents();
+ });
+
+ this.onPauseSubscription = this.plt.pause.subscribe(() => {
+ this.events.unsubscribe('Local/TxAction', this.walletFocusHandler);
+ this.events.unsubscribe('Local/WalletFocus', this.walletFocusHandler);
+ });
+
+ this.walletsGroups = [];
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ if (_.isEmpty(this.navParamsData) && this.navParams && !_.isEmpty(this.navParamsData)) this.navParamsData = this.navParamsData;
+ this.isDonation = this.navParamsData.isDonation;
+ if(this.isDonation) this.titlePage = "Accounts";
+ this.coin = this.navParamsData.coin;
+ this.network = this.navParamsData.network;
+ this.getWalletsGroups();
+ }
+
+ ngOnDestroy() {
+ this.onResumeSubscription.unsubscribe();
+ this.onPauseSubscription.unsubscribe();
+ }
+
+ private debounceFetchWalletStatus = _.debounce(
+ async (walletId, alsoUpdateHistory) => {
+ this.fetchWalletStatus({ walletId, alsoUpdateHistory });
+ },
+ 3000
+ );
+
+ private fetchTxHistory(opts: UpdateWalletOptsI) {
+ if (!opts.walletId) {
+ this.logger.error('Error no walletId in update History');
+ return;
+ }
+ const wallet = this.profileProvider.getWallet(opts.walletId);
+
+ const progressFn = ((_, newTxs) => {
+ let args = {
+ walletId: opts.walletId,
+ finished: false,
+ progress: newTxs
+ };
+ this.events.publish('Local/WalletHistoryUpdate', args);
+ }).bind(this);
+
+ // Fire a startup event, to allow UI to show the spinner
+ this.events.publish('Local/WalletHistoryUpdate', {
+ walletId: opts.walletId,
+ finished: false
+ });
+ this.walletProvider
+ .fetchTxHistory(wallet, progressFn, opts)
+ .then(txHistory => {
+ wallet.completeHistory = txHistory;
+ this.events.publish('Local/WalletHistoryUpdate', {
+ walletId: opts.walletId,
+ finished: true
+ });
+ })
+ .catch(err => {
+ if (err != 'HISTORY_IN_PROGRESS') {
+ this.logger.warn('WalletHistoryUpdate ERROR', err);
+ this.events.publish('Local/WalletHistoryUpdate', {
+ walletId: opts.walletId,
+ finished: false,
+ error: err
+ });
+ }
+ });
+ }
+
+ // Names:
+ // .fetch => from BWS
+ // .update => to UI
+ /* This is the only .getStatus call in Copay */
+ private fetchWalletStatus = (opts: UpdateWalletOptsI): void => {
+ if (!opts.walletId) {
+ this.logger.error('Error no walletId in update Wallet');
+ return;
+ }
+ this.events.publish('Local/WalletUpdate', {
+ walletId: opts.walletId,
+ finished: false
+ });
+
+ this.logger.debug(
+ 'fetching status for: ' +
+ opts.walletId +
+ ' alsohistory:' +
+ opts.alsoUpdateHistory
+ );
+ const wallet = this.profileProvider.getWallet(opts.walletId);
+ if (!wallet) return;
+
+ this.walletProvider
+ .fetchStatus(wallet, opts)
+ .then(status => {
+ wallet.cachedStatus = status;
+ wallet.error = wallet.errorObj = null;
+
+ const balance =
+ wallet.coin === 'xrp'
+ ? wallet.cachedStatus.availableBalanceStr
+ : wallet.cachedStatus.totalBalanceStr;
+
+ this.persistenceProvider.setLastKnownBalance(wallet.id, balance);
+
+ // Update txps
+ this.updateTxps();
+ this.events.publish('Local/WalletUpdate', {
+ walletId: opts.walletId,
+ finished: true
+ });
+
+ if (opts.alsoUpdateHistory) {
+ this.fetchTxHistory({ walletId: opts.walletId, force: opts.force });
+ }
+ })
+ .catch(err => {
+ if (err == 'INPROGRESS') return;
+
+ this.logger.warn('Update error:', err);
+
+ // this.processWalletError(wallet, err);
+
+ this.events.publish('Local/WalletUpdate', {
+ walletId: opts.walletId,
+ finished: true,
+ error: wallet.error
+ });
+
+ if (opts.alsoUpdateHistory) {
+ this.fetchTxHistory({ walletId: opts.walletId, force: opts.force });
+ }
+ });
+ };
+
+ private updateTxps() {
+ this.profileProvider
+ .getTxps({ limit: 3 })
+ .then(data => {
+ this.events.publish('Local/UpdateTxps', {
+ n: data.n
+ });
+ this.zone.run(() => {
+ this.txpsN = data.n;
+ });
+ })
+ .catch(err => {
+ this.logger.error(err);
+ });
+ }
+
+ public handleDonation(wallet) {
+ const loading = this.loadingCtr.create({
+ message: 'Please wait...'
+ })
+ loading.then(loadingEl => loadingEl.present());
+ this.walletProvider.getDonationInfo().then((data: any) => {
+ loading.then(loadingEl => loadingEl.dismiss());
+ if (_.isEmpty(data)) {
+ throw new Error("No data Remaning");
+ }
+ this.router.navigate(['/send-page'], {
+ state: {
+ toAddress: _.get(_.find(data.donationToAddresses, item => item.coin == wallet.coin), 'address', ''),
+ donationSupportCoins: data.donationSupportCoins,
+ id: wallet.credentials.walletId,
+ walletId: wallet.credentials.walletId,
+ recipientType: 'wallet',
+ name: wallet.name,
+ coin: wallet.coin,
+ network: wallet.network,
+ isDonation: true,
+ fromWalletDetails: true,
+ minMoneydonation: data.minMoneydonation,
+ remaining: data.remaining,
+ receiveLotus: data.receiveAmountLotus,
+ donationCoin: data.donationCoin
+ }
+ });
+ }).catch((err) => {
+ console.log(err)
+ loading.then(loadingEl => loadingEl.dismiss());
+ });
+ }
+
+ public async goToSendPage(wallet) {
+ if (this.isDonation) {
+ return this.handleDonation(wallet);
+ }
+ if (wallet.isComplete()) {
+ this.router.navigate(['/send-page'], {
+ state: {
+ walletId: wallet.credentials.walletId,
+ toAddress: this.navParamsData.toAddress,
+ }
+ });
+ } else {
+ const copayerModal = await this.modalCtrl.create({
+ component: CopayersPage,
+ componentProps: {
+ walletId: wallet.credentials.walletId
+ },
+ cssClass: 'wallet-details-modal'
+ });
+ await copayerModal.present();
+ }
+ }
+
+ public openBackupPage(keyId) {
+ this.router.navigate(['/backup-key'], {
+ state: {
+ keyId
+ },
+ })
+ }
+
+}
diff --git a/src/app/pages/add-wallet/add-wallet.html b/src/app/pages/add-wallet/add-wallet.html
new file mode 100644
index 00000000000..623a0c45441
--- /dev/null
+++ b/src/app/pages/add-wallet/add-wallet.html
@@ -0,0 +1,32 @@
+
+
\ No newline at end of file
diff --git a/src/pages/add-wallet/add-wallet.scss b/src/app/pages/add-wallet/add-wallet.scss
similarity index 94%
rename from src/pages/add-wallet/add-wallet.scss
rename to src/app/pages/add-wallet/add-wallet.scss
index aecf562a416..840f2b8646f 100644
--- a/src/pages/add-wallet/add-wallet.scss
+++ b/src/app/pages/add-wallet/add-wallet.scss
@@ -1,30 +1,37 @@
page-add-wallet {
.button-default {
- color: color($colors, dark);
+ color: var(-color-dark);
box-shadow: none;
}
+
.bp-list {
.main-label {
font-weight: 400;
}
+
ion-item-divider {
margin-top: 0px;
padding: 12.5px 0px 12.5px 20px;
background: #f8f8f9;
}
+
ion-icon.item-img.icon {
+
&.icon-md.item-icon,
&.icon-ios.item-icon {
padding: 14.5px;
+
&.icon-settings {
opacity: 0.5;
}
+
img {
width: 20px;
height: 20px;
}
}
}
+
ion-note.note {
background: #f4f5fb;
color: #565d6d;
@@ -34,4 +41,4 @@ page-add-wallet {
font-size: 14px;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/app/pages/add-wallet/add-wallet.ts b/src/app/pages/add-wallet/add-wallet.ts
new file mode 100644
index 00000000000..0bbb40f6c9c
--- /dev/null
+++ b/src/app/pages/add-wallet/add-wallet.ts
@@ -0,0 +1,85 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+// providers
+import { Logger } from '../../providers/logger/logger';
+import { ProfileProvider } from '../../providers/profile/profile';
+
+import * as _ from 'lodash';
+import { NavController, NavParams } from '@ionic/angular';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'page-add-wallet',
+ templateUrl: 'add-wallet.html',
+ styleUrls: ['/add-wallet.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class AddWalletPage {
+ public walletsGroups;
+ public fromEthCard: boolean;
+ public title: string;
+ navParamsData;
+ constructor(
+ private navCtrl: NavController,
+ private logger: Logger,
+ private profileProvider: ProfileProvider,
+ private navParams: NavParams,
+ private translate: TranslateService,
+ private router: Router,
+ ) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ if (_.isEmpty(this.navParamsData) && this.navParams && !_.isEmpty(this.navParams.data)) this.navParamsData = this.navParams.data;
+ this.fromEthCard = this.navParamsData.fromEthCard;
+ this.title = this.fromEthCard
+ ? this.translate.instant('Select Key to add ETH Wallet to')
+ : this.translate.instant('Select Key');
+ const opts = {
+ canAddNewAccount: true,
+ showHidden: true
+ };
+ const wallets = this.profileProvider.getWallets(opts);
+ this.walletsGroups = _.values(_.groupBy(wallets, 'keyId'));
+ }
+
+ ngOnInit() {
+ this.logger.info('Loaded: AddWalletPage');
+ }
+
+ getWalletGroup(id) {
+ return this.profileProvider.getWalletGroup(id);
+ }
+
+ public goToAddPage(keyId?): void {
+ if (this.navParamsData.isCreate) {
+ if (this.fromEthCard) {
+ this.router.navigate(['create-wallet'], {
+ state: {
+ isShared: false,
+ coin: 'eth',
+ keyId
+ }
+ });
+ } else {
+ this.router.navigate(['/select-currency'], {
+ state: {
+ isShared: this.navParamsData.isShared,
+ isZeroState: keyId ? false : true,
+ keyId
+ }
+ });
+ }
+ } else if (this.navParamsData.isJoin) {
+ this.router.navigate(['/join-wallet'], {
+ state: {
+ keyId,
+ url: this.navParamsData.url
+ }
+ });
+ }
+ }
+}
diff --git a/src/app/pages/add/add.html b/src/app/pages/add/add.html
new file mode 100644
index 00000000000..c621e0653c6
--- /dev/null
+++ b/src/app/pages/add/add.html
@@ -0,0 +1,40 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/add/add.scss b/src/app/pages/add/add.scss
new file mode 100644
index 00000000000..9a46257bee2
--- /dev/null
+++ b/src/app/pages/add/add.scss
@@ -0,0 +1,31 @@
+page-add{
+ .list-button {
+ --padding-top: 10px;
+ --padding-bottom: 10px;
+
+ .item-title {
+ color: #001E2E;
+ font-size: 16px;
+ font-weight: 600;
+ }
+
+ .item-subtitle {
+ color: rgba(0, 30, 46, 0.6);;
+ font-size: 14hpx;
+ white-space: normal;
+ }
+
+ ion-icon {
+ margin-left: 3px;
+ --icon-dimension: 40px;
+ height: var(--icon-dimension);
+ width: var(--icon-dimension);
+ margin-right: 1rem;
+ }
+
+ ion-label{
+ padding: 6px 0 !important;
+ }
+ }
+}
+
diff --git a/src/app/pages/add/add.ts b/src/app/pages/add/add.ts
new file mode 100644
index 00000000000..9d4761fb278
--- /dev/null
+++ b/src/app/pages/add/add.ts
@@ -0,0 +1,71 @@
+import { Location } from '@angular/common';
+import { Component, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+import { AppProvider } from 'src/app/providers';
+import { Logger } from 'src/app/providers/logger/logger';
+
+
+@Component({
+ selector: 'page-add',
+ templateUrl: 'add.html',
+ styleUrls: ['add.scss'],
+ encapsulation: ViewEncapsulation.None
+
+})
+export class AddPage {
+ public keyId: string;
+ public isZeroState: boolean;
+ navParamsData: any;
+ currentTheme;
+
+ constructor(
+ private appProvider: AppProvider,
+ private router: Router,
+ private logger: Logger,
+ private location: Location
+ ) {
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : undefined;
+ }
+ }
+
+ ngOnInit() {
+ this.logger.info('Loaded: AddPage');
+ this.keyId = this.navParamsData.keyId;
+ this.isZeroState = this.navParamsData.isZeroState;
+ }
+
+ public goToAddWalletPage(isShared?: boolean, isJoin?: boolean): void {
+ if (this.navParamsData.isMultipleSeed) {
+ this.router.navigate(['/add-wallet'], {
+ state: {
+ isCreate: true,
+ isMultipleSeed: true,
+ isShared,
+ url: this.navParamsData.url
+ }
+ });
+ } else {
+ this.router.navigate(['/select-currency'], {
+ state: {
+ isShared,
+ isJoin,
+ isZeroState: this.isZeroState && !isShared,
+ keyId: this.keyId,
+ url: this.navParamsData.url
+ }
+ });
+ }
+ }
+
+ public goToImportWallet(): void {
+ this.router.navigate(['/import-wallet']);
+ }
+
+ public goBack(): void {
+ this.location.back();
+ }
+}
diff --git a/src/app/pages/add/copayers/copayers.html b/src/app/pages/add/copayers/copayers.html
new file mode 100644
index 00000000000..f81e63fdc41
--- /dev/null
+++ b/src/app/pages/add/copayers/copayers.html
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+ Delete
+ Hide
+
+
+
+
+
+
+
+
+
+
+ {{titlePage | translate}}
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/add/copayers/copayers.scss b/src/app/pages/add/copayers/copayers.scss
new file mode 100644
index 00000000000..c70b893b986
--- /dev/null
+++ b/src/app/pages/add/copayers/copayers.scss
@@ -0,0 +1,208 @@
+page-copayers {
+ @media only screen and (max-width: 576px) {
+ ion-content {
+ --padding-end: 1rem !important;
+ }
+ }
+
+ .custom-expandable-header {
+ margin-top: 12px;
+ }
+
+ .icon-close {
+ color: #edeff0 !important;
+ }
+ .close-container {
+ text-transform: capitalize;
+ span {
+ color: #edeff0 !important;
+ }
+ }
+ .sub-title-header {
+ color: rgba(0, 30, 46, 0.6);
+ font-size: 14px;
+ margin-top: 4px;
+ }
+ .toolbar-content {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+ .copayers-header {
+ width: 100%;
+ margin-bottom: 10px;
+ &-content {
+ padding: 0 2rem;
+ .title {
+ font-size: 18px;
+ font-weight: 500;
+ padding-bottom: 1rem;
+ @media (max-width: 370px) {
+ padding-bottom: 0.5rem;
+ }
+ }
+ .text {
+ opacity: 0.7;
+ }
+ }
+ }
+
+ .account-invitaion-container {
+ display: flex;
+ flex-flow: column;
+ background: #fafafb;
+ border-radius: 12px;
+ margin: 2rem 1rem;
+ padding: 24px 16px;
+ margin-top: 0px;
+
+ .content {
+ display: flex;
+ flex-flow: row;
+ .account-ivitaion-info {
+ display: flex;
+ flex-flow: column;
+ padding-right: 16px;
+ .title {
+ font-weight: 600;
+ font-size: 16px;
+ color: #001e2e;
+ }
+ .sub-title {
+ margin-top: 8px;
+ font-weight: 400;
+ font-size: 14px;
+ color: rgba(0, 30, 46, 0.6);
+ }
+ }
+ .aclass {
+ height: 125px;
+ width: 125px;
+ }
+ }
+ .button {
+ margin-top: 1rem;
+ margin-bottom: 0;
+ ion-button {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ }
+ }
+ }
+ .white-card {
+ background: transparent;
+ padding: 2rem 1rem;
+ padding-top: 9px;
+ margin-top: 20px;
+ .title {
+ font-size: 16px;
+ font-weight: 500;
+ }
+ }
+
+ .share-button {
+ margin-left: 3.5rem;
+ }
+
+ .error-msg {
+ text-align: center;
+ }
+ .timeline-container {
+ background: linear-gradient(
+ 0deg,
+ rgba(0, 101, 141, 0.11),
+ rgba(0, 101, 141, 0.11)
+ ),
+ #fafafb;
+ border-radius: 12px;
+ }
+ // Timeline styles
+ .timeline-item {
+ background-color: transparent;
+ border: 0;
+ padding: 17px 0px;
+
+ &:not(:nth-child(1)) {
+ .timeline-content-icon {
+ .line::before {
+ content: '';
+ background: #006c44;
+ width: 1px;
+ position: absolute;
+ left: 50%;
+ -webkit-transform: translateX(-50%) translateY(-100%);
+ transform: translateX(-50%) translateY(-100%);
+ height: 16px;
+ top: -8px;
+ }
+ }
+ }
+
+ > * {
+ padding-right: 0;
+ }
+
+ .line.no-border {
+ top: 3px;
+ ion-icon {
+ font-size: 25px;
+ color: var(--color-dark);
+ }
+ }
+ .wait-icon {
+ opacity: 0.6;
+ }
+ .timeline-content {
+ display: flex;
+ align-items: center;
+
+ &-icon {
+ display: flex;
+ align-items: center;
+ min-width: 40px;
+ padding-right: 1rem;
+ padding-left: 1rem;
+ margin-right: 0.5rem;
+ position: relative;
+ z-index: 11;
+
+ .ion-ios-checkmark {
+ &::before {
+ font-size: 30px;
+ }
+ }
+
+ > div {
+ border-radius: var(--icon-border-radius);
+ display: flex;
+ height: 20px;
+ width: 20px;
+ font-size: 20px;
+ align-items: center;
+ justify-content: center;
+ font-weight: 600;
+ vertical-align: middle;
+ color: var(--color-success);
+ z-index: 10;
+ }
+ }
+
+ &-label {
+ flex-grow: 1;
+
+ > .name {
+ font-size: 16px;
+ color: #0b1d28;
+ font-weight: 600;
+ opacity: 0.6;
+ @media (max-width: 330px) {
+ font-size: 14px;
+ }
+ }
+ > .copayer-name {
+ opacity: 1;
+ }
+ }
+ }
+ }
+}
diff --git a/src/pages/add/copayers/copayers.ts b/src/app/pages/add/copayers/copayers.ts
similarity index 81%
rename from src/pages/add/copayers/copayers.ts
rename to src/app/pages/add/copayers/copayers.ts
index c71f148898b..3021605660f 100644
--- a/src/pages/add/copayers/copayers.ts
+++ b/src/app/pages/add/copayers/copayers.ts
@@ -1,14 +1,12 @@
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
-import { Events, NavParams, Platform, ViewController } from 'ionic-angular';
import { Subscription } from 'rxjs';
// Native
-import { SocialSharing } from '@ionic-native/social-sharing';
+import { SocialSharing } from '@ionic-native/social-sharing/ngx';
// Providers
import { AppProvider } from '../../../providers/app/app';
-import { ConfigProvider } from '../../../providers/config/config';
import { KeyProvider } from '../../../providers/key/key';
import { Logger } from '../../../providers/logger/logger';
import { OnGoingProcessProvider } from '../../../providers/on-going-process/on-going-process';
@@ -16,10 +14,16 @@ import { PlatformProvider } from '../../../providers/platform/platform';
import { PopupProvider } from '../../../providers/popup/popup';
import { ProfileProvider } from '../../../providers/profile/profile';
import { PushNotificationsProvider } from '../../../providers/push-notifications/push-notifications';
+import { ModalController, NavParams, Platform } from '@ionic/angular';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { NgxQrcodeErrorCorrectionLevels } from '@techiediaries/ngx-qrcode';
+import { ReplaceParametersProvider } from 'src/app/providers';
@Component({
selector: 'page-copayers',
- templateUrl: 'copayers.html'
+ templateUrl: 'copayers.html',
+ styleUrls: ['./copayers.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class CopayersPage {
public appName: string;
@@ -30,16 +34,16 @@ export class CopayersPage {
public canSign: boolean;
public copayers: any[];
public secret;
- public useLegacyQrCode: boolean;
-
+ typeErrorQr = NgxQrcodeErrorCorrectionLevels;
private onResumeSubscription: Subscription;
private onPauseSubscription: Subscription;
static processed = {};
-
+ public titlePage: string;
+ public currentTheme: string;
constructor(
private plt: Platform,
private appProvider: AppProvider,
- private events: Events,
+ private events: EventManagerService,
private logger: Logger,
private navParams: NavParams,
private platformProvider: PlatformProvider,
@@ -49,9 +53,9 @@ export class CopayersPage {
private onGoingProcessProvider: OnGoingProcessProvider,
private translate: TranslateService,
private pushNotificationsProvider: PushNotificationsProvider,
- private viewCtrl: ViewController,
+ private viewCtrl: ModalController,
private keyProvider: KeyProvider,
- private configProvider: ConfigProvider
+ private replaceParametersProvider: ReplaceParametersProvider
) {
this.secret = null;
this.appName = this.appProvider.info.userVisibleName;
@@ -60,14 +64,20 @@ export class CopayersPage {
this.copayers = [];
this.wallet = this.profileProvider.getWallet(this.navParams.data.walletId);
this.canSign = this.wallet.canSign;
- this.useLegacyQrCode = this.configProvider.get().legacyQrCode.show;
+ this.titlePage = this.replaceParametersProvider.replace(
+ this.translate.instant('{{ name }} [{{m}}-{{n}}]'),
+ {
+ name: this.wallet.name,
+ m: this.wallet.m,
+ n: this.wallet.n
+ }
+ );
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
}
- ionViewDidLoad() {
- this.logger.info('Loaded: CopayersPage');
- }
ngOnInit() {
+ this.logger.info('Loaded: CopayersPage');
this.subscribeEvents();
this.events.publish('Local/WalletFocus', {
walletId: this.wallet.credentials.walletId
@@ -126,10 +136,10 @@ export class CopayersPage {
let msg;
if (!this.canSign) {
msg = this.translate.instant(
- 'Are you sure you want to delete this wallet?'
+ 'Are you sure you want to delete this account?'
);
}
- msg = this.translate.instant('Are you sure you want to hide this wallet?');
+ msg = this.translate.instant('Are you sure you want to hide this account?');
this.popupProvider.ionicConfirm(title, msg).then(res => {
if (res) this.deleteWallet();
});
diff --git a/src/app/pages/add/create-wallet/create-wallet.html b/src/app/pages/add/create-wallet/create-wallet.html
new file mode 100755
index 00000000000..3bb816b1577
--- /dev/null
+++ b/src/app/pages/add/create-wallet/create-wallet.html
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'Create {coinLabel} Account' | translate: {coinLabel: coin.toUpperCase()} }}
+
+
+
+
+
+
+
+
+
+
+
+ Create account
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/add/create-wallet/create-wallet.scss b/src/app/pages/add/create-wallet/create-wallet.scss
new file mode 100755
index 00000000000..cb985e7268c
--- /dev/null
+++ b/src/app/pages/add/create-wallet/create-wallet.scss
@@ -0,0 +1,197 @@
+page-create-wallet {
+ .custom-expandable-header-primary{
+ top: 1rem;
+ position: relative;
+ }
+ .line-divider {
+ margin: 0 !important;
+ border: none !important;
+ border-bottom: 0.5px solid #dae0e5 !important;
+ }
+ mat-form-field {
+ padding: unset !important;
+ }
+ .toolbar-title {
+ color: #edeff0;
+ }
+ form {
+ margin: 18px;
+ margin-bottom: 120px;
+ .wallet-info-container {
+ background: #fafafb;
+ padding: 23px 1rem 1rem 1rem;
+ border-radius: 12px;
+ .your-name-mat-form-field {
+ margin-top: 43px;
+ margin-bottom: 32px;
+ }
+ }
+ ion-item {
+ margin-left: 0px;
+ --background: transparent;
+ --padding-start: 0;
+ }
+ .advance-button {
+ width: 100%;
+ --background: #fafafb;
+ --background-activated: none;
+ color: #001e2e;
+ margin: 0px;
+ margin-top: 32px;
+ --border-radius: 8px;
+ --padding-top: 16px;
+ --padding-bottom: 16px;
+ --padding-start: 16px;
+ --box-shadow: none !important;
+ span {
+ text-align: left;
+ width: 100%;
+ font-size: 16px;
+ font-weight: 600;
+ }
+ ion-icon {
+ width: 12px;
+ }
+ }
+ .open-advance {
+ --border-radius: 8px 8px 0px 0px;
+ }
+ .show-advance-option {
+ padding: 0px 16px;
+ padding-bottom: 8px;
+ background: #fafafb;
+ border-radius: 0px 0px 8px 8px;
+
+ ion-item {
+ // padding-bottom: 23px;
+ --inner-padding-bottom: 16px !important;
+ --inner-padding-top: 16px !important;
+ --border-color: #dae0e5;
+ }
+ .wallet-key-ion-item {
+ --inner-padding-bottom: 0 !important;
+ }
+ .set-padding-bottom {
+ padding-bottom: 28px;
+ }
+ .wallet-service-url-mat-form-field {
+ padding-top: 23px !important;
+ }
+ .mat-form-field {
+ padding-bottom: 28px !important;
+ }
+ }
+ }
+
+ .custom-item {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding-top: 18px;
+ .label {
+ font-size: 14px;
+ color: rgba(0, 30, 46, 0.6);
+ }
+ .buttons-container {
+ display: flex;
+ justify-content: space-between;
+ min-width: 110px;
+ .number-copayer {
+ font-weight: 600;
+ font-size: 22px;
+ flex-flow: column;
+ display: flex;
+ justify-content: center;
+ }
+ .add-button {
+ height: 32px;
+ width: 32px;
+ font-size: 20px;
+ border: 1px solid #70818a;
+ box-shadow: none;
+ justify-content: center;
+ display: flex;
+ }
+ .remove-button {
+ opacity: 50%;
+ height: 33px;
+ width: 33px;
+ border-radius: 50%;
+ font-size: 14px;
+ border: 1px solid grey;
+ box-shadow: none;
+ ion-icon {
+ color: grey;
+ }
+ }
+ }
+ }
+
+ .option-container {
+ &::part(native) {
+ flex-flow: column;
+ align-items: normal;
+ }
+
+ .option-line {
+ display: flex;
+ flex-flow: row;
+ justify-content: space-between;
+ align-items: center;
+ p {
+ font-size: 16px;
+ margin: 0px;
+ }
+ ion-toggle {
+ margin-top: auto;
+ margin-bottom: auto;
+ }
+ }
+
+ .option-line-info {
+ font-size: 12px;
+ font-weight: 400;
+ color: rgba(0, 30, 46, 0.6);
+ // padding-bottom: 10px;
+ a {
+ padding-top: 13px;
+ font-size: 14px;
+ color: #00658d;
+ }
+ }
+ }
+
+ .set-padding-top {
+ padding-top: 23px;
+ }
+
+ .notification-container {
+ display: flex;
+ padding: 12px 18px;
+ background: #ffddb6;
+ border-radius: 8px;
+ color: #482a00;
+ font-size: 14px;
+ margin-top: 24px;
+ img {
+ align-self: flex-start;
+ margin-top: 6px;
+ }
+
+ .notification-content {
+ margin-left: 10px;
+ }
+ }
+
+ .linked-wallet {
+ .item-inner {
+ border-bottom: 0px;
+ }
+ }
+ .last-item {
+ margin-left: auto;
+ }
+ .wide-header__title {
+ --min-height: 72px;
+ }
+}
diff --git a/src/app/pages/add/create-wallet/create-wallet.spec.ts b/src/app/pages/add/create-wallet/create-wallet.spec.ts
new file mode 100644
index 00000000000..6512e2f72b4
--- /dev/null
+++ b/src/app/pages/add/create-wallet/create-wallet.spec.ts
@@ -0,0 +1,73 @@
+// import { async, ComponentFixture } from '@angular/core/testing';
+// import { TestUtils } from '../../../test';
+// import { CreateWalletPage } from './create-wallet';
+
+// describe('CreateWalletPage', () => {
+// let fixture: ComponentFixture;
+// /* let instance; */
+
+// beforeEach(async(() => {
+// return TestUtils.configurePageTestingModule([CreateWalletPage]).then(
+// testEnv => {
+// fixture = testEnv.fixture;
+// /* instance = testEnv.instance; */
+// fixture.detectChanges();
+// }
+// );
+// }));
+// afterEach(() => {
+// fixture.destroy();
+// });
+
+// /* describe('setTotalCopayers function', () => {
+// it('should call updateRCSelect and updateSeedSourceSelect functions', () => {
+// const n = 3;
+// const spy = spyOn(instance, 'updateRCSelect');
+// const secondSpy = spyOn(instance, 'updateSeedSourceSelect');
+// instance.setTotalCopayers(n);
+// expect(spy).toHaveBeenCalledWith(n);
+// expect(secondSpy).toHaveBeenCalled();
+// });
+// }); TODO */
+
+// /* describe('setOptsAndCreate function', () => {
+// it('should call create function with options', () => {
+// const spy = spyOn(instance, 'create');
+// const opts = {
+// name: 'test',
+// m: 2,
+// n: 3,
+// myName: 'test',
+// networkName: 'livenet',
+// bwsurl: 'https://bws.bitpay.com/bws/api',
+// singleAddress: false,
+// coin: 'btc',
+// mnemonic: 'mom mom mom mom mom mom mom mom mom mom mom mom',
+// derivationStrategy: 'BIP44',
+// account: 0
+// };
+
+// spyOn(
+// instance.derivationPathHelperProvider,
+// 'isValidDerivationPathCoin'
+// ).and.returnValue(true);
+
+// instance.coin = 'btc';
+// instance.createForm.value.walletName = 'test';
+// instance.createForm.value.myName = 'test';
+// instance.createForm.value.requiredCopayers = 2;
+// instance.createForm.value.totalCopayers = 3;
+// instance.createForm.value.testnetEnabled = false;
+// instance.createForm.value.derivationPath = "m/44'/0'/0'";
+// instance.createForm.value.bwsURL = 'https://bws.bitpay.com/bws/api';
+// instance.createForm.value.singleAddress = false;
+// instance.createForm.value.coin = 'btc';
+// instance.createForm.value.selectedSeed = 'set';
+// instance.createForm.value.recoveryPhrase =
+// 'mom mom mom mom mom mom mom mom mom mom mom mom';
+
+// instance.setOptsAndCreate();
+// expect(spy).toHaveBeenCalledWith(opts);
+// });
+// }); TODO */
+// });
diff --git a/src/app/pages/add/create-wallet/create-wallet.ts b/src/app/pages/add/create-wallet/create-wallet.ts
new file mode 100755
index 00000000000..32d7d4d690a
--- /dev/null
+++ b/src/app/pages/add/create-wallet/create-wallet.ts
@@ -0,0 +1,564 @@
+import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import * as _ from 'lodash';
+import env from '../../../../environments';
+
+// Providers
+import { ActionSheetProvider } from '../../../providers/action-sheet/action-sheet';
+import { BwcErrorProvider } from '../../../providers/bwc-error/bwc-error';
+import { BwcProvider } from '../../../providers/bwc/bwc';
+import { ConfigProvider } from '../../../providers/config/config';
+import { Coin, CurrencyProvider } from '../../../providers/currency/currency';
+import { DerivationPathHelperProvider } from '../../../providers/derivation-path-helper/derivation-path-helper';
+import { ErrorsProvider } from '../../../providers/errors/errors';
+import { ExternalLinkProvider } from '../../../providers/external-link/external-link';
+import { Logger } from '../../../providers/logger/logger';
+import { OnGoingProcessProvider } from '../../../providers/on-going-process/on-going-process';
+import { PersistenceProvider } from '../../../providers/persistence/persistence';
+import { ProfileProvider } from '../../../providers/profile/profile';
+import { PushNotificationsProvider } from '../../../providers/push-notifications/push-notifications';
+import {
+ WalletOptions,
+ WalletProvider
+} from '../../../providers/wallet/wallet';
+
+// Pages
+import { KeyOnboardingPage } from '../../settings/key-settings/key-onboarding/key-onboarding';
+
+// Slider
+import { SliderCaptchaComponent } from '../../../components/slider-captcha/slider-captcha';
+import { IonContent, ModalController, NavController, NavParams } from '@ionic/angular';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { Router } from '@angular/router';
+import { CopayersPage } from '../copayers/copayers';
+import { AppProvider } from 'src/app/providers';
+@Component({
+ selector: 'page-create-wallet',
+ templateUrl: 'create-wallet.html',
+ encapsulation: ViewEncapsulation.None,
+ styleUrls: ['create-wallet.scss']
+})
+export class CreateWalletPage implements OnInit {
+ /* For compressed keys, m*73 + n*34 <= 496 */
+ private COPAYER_PAIR_LIMITS = {
+ 1: 1,
+ 2: 2,
+ 3: 3,
+ 4: 4,
+ 5: 4,
+ 6: 4,
+ 7: 3,
+ 8: 3,
+ 9: 2,
+ 10: 2,
+ 11: 1,
+ 12: 1
+ };
+
+ private defaults;
+ private tc: number;
+ private derivationPathByDefault: string;
+ private derivationPathForTestnet: string;
+ private showKeyOnboarding: boolean;
+
+ public isEnvDev = env.name == 'development' ? true : false;
+ public keyId: string;
+ public copayers: number[];
+ public signatures: number[];
+ public showAdvOpts: boolean;
+ public seedOptions;
+ public isShared: boolean;
+ public coin: Coin;
+ public coinName: string;
+ public okText: string;
+ public cancelText: string;
+ public createForm: FormGroup;
+ public currentTheme: string;
+
+ public multisigAddresses: string[];
+ public invalidAddress: boolean;
+ public pairedWallet: any;
+ public isOpenSelector: boolean;
+ public isSlpToken: boolean;
+ navParamsData;
+ public isScroll = false;
+ constructor(
+ private actionSheetProvider: ActionSheetProvider,
+ private currencyProvider: CurrencyProvider,
+ private navParams: NavParams,
+ private fb: FormBuilder,
+ private profileProvider: ProfileProvider,
+ private configProvider: ConfigProvider,
+ private derivationPathHelperProvider: DerivationPathHelperProvider,
+ private onGoingProcessProvider: OnGoingProcessProvider,
+ private logger: Logger,
+ private walletProvider: WalletProvider,
+ private translate: TranslateService,
+ private events: EventManagerService,
+ private pushNotificationsProvider: PushNotificationsProvider,
+ private externalLinkProvider: ExternalLinkProvider,
+ private bwcErrorProvider: BwcErrorProvider,
+ private bwcProvider: BwcProvider,
+ private modalCtrl: ModalController,
+ private persistenceProvider: PersistenceProvider,
+ private errorsProvider: ErrorsProvider,
+ private router: Router,
+ private appProvider: AppProvider
+ ) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ if (_.isEmpty(this.navParamsData) && this.navParams && !_.isEmpty(this.navParams.data)) this.navParamsData = this.navParams.data;
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
+
+ this.okText = this.translate.instant('Ok');
+ this.cancelText = this.translate.instant('Cancel');
+ this.isShared = this.navParamsData.isShared;
+ this.coin = this.navParamsData.coin;
+ this.coinName = this.currencyProvider.getCoinName(this.coin);
+ this.keyId = this.navParamsData.keyId;
+ this.defaults = this.configProvider.getDefaults();
+ this.multisigAddresses = [];
+ this.tc = this.isShared ? this.defaults.wallet.totalCopayers : 1;
+ this.copayers = _.range(2, this.defaults.limits.totalCopayers + 1);
+ this.derivationPathByDefault = this.getDerivationPathByDefault();
+ this.derivationPathForTestnet = this.bwcProvider
+ .getCore()
+ .Deriver.pathFor(this.coin, 'testnet');
+ this.showAdvOpts = false;
+ const walletName =
+ this.currencyProvider.getCoinName(this.coin) +
+ (this.isShared ? ' Multisig' : '');
+ this.createForm = this.fb.group({
+ walletName: [walletName, Validators.required],
+ myName: [null],
+ totalCopayers: [1],
+ requiredCopayers: [1],
+ bwsURL: [this.defaults.bws.url],
+ selectedSeed: ['new'],
+ recoveryPhrase: [null],
+ derivationPath: [this.derivationPathByDefault],
+ testnetEnabled: [false],
+ useNativeSegwit: [false],
+ singleAddress: [false],
+ coin: [null, Validators.required]
+ });
+ this.createForm.controls['coin'].setValue(this.coin);
+
+ if (this.coin === 'ltc')
+ this.createForm.controls['useNativeSegwit'].setValue(true);
+
+ this.showKeyOnboarding = this.navParamsData.showKeyOnboarding;
+
+ this.setTotalCopayers(this.tc);
+ this.updateRCSelect(this.tc);
+ this.updateSeedSourceSelect();
+ }
+
+ ngOnInit() {
+ if (this.isShared) {
+ if (this.coin.toLowerCase() == 'eth') {
+ this.showPairedWalletSelector();
+ } else {
+ this.createForm.get('myName').setValidators([Validators.required]);
+ }
+ }
+ }
+
+ async handleScrolling(event) {
+ if (event.detail.currentY > 0) {
+ this.isScroll = true;
+ }
+ else {
+ this.isScroll = false;
+ }
+ }
+
+ public setTotalCopayers(n: number): void {
+ this.createForm.controls['totalCopayers'].setValue(n);
+ }
+
+ private updateRCSelect(n: number): void {
+ const maxReq = this.COPAYER_PAIR_LIMITS[n];
+ this.signatures = _.range(1, maxReq + 1);
+ this.createForm.controls['requiredCopayers'].setValue(
+ Math.min(Math.trunc(n / 2 + 1), maxReq)
+ );
+ }
+
+ public isSingleAddress() {
+ return this.currencyProvider.isSingleAddress(this.coin);
+ }
+
+ private updateSeedSourceSelect(): void {
+ this.seedOptions = [
+ {
+ id: 'new',
+ label: this.translate.instant('Random'),
+ supportsTestnet: true
+ },
+ {
+ id: 'set',
+ label: this.translate.instant('Specify Recovery Phrase'),
+ supportsTestnet: false
+ }
+ ];
+ this.createForm.controls['selectedSeed'].setValue(this.seedOptions[0].id); // new or set
+ }
+
+ public seedOptionsChange(seed): void {
+ if (seed === 'set') {
+ this.createForm
+ .get('recoveryPhrase')
+ .setValidators([Validators.required]);
+ } else {
+ this.createForm.get('recoveryPhrase').setValidators(null);
+ }
+ this.createForm.controls['selectedSeed'].setValue(seed); // new or set
+ if (this.createForm.controls['testnet'])
+ this.createForm.controls['testnet'].setValue(false);
+ if (this.createForm.controls['useNativeSegwit'])
+ this.createForm.controls['useNativeSegwit'].setValue(false);
+ this.createForm.controls['derivationPath'].setValue(
+ this.derivationPathByDefault
+ );
+ this.createForm.controls['recoveryPhrase'].setValue(null);
+ }
+
+ public setDerivationPath(): void {
+ const path: string = this.createForm.value.testnet
+ ? this.derivationPathForTestnet
+ : this.derivationPathByDefault;
+ this.createForm.controls['derivationPath'].setValue(path);
+ }
+
+ public setOptsAndCreate(): void {
+ const opts: Partial = {
+ keyId: this.keyId,
+ name: this.createForm.value.walletName,
+ m: this.createForm.value.requiredCopayers,
+ n: this.createForm.value.totalCopayers,
+ myName:
+ this.createForm.value.totalCopayers > 1
+ ? this.createForm.value.myName
+ : null,
+ networkName: this.createForm.value.testnetEnabled ? 'testnet' : 'livenet',
+ useNativeSegwit: this.createForm.value.useNativeSegwit,
+ bwsurl: this.createForm.value.bwsURL,
+ singleAddress: this.currencyProvider.isSingleAddress(
+ this.createForm.value.coin
+ )
+ ? true
+ : this.createForm.value.singleAddress,
+ coin: this.createForm.value.coin
+ };
+
+ const setSeed = this.createForm.value.selectedSeed == 'set';
+ opts['setSeed'] = setSeed;
+ if (setSeed) {
+ const words = this.createForm.value.recoveryPhrase || '';
+ if (
+ words.indexOf(' ') == -1 &&
+ words.indexOf('prv') == 1 &&
+ words.length > 108
+ ) {
+ opts.extendedPrivateKey = words;
+ } else {
+ opts.mnemonic = words;
+ }
+
+ const derivationPath = this.createForm.value.derivationPath;
+ opts.networkName = this.derivationPathHelperProvider.getNetworkName(
+ derivationPath
+ );
+ opts.derivationStrategy = this.derivationPathHelperProvider.getDerivationStrategy(
+ derivationPath
+ );
+ opts.account = this.derivationPathHelperProvider.getAccount(
+ derivationPath
+ );
+
+ // set opts.useLegacyPurpose
+ if (
+ this.derivationPathHelperProvider.parsePath(
+ this.createForm.value.derivationPath
+ ).purpose == "44'" &&
+ opts.n > 1
+ ) {
+ opts.useLegacyPurpose = true;
+ this.logger.debug('Using 44 for Multisig');
+ }
+
+ // set opts.useLegacyCoinType
+ if (
+ this.coin == 'bch' &&
+ this.derivationPathHelperProvider.parsePath(
+ this.createForm.value.derivationPath
+ ).coinCode == "0'"
+ ) {
+ opts.useLegacyCoinType = true;
+ this.logger.debug('Using 0 for BCH creation');
+ }
+
+ if (
+ !opts.networkName ||
+ !opts.derivationStrategy ||
+ !Number.isInteger(opts.account)
+ ) {
+ const title = this.translate.instant('Error');
+ const subtitle = this.translate.instant('Invalid derivation path');
+ this.errorsProvider.showDefaultError(subtitle, title);
+ return;
+ }
+ }
+
+ if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
+ const title = this.translate.instant('Error');
+ const subtitle = this.translate.instant(
+ 'Please enter the account recovery phrase'
+ );
+ this.errorsProvider.showDefaultError(subtitle, title);
+ return;
+ }
+
+ if (
+ !this.derivationPathHelperProvider.isValidDerivationPathCoin(
+ this.createForm.value.derivationPath,
+ this.coin
+ )
+ ) {
+ const title = this.translate.instant('Error');
+ const subtitle = this.translate.instant(
+ 'Invalid derivation path for selected coin'
+ );
+ this.errorsProvider.showDefaultError(subtitle, title);
+ return;
+ }
+
+ if (this.showKeyOnboarding) {
+ this.showKeyOnboardingSlides(opts);
+ } else {
+ this.create(opts);
+ this.showSliderCaptcha(opts);
+ }
+ }
+
+ async showSliderCaptcha(opts) {
+ let modal = await this.modalCtrl.create({
+ component: SliderCaptchaComponent
+ });
+ const data = await modal.onDidDismiss();
+ if (data === 'success') {
+ this.create(opts);
+ }
+ await modal.present();
+ }
+
+ async showKeyOnboardingSlides(opts) {
+ this.logger.debug('Showing key onboarding');
+ const modal = await this.modalCtrl.create({
+ component: KeyOnboardingPage,
+ componentProps: null,
+ showBackdrop: false,
+ backdropDismiss: false
+ });
+ await modal.present();
+ const data = await modal.onDidDismiss();
+ if (data) this.create(opts);
+ this.persistenceProvider.setKeyOnboardingFlag();
+ }
+
+ private create(opts): void {
+ this.onGoingProcessProvider.set('creatingWallet');
+ opts['keyId'] = this.keyId;
+ opts['isSlpToken'] = this.isSlpToken;
+ this.profileProvider
+ .createWallet(opts)
+ .then(wallet => {
+ this.onGoingProcessProvider.clear();
+ this.walletProvider.updateRemotePreferences(wallet);
+ this.pushNotificationsProvider.updateSubscription(wallet);
+ if (this.createForm.value.selectedSeed == 'set') {
+ this.profileProvider.setBackupGroupFlag(wallet.credentials.keyId);
+ this.profileProvider.setWalletBackup(wallet.credentials.walletId);
+ }
+ if (!opts['setSeed'] && !this.keyId) {
+ this.router.navigate(['/recovery-key'], {
+ state: {
+ keyId: wallet.keyId,
+ isOnboardingFlow: false,
+ hideBackButton: true,
+ walletId: wallet.credentials.walletId,
+ isNewSharedWallet: this.isShared
+ }
+ });
+ } else {
+ this.router.navigate(['']).then(() => {
+ this.events.publish('Local/FetchWallets');
+ setTimeout(() => {
+ if (wallet.isComplete()) {
+ this.router.navigate(['/wallet-details'], {
+ state: { walletId: wallet.credentials.walletId }
+ });
+ } else {
+ const copayerModal = this.modalCtrl.create({
+ component: CopayersPage,
+ componentProps: {
+ walletId: wallet.credentials.walletId
+ },
+ cssClass: 'wallet-details-modal'
+
+ }).then(rs => {
+ rs.present();
+ });
+
+ }
+ }, 1000);
+ });
+ }
+ })
+ .catch(err => {
+ this.onGoingProcessProvider.clear();
+ if (
+ err &&
+ err.message != 'FINGERPRINT_CANCELLED' &&
+ err.message != 'PASSWORD_CANCELLED'
+ ) {
+ this.logger.error('Create: could not create wallet', err);
+ if (err.message === 'WRONG_PASSWORD') {
+ this.errorsProvider.showWrongEncryptPasswordError();
+ } else {
+ const title = this.translate.instant('Error');
+ err = this.bwcErrorProvider.msg(err);
+ this.errorsProvider.showDefaultError(err, title);
+ }
+ }
+ return;
+ });
+ }
+
+ public openSupportSingleAddress(): void {
+ const url =
+ 'https://support.bitpay.com/hc/en-us/articles/360015920572-Setting-up-the-Single-Address-Feature-for-your-BitPay-Wallet';
+ const optIn = true;
+ const title = null;
+ const message = this.translate.instant('Read more in our support page');
+ const okText = this.translate.instant('Open');
+ const cancelText = this.translate.instant('Go Back');
+ this.externalLinkProvider.open(
+ url,
+ optIn,
+ title,
+ message,
+ okText,
+ cancelText
+ );
+ }
+
+ public set(type: string, number: number) {
+ switch (type) {
+ case 'requiredCopayers':
+ if (this.signatures.includes(number)) {
+ this.createForm.controls['requiredCopayers'].setValue(number);
+ }
+ break;
+
+ case 'totalCopayers':
+ if (this.copayers.includes(number)) {
+ if (this.createForm.controls['requiredCopayers'].value) {
+ if (number < (this.createForm.controls['requiredCopayers'].value as number)) {
+ break;
+ }
+ }
+ this.createForm.controls['totalCopayers'].setValue(number);
+ }
+ break;
+ }
+ }
+
+ public showPairedWalletSelector() {
+ this.isOpenSelector = true;
+ const eligibleWallets = this.keyId
+ ? this.profileProvider.getWalletsFromGroup({
+ keyId: this.keyId,
+ hasFunds: true,
+ coin: 'eth',
+ m: 1,
+ n: 1
+ })
+ : [];
+
+ const walletSelector = this.actionSheetProvider.createInfoSheet(
+ 'linkEthWallet',
+ {
+ wallets: eligibleWallets,
+ isEthMultisig: true
+ }
+ );
+ walletSelector.present();
+ walletSelector.onDidDismiss(pairedWallet => {
+ this.isOpenSelector = false;
+ if (!_.isEmpty(pairedWallet)) {
+ this.pairedWallet = pairedWallet;
+ this.createForm.controls['testnetEnabled'].setValue(
+ this.pairedWallet.network == 'testnet' ? true : false
+ );
+ }
+ });
+ }
+
+ private getDerivationPathByDefault(): string {
+ let derivationPathByDefault: string;
+
+ if (!this.isShared) {
+ derivationPathByDefault = this.bwcProvider
+ .getCore()
+ .Deriver.pathFor(this.coin, 'livenet');
+ } else {
+ switch (this.coin) {
+ case 'bch':
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigBCH;
+ break;
+ case 'doge':
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigDOGE;
+ break;
+ case 'xec':
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigXEC;
+ break;
+ case 'xpi':
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigXPI;
+ break;
+ default:
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigBTC;
+ }
+ }
+
+ return derivationPathByDefault;
+ }
+
+ public handleClickAdvanceOption() {
+ this.showAdvOpts = !this.showAdvOpts;
+ if (this.showAdvOpts) {
+ // this.content.scrollToBottom(300);
+ }
+ }
+
+ changeSlpPath(event) {
+ this.isSlpToken = event.detail.checked;
+ if (event.detail.checked) {
+ this.createForm.controls['walletName'].setValue(this.createForm.controls['walletName'].value + " - 1899");
+ this.createForm.controls['singleAddress'].setValue(true);
+ }
+ else {
+ this.createForm.controls['walletName'].setValue(this.createForm.controls['walletName'].value.replace("- 1899", ""));
+ }
+ }
+}
diff --git a/src/app/pages/add/import-wallet/import-wallet.html b/src/app/pages/add/import-wallet/import-wallet.html
new file mode 100644
index 00000000000..ad2e062d029
--- /dev/null
+++ b/src/app/pages/add/import-wallet/import-wallet.html
@@ -0,0 +1,127 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/add/import-wallet/import-wallet.scss b/src/app/pages/add/import-wallet/import-wallet.scss
new file mode 100644
index 00000000000..55175c1f176
--- /dev/null
+++ b/src/app/pages/add/import-wallet/import-wallet.scss
@@ -0,0 +1,235 @@
+page-import-wallet {
+ .custom-coin-modal{
+ .alert-wrapper{
+ background: linear-gradient(0deg, rgba(0, 101, 141, 0.11), rgba(0, 101, 141, 0.11)), #FAFAFB;
+ }
+ .alert-radio-group{
+ border-top: unset;
+ border-bottom: unset;
+ }
+ }
+ .remove-padding-bottom{
+ padding-bottom: 0px !important;
+ }
+
+ .file-ion-list-custom{
+ background: transparent;
+ ion-item{
+ --padding-start: 0;
+ --background: transparent;
+ border: 2px solid rgba(0, 30, 46, 0.38);
+ --inner-padding-start: 1rem;
+ margin: 0;
+ --background: transparent !important;
+ }
+ mat-form-field{
+ margin-top: 2rem;
+ }
+ }
+ .final-list-custom{
+ border-radius: 24px;
+ margin-bottom: 1rem;
+ }
+
+ .advance-button{
+ width: 100%;
+ --box-shadow: unset;
+ --background-activated: unset;
+ --background: #FAFAFB;
+ margin: 0px;
+ margin-top: 32px;
+ --border-radius: 8px;
+ --padding-top: 16px;
+ --padding-bottom: 16px;
+ --padding-start: 16px;
+ padding: 0 1rem;
+ span{
+ text-align:left;
+ width:100%;
+ font-size: 16px;
+ font-weight: 600;
+ color: #001E2E;
+ }
+ ion-icon{
+ width: 12px;
+ }
+ }
+ .open-advance{
+ --border-radius: 8px 8px 0px 0px;
+ }
+ .show-advance-option{
+ margin: 0px 16px;
+ border-radius: 0px 0px 8px 8px;
+ background: #FAFAFB;
+ padding-bottom: 1rem;
+ margin-bottom: 9rem;
+
+ ion-list{
+ background: #FAFAFB;
+ &.account-service-list {
+ padding-top: 1rem !important;
+ }
+ ion-item{
+ --padding-start: 0;
+ --padding-end: 0;
+ --inner-padding-end: 0;
+ --background: #FAFAFB;
+ margin: 0 1rem;
+ ion-label {
+ font-weight: 400;
+ font-size: 16px !important;
+ line-height: 24px;
+ letter-spacing: 0.5px;
+ }
+ &.item-select {
+ border: 2px solid #9BA6AD;
+ margin: 0 1rem;
+ margin-top: 2rem;
+ --padding-start: 10px;
+ --padding-end: 10px;
+ --inner-padding-end: 0;
+ border-radius: 4px;
+ }
+ &.shared-account-item {
+ margin: 0 1rem;
+ margin-top: 1rem;
+ }
+ &.token-path-item {
+ margin-top: 2rem;
+ }
+ }
+ .derivation-item {
+ margin-top: 2rem;
+ }
+ }
+ }
+
+ .text-area-ion-item-custom{
+ border: 2px solid #70818A;
+ --background: transparent;
+ margin: 0 1rem;
+ margin-bottom: 30px;
+ --inner-padding-top: 1rem;
+ }
+ .import-part-custom{
+ padding: 0 1rem;
+ ion-segment{
+ padding-bottom: 2rem;
+ ion-segment-button{
+ min-width: 200px;
+ text-transform: capitalize;
+ font-weight: 600;
+ font-size: 16px;
+ line-height: 24px;
+ letter-spacing: 0.1px;
+ &::part(native){
+ color: #001E2E;
+ }
+ &::part(indicator-background){
+ background: #00658D;
+ }
+ }
+ }
+ }
+ .assertive {
+ color: var(--color-danger);
+ ion-label {
+ white-space: inherit;
+ }
+ }
+
+ .hide-validation {
+ border-bottom-color: #f4f4f4 !important;
+ box-shadow: none !important;
+ }
+ .scanner-icon {
+ z-index: 99;
+ font-size: 28px;
+ color: var(--color-primary);
+ padding-top: 2rem;
+ }
+ .upload-hidden {
+ opacity: 0;
+ height: 120px;
+ z-index: 1;
+ & > input {
+ height: 120px;
+ margin: 0;
+ cursor: pointer;
+ }
+ }
+ .ng-invalid + .upload-ui > .filled-message,
+ .ng-valid + .upload-ui > .empty-message {
+ display: none;
+ }
+ .upload-ui {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 3px;
+ position: absolute;
+ padding: 18px 1em;
+ width: 92%;
+ top: 0;
+ left: 0;
+ margin: 2rem 4%;
+ // height: $upload-box-height - 40px;
+ color: #999;
+ font-weight: bold;
+ text-align: center;
+ font-size: 16px;
+ line-height: 1.4;
+ border: 3px dashed #ddd;
+ color: #999;
+ font-style: italic;
+ }
+
+ .item-interactive.ion-valid {
+ --highlight-background: var(--ion-color-primary) !important;
+ }
+ .custom-option {
+ padding-left: 10;
+ }
+
+ ion-segment-button {
+ font-size: 12px;
+ opacity: 0.5;
+ &.segment-button-checked {
+ opacity: 1;
+ }
+ &::part(native) {
+ color: var(--ion-color-primary);
+ }
+ }
+
+ .hide-border{
+ border: none !important;
+ }
+
+ .line-divider {
+ margin: 0 1rem;
+ }
+
+ .line-divider-inside-top{
+ margin: 1rem;
+ margin-bottom: 0;
+ }
+
+ .line-divider-inside-bottom{
+ margin: 1rem;
+ margin-top: 0;
+ }
+
+ .item-margin-top {
+ margin-top: 2rem;
+ }
+
+ mat-hint {
+ display: flex;
+ }
+
+ .mat-form-field-suffix {
+ align-self: flex-start;
+ margin-top: 1.5rem;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/add/import-wallet/import-wallet.ts b/src/app/pages/add/import-wallet/import-wallet.ts
similarity index 75%
rename from src/pages/add/import-wallet/import-wallet.ts
rename to src/app/pages/add/import-wallet/import-wallet.ts
index bd5d1736644..2ed1e102b11 100644
--- a/src/pages/add/import-wallet/import-wallet.ts
+++ b/src/app/pages/add/import-wallet/import-wallet.ts
@@ -1,17 +1,9 @@
-import { Component } from '@angular/core';
+import { Component, ElementRef, OnChanges, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { TranslateService } from '@ngx-translate/core';
-import {
- Events,
- ModalController,
- NavController,
- NavParams
-} from 'ionic-angular';
// Pages
import { CoinSelectorPage } from '../../includes/coin-selector/coin-selector';
-import { DisclaimerPage } from '../../onboarding/disclaimer/disclaimer';
-import { ScanPage } from '../../scan/scan';
// Providers
import { ActionSheetProvider } from '../../../providers/action-sheet/action-sheet';
@@ -30,10 +22,17 @@ import {
WalletOptions,
WalletProvider
} from '../../../providers/wallet/wallet';
-
+import { ModalController, NavController, NavParams } from '@ionic/angular';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { Router } from '@angular/router';
+import _ from 'lodash';
+import { DisclaimerModal } from '../../includes/disclaimer-modal/disclaimer-modal';
+import { AppProvider } from 'src/app/providers';
@Component({
selector: 'page-import-wallet',
- templateUrl: 'import-wallet.html'
+ templateUrl: 'import-wallet.html',
+ styleUrls: ['import-wallet.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class ImportWalletPage {
private reader: FileReader;
@@ -55,6 +54,14 @@ export class ImportWalletPage {
public showAdvOpts: boolean;
public title: string;
public isOnboardingFlow: boolean;
+ public isShoweTokenPath: boolean;
+ public isSlpToken = false;
+ public prevCoin: string;
+ public currentTheme: string;
+
+ navParamsData;
+
+ @ViewChild('textarea', { static: false }) textarea: ElementRef;
constructor(
private navCtrl: NavController,
@@ -69,14 +76,24 @@ export class ImportWalletPage {
private onGoingProcessProvider: OnGoingProcessProvider,
private profileProvider: ProfileProvider,
private translate: TranslateService,
- private events: Events,
+ private events: EventManagerService,
private pushNotificationsProvider: PushNotificationsProvider,
private actionSheetProvider: ActionSheetProvider,
- private derivationPathHelperProvider: DerivationPathHelperProvider,
+ public derivationPathHelperProvider: DerivationPathHelperProvider,
private modalCtrl: ModalController,
private bwcErrorProvider: BwcErrorProvider,
- private errorsProvider: ErrorsProvider
+ private errorsProvider: ErrorsProvider,
+ private router: Router,
+ private appProvider: AppProvider
) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state
+ ? this.router.getCurrentNavigation().extras.state
+ : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
this.okText = this.translate.instant('Ok');
this.cancelText = this.translate.instant('Cancel');
this.reader = new FileReader();
@@ -88,14 +105,14 @@ export class ImportWalletPage {
this.showAdvOpts = false;
this.availableCoins = this.currencyProvider.getAvailableChains();
- this.code = this.navParams.data.code;
+ this.code = this.navParamsData?.code;
this.processedInfo = this.processWalletInfo(this.code);
- this.isOnboardingFlow = this.navParams.data.isOnboardingFlow;
+ this.isOnboardingFlow = this.navParamsData?.isOnboardingFlow;
- this.keyId = this.navParams.data.keyId; // re-import option
+ this.keyId = this.navParamsData?.keyId; // re-import option
this.title = !this.keyId
- ? this.translate.instant('Import Wallet')
- : this.translate.instant('Re-Import Wallets');
+ ? this.translate.instant('Import Key')
+ : this.translate.instant('Re-Import Keys');
this.formFile = null;
this.importForm = this.form.group({
@@ -108,23 +125,27 @@ export class ImportWalletPage {
coin: ['btc'],
derivationPath: [this.derivationPathHelperProvider.defaultBTC],
bwsURL: [this.defaults.bws.url],
- isMultisig: [false]
+ isMultisig: [false],
+ isSlpToken: [false]
});
this.events.subscribe('Local/BackupScan', this.updateWordsHandler);
this.setForm();
}
ionViewWillEnter() {
- const previousView = this.navCtrl.getPrevious();
- if (this.isOnboardingFlow && previousView.name === 'LockMethodPage') {
- this.navCtrl.removeView(previousView);
- }
+ this.importForm.controls['words'].reset();
}
ngOnDestroy() {
this.events.unsubscribe('Local/BackupScan', this.updateWordsHandler);
}
+ ngAfterViewInit(){
+ setTimeout(() => {
+ this.textarea.nativeElement.focus();
+ }, 300);
+ }
+
private setForm(): void {
if (this.processedInfo) {
this.importForm.controls['words'].setValue(this.processedInfo.data);
@@ -136,9 +157,13 @@ export class ImportWalletPage {
this.setForm();
};
- public getCoinName(coin: Coin) {
+ public getCoinName(coin: Coin | any) {
return this.currencyProvider.getCoinName(coin);
}
+
+ public handleClickAdvanceOption() {
+ this.showAdvOpts = !this.showAdvOpts;
+ }
public selectTab(tab: string): void {
this.selectedTab = tab;
@@ -258,16 +283,45 @@ export class ImportWalletPage {
await new Promise(resolve => setTimeout(resolve, 1000));
this.profileProvider.setNewWalletGroupOrder(wallets[0].credentials.keyId);
}
+ this.profileProvider.isDisclaimerAccepted().then(async onboardingState => {
+ if (onboardingState === 'UNFINISHEDONBOARDING') {
+ const modal = await this.modalCtrl.create({
+ component: DisclaimerModal,
+ backdropDismiss: false,
+ cssClass: 'fixscreen-modal'
+ });
+ await modal.present();
+ modal.onDidDismiss().then(({ data }) => {
+ if (data.isConfirm) {
+ this.goToHomePage(wallets[0].credentials.keyId);
+ }
+ });
+ } else {
+ this.goToHomePage(wallets[0].credentials.keyId);
+ }
+ });
+ }
- if (!this.isOnboardingFlow)
- this.navCtrl.popToRoot().then(() => {
+ private goToHomePage(keyId) {
+ this.router
+ .navigate([''], {
+ state: {
+ keyId: keyId
+ },
+ replaceUrl: true
+ })
+ .then(data => {
this.events.publish('Local/FetchWallets');
});
- else {
- this.navCtrl.push(DisclaimerPage, {
- keyId: wallets[0].credentials.keyId
+ }
+
+ private goToWalletsPage() {
+ this.router
+ .navigate(['tabs/wallets'])
+ .then(() => {
+ this.events.publish('Local/FetchWallets');
+ // this.events.publish('Local/GetData', true);
});
- }
}
private importExtendedPrivateKey(xPrivKey, opts) {
@@ -284,6 +338,7 @@ export class ImportWalletPage {
}
private importWithDerivationPath(opts): void {
+ opts.isSlpToken = this.isSlpToken;
this.onGoingProcessProvider.set('importingWallet');
this.profileProvider
.importWithDerivationPath(opts)
@@ -315,7 +370,7 @@ export class ImportWalletPage {
'import-no-wallet-warning'
);
noWalletWarningInfoSheet.present();
- noWalletWarningInfoSheet.onDidDismiss(option => {
+ noWalletWarningInfoSheet.onDidDismiss(async option => {
if (option || typeof option === 'undefined') {
// Go back
this.logger.debug('Go back clicked');
@@ -324,24 +379,23 @@ export class ImportWalletPage {
this.logger.debug('Continue anyway clicked');
if (this.importForm.value.derivationPathEnabled) {
- this.setOptsAndCreate(this.importForm.value.coin);
+ this.setOptsAndCreate(this.importForm.value.coin, this.importForm.value.isSlpToken);
} else {
- const modal = this.modalCtrl.create(
- CoinSelectorPage,
- {
+ const modal = await this.modalCtrl.create({
+ component: CoinSelectorPage,
+ componentProps: {
description: this.translate.instant(
- 'Please select the coin of the wallet to import:'
+ 'Please select the coin of the account to import:'
)
},
- {
- enableBackdropDismiss: false,
- cssClass: 'fullscreen-modal'
- }
- );
- modal.present({ animate: false });
- modal.onDidDismiss(data => {
+
+ backdropDismiss: false,
+ cssClass: 'fullscreen-modal'
+ });
+ await modal.present();
+ modal.onDidDismiss().then(({ data }) => {
if (data.selectedCoin) {
- this.setOptsAndCreate(data.selectedCoin);
+ this.setOptsAndCreate(data.selectedCoin, this.importForm.value.isSlpToken);
}
});
}
@@ -355,7 +409,7 @@ export class ImportWalletPage {
return;
}
- public setOptsAndCreate(coin: Coin): void {
+ public setOptsAndCreate(coin: Coin, isSlpToken: boolean): void {
const opts: Partial = {
keyId: undefined,
name: this.currencyProvider.getCoinName(coin),
@@ -364,8 +418,9 @@ export class ImportWalletPage {
myName: null,
networkName: 'livenet',
bwsurl: this.importForm.value.bwsURL,
- singleAddress: this.currencyProvider.isSingleAddress(coin),
- coin: Coin[coin.toUpperCase()]
+ singleAddress: isSlpToken ? true : this.currencyProvider.isSingleAddress(coin),
+ coin: Coin[coin.toUpperCase()],
+ isSlpToken: isSlpToken
};
const words = this.importForm.value.words;
@@ -384,9 +439,8 @@ export class ImportWalletPage {
derivationPath = this.importForm.value.derivationPath;
} else {
if (this.derivationPathHelperProvider[`default${coin.toUpperCase()}`]) {
- derivationPath = this.derivationPathHelperProvider[
- `default${coin.toUpperCase()}`
- ];
+ derivationPath =
+ this.derivationPathHelperProvider[`default${coin.toUpperCase()}`];
} else {
const title = this.translate.instant('Error');
const subtitle = `No derivation path for: default${coin.toUpperCase()}`;
@@ -394,12 +448,10 @@ export class ImportWalletPage {
return;
}
}
- opts.networkName = this.derivationPathHelperProvider.getNetworkName(
- derivationPath
- );
- opts.derivationStrategy = this.derivationPathHelperProvider.getDerivationStrategy(
- derivationPath
- );
+ opts.networkName =
+ this.derivationPathHelperProvider.getNetworkName(derivationPath);
+ opts.derivationStrategy =
+ this.derivationPathHelperProvider.getDerivationStrategy(derivationPath);
opts.account = this.derivationPathHelperProvider.getAccount(derivationPath);
// set opts.useLegacyPurpose
@@ -436,7 +488,7 @@ export class ImportWalletPage {
if (!opts.mnemonic && !opts.extendedPrivateKey) {
const title = this.translate.instant('Error');
const subtitle = this.translate.instant(
- 'Please enter the wallet recovery phrase'
+ 'Please enter the account recovery phrase'
);
this.showErrorInfoSheet(title, subtitle);
return;
@@ -455,11 +507,35 @@ export class ImportWalletPage {
this.showErrorInfoSheet(title, subtitle);
return;
}
- this.createSpecifyingWords(opts);
+ if ((coin == 'xec' || coin == 'xpi') && !this.importForm.value.derivationPathEnabled) {
+ this.createWalletTokensSpecifyingWords(opts);
+ } else {
+ this.createSpecifyingWords(opts);
+ }
+ }
+
+ private createWalletTokensSpecifyingWords(opts): void {
+ this.logger.debug('Creating from import');
+ opts.isImport = true;
+ this.onGoingProcessProvider.set('creatingWallet');
+ this.profileProvider
+ .createTokenWallets(opts)
+ .then(wallet => {
+ this.onGoingProcessProvider.clear();
+ if (wallet) this.finish([].concat(wallet));
+ })
+ .catch(err => {
+ this.onGoingProcessProvider.clear();
+ this.logger.error('Create: could not create wallet', err);
+ const title = this.translate.instant('Error');
+ err = this.bwcErrorProvider.msg(err);
+ this.showErrorInfoSheet(title, err);
+ });
}
private createSpecifyingWords(opts): void {
this.logger.debug('Creating from import');
+ opts.isImport = true;
this.onGoingProcessProvider.set('creatingWallet');
this.profileProvider
.createWallet(opts)
@@ -529,15 +605,12 @@ export class ImportWalletPage {
if (this.importForm.value.derivationPathEnabled) {
const derivationPath = this.importForm.value.derivationPath;
- opts.networkName = this.derivationPathHelperProvider.getNetworkName(
- derivationPath
- );
- opts.derivationStrategy = this.derivationPathHelperProvider.getDerivationStrategy(
- derivationPath
- );
- opts.account = this.derivationPathHelperProvider.getAccount(
- derivationPath
- );
+ opts.networkName =
+ this.derivationPathHelperProvider.getNetworkName(derivationPath);
+ opts.derivationStrategy =
+ this.derivationPathHelperProvider.getDerivationStrategy(derivationPath);
+ opts.account =
+ this.derivationPathHelperProvider.getAccount(derivationPath);
/* TODO: opts.n is just used to determinate if the wallet is multisig (m/48'/xx) or single sig (m/44')
we should change the name to 'isMultisig'.
@@ -659,12 +732,27 @@ export class ImportWalletPage {
};
}
- public setDerivationPath(coin: string) {
+ public setDerivationPath(event) {
+ const coin = event ? event.detail.value : this.prevCoin;
+ this.prevCoin = coin;
+ this.isShoweTokenPath = coin.toUpperCase() === 'XPI' || coin.toUpperCase() === 'XEC';
const defaultCoin = `default${coin.toUpperCase()}`;
const derivationPath = this.derivationPathHelperProvider[defaultCoin];
this.importForm.controls['derivationPath'].setValue(derivationPath);
}
+ public setDerivationPathForXpiSlpToken(event) {
+ this.isSlpToken = event.detail.checked;
+ const defaultCoin = this.isSlpToken
+ ? 'defaultSlpToken'
+ : `default${this.prevCoin.toUpperCase()}`;
+ const derivationPath = this.derivationPathHelperProvider[defaultCoin];
+ this.importForm.controls['derivationPath'].setValue(derivationPath);
+ if (this.isSlpToken) {
+ this.importForm.controls['isSlpToken'].setValue(true)
+ }
+ }
+
public changeDerivationPathValidators() {
if (this.importForm.value.derivationPathEnabled) {
this.importForm
@@ -679,7 +767,7 @@ export class ImportWalletPage {
}
public openScanner(): void {
- this.navCtrl.push(ScanPage, { fromImport: true });
+ this.router.navigate(['/scan'], { state: { fromImport: true } });
}
private showErrorInfoSheet(title: string, msg: string): void {
diff --git a/src/app/pages/add/join-wallet/join-wallet.html b/src/app/pages/add/join-wallet/join-wallet.html
new file mode 100644
index 00000000000..ad668625f98
--- /dev/null
+++ b/src/app/pages/add/join-wallet/join-wallet.html
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'Join Shared Account' | translate}}
+
+
+
+
+
+
+
+
+
+
+ Save & Continue
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/add/join-wallet/join-wallet.scss b/src/app/pages/add/join-wallet/join-wallet.scss
new file mode 100644
index 00000000000..3651cf43abb
--- /dev/null
+++ b/src/app/pages/add/join-wallet/join-wallet.scss
@@ -0,0 +1,110 @@
+page-join-wallet {
+ .line-divider {
+ margin: 0 !important;
+ border: none !important;
+ border-bottom: 0.5px solid #dae0e5 !important;
+ }
+ .mat-form-field {
+ padding: unset !important;
+ }
+ .toolbar-title {
+ color: #edeff0;
+ }
+ form {
+ margin: 18px;
+ margin-bottom: 120px;
+ .wallet-info-container {
+ background: #fafafb;
+ padding: 23px 1rem 36px 1rem;
+ border-radius: 12px;
+ .wallet-invitation-mat-form-field {
+ margin-top: 43px;
+ }
+ }
+ ion-item {
+ margin-left: 0px;
+ }
+ .advance-button {
+ width: 100%;
+ --background: #fafafb;
+ --background-activated: none;
+ color: #001e2e;
+ margin: 0px;
+ margin-top: 32px;
+ --border-radius: 8px;
+ --padding-top: 16px;
+ --padding-bottom: 16px;
+ --padding-start: 16px;
+ --box-shadow: none !important;
+ span {
+ text-align: left;
+ width: 100%;
+ font-size: 16px;
+ font-weight: 600;
+ }
+ ion-icon {
+ width: 12px;
+ }
+ }
+ .open-advance {
+ --border-radius: 8px 8px 0px 0px;
+ }
+ .show-advance-option {
+ padding: 0px 16px;
+ background: #fafafb;
+ border-radius: 0px 0px 8px 8px;
+
+ ion-item {
+ padding-top: 23px;
+ }
+ .wallet-key-ion-item {
+ --background: transparent;
+ --padding-start: 0;
+ padding-bottom: 28px;
+ }
+ .wallet-service-url-mat-form-field {
+ padding-top: 23px !important;
+ }
+ .mat-form-field {
+ padding-bottom: 28px !important;
+ }
+ }
+ }
+
+ .scanner-icon {
+ z-index: 99;
+ font-size: 20px;
+ color: var(--color-primary);
+ padding-left: 10px;
+ padding-bottom: 5px;
+ }
+ .erase-icon {
+ padding-bottom: 3px;
+ padding-left: 5px;
+ }
+
+ .check {
+ font-size: 22px;
+ display: flex;
+ height: 100%;
+ width: 22px;
+ height: 22px;
+ padding-left: 10px;
+ padding-bottom: 4px;
+ &.success {
+ color: var(--color-success);
+ }
+ &.fail {
+ color: var(--color-danger);
+ }
+ }
+
+ .linked-wallet {
+ .item-inner {
+ border-bottom: 0px !important;
+ }
+ }
+ .last-item {
+ margin-left: auto !important;
+ }
+}
diff --git a/src/app/pages/add/join-wallet/join-wallet.ts b/src/app/pages/add/join-wallet/join-wallet.ts
new file mode 100644
index 00000000000..fa1b9f6090f
--- /dev/null
+++ b/src/app/pages/add/join-wallet/join-wallet.ts
@@ -0,0 +1,432 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+
+import * as _ from 'lodash';
+
+// Pages
+import { CopayersPage } from '../../add/copayers/copayers';
+
+// Providers
+import { ActionSheetProvider } from '../../../providers/action-sheet/action-sheet';
+import { BwcErrorProvider } from '../../../providers/bwc-error/bwc-error';
+import { BwcProvider } from '../../../providers/bwc/bwc';
+import { ClipboardProvider } from '../../../providers/clipboard/clipboard';
+import { ConfigProvider } from '../../../providers/config/config';
+import { Coin } from '../../../providers/currency/currency';
+import { DerivationPathHelperProvider } from '../../../providers/derivation-path-helper/derivation-path-helper';
+import { ErrorsProvider } from '../../../providers/errors/errors';
+import { Logger } from '../../../providers/logger/logger';
+import { OnGoingProcessProvider } from '../../../providers/on-going-process/on-going-process';
+import { PlatformProvider } from '../../../providers/platform/platform';
+import { ProfileProvider } from '../../../providers/profile/profile';
+import { PushNotificationsProvider } from '../../../providers/push-notifications/push-notifications';
+import {
+ WalletOptions,
+ WalletProvider
+} from '../../../providers/wallet/wallet';
+import { ModalController, NavController, NavParams } from '@ionic/angular';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { Router } from '@angular/router';
+import { AppProvider, ExternalLinkProvider } from 'src/app/providers';
+@Component({
+ selector: 'page-join-wallet',
+ templateUrl: 'join-wallet.html',
+ styleUrls: ['join-wallet.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class JoinWalletPage {
+ private defaults;
+ public isCordova: boolean;
+ public showAdvOpts: boolean;
+ public seedOptions;
+ public okText: string;
+ public cancelText: string;
+ public joinForm: FormGroup;
+ public keyId: string;
+ public coin: Coin;
+ public isOpenSelector: boolean;
+ public pairedWallet;
+ public currentTheme: string;
+ public isScroll = false;
+ private derivationPathByDefault: string;
+ private derivationPathForTestnet: string;
+ private regex: RegExp;
+ navParamsData;
+ constructor(
+ private bwcErrorProvider: BwcErrorProvider,
+ private bwcProvider: BwcProvider,
+ private configProvider: ConfigProvider,
+ private form: FormBuilder,
+ private navCtrl: NavController,
+ private navParams: NavParams,
+ private derivationPathHelperProvider: DerivationPathHelperProvider,
+ private onGoingProcessProvider: OnGoingProcessProvider,
+ private platformProvider: PlatformProvider,
+ private profileProvider: ProfileProvider,
+ private walletProvider: WalletProvider,
+ private logger: Logger,
+ private translate: TranslateService,
+ private events: EventManagerService,
+ private pushNotificationsProvider: PushNotificationsProvider,
+ private clipboardProvider: ClipboardProvider,
+ private modalCtrl: ModalController,
+ private errorsProvider: ErrorsProvider,
+ private actionSheetProvider: ActionSheetProvider,
+ private router: Router,
+ private externalLinkProvider: ExternalLinkProvider,
+ private appProvider: AppProvider
+ ) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ if (_.isEmpty(this.navParamsData) && this.navParams && !_.isEmpty(this.navParams.data)) this.navParamsData = this.navParams.data;
+
+ this.isCordova = this.platformProvider.isCordova;
+ this.okText = this.translate.instant('Ok');
+ this.cancelText = this.translate.instant('Cancel');
+ this.defaults = this.configProvider.getDefaults();
+ this.showAdvOpts = false;
+ this.keyId = this.navParamsData.keyId;
+ this.coin = this.navParamsData.coin;
+ this.regex = /^[0-9A-HJ-NP-Za-km-z]{70,80}$/; // For invitationCode
+ this.joinForm = this.form.group({
+ walletName: [null],
+ myName: [null],
+ invitationCode: [null], // invitationCode == secret
+ bwsURL: [this.defaults.bws.url],
+ selectedSeed: ['new'],
+ recoveryPhrase: [null],
+ derivationPath: [null]
+ });
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
+
+ this.joinForm.get('myName').setValidators([Validators.required]);
+ this.joinForm
+ .get('invitationCode')
+ .setValidators([Validators.required, Validators.pattern(this.regex)]);
+
+ this.seedOptions = [
+ {
+ id: 'new',
+ label: this.translate.instant('Random'),
+ supportsTestnet: true
+ },
+ {
+ id: 'set',
+ label: this.translate.instant('Specify Recovery Phrase'),
+ supportsTestnet: false
+ }
+ ];
+ this.events.subscribe('Local/JoinScan', this.updateCodeHandler);
+ }
+
+ async handleScrolling(event) {
+ if (event.detail.currentY > 0) {
+ this.isScroll = true;
+ }
+ else {
+ this.isScroll = false;
+ }
+ }
+
+ ngOnInit() {
+ this.logger.info('Loaded: JoinWalletPage');
+ }
+
+ ionViewWillEnter() {
+ if (this.navParamsData.url) {
+ let data: string = this.navParamsData.url;
+ data = data.replace('copay:', '');
+ this.onQrCodeScannedJoin(data);
+ }
+ if (this.coin.toLowerCase() == 'eth' && !this.pairedWallet) {
+ this.showPairedWalletSelector();
+ }
+ }
+
+ ngOnDestroy() {
+ this.events.unsubscribe('Local/JoinScan', this.updateCodeHandler);
+ }
+
+ public showPairedWalletSelector() {
+ this.isOpenSelector = true;
+ const eligibleWallets = this.keyId
+ ? this.profileProvider.getWalletsFromGroup({
+ keyId: this.keyId,
+ coin: 'eth',
+ m: 1,
+ n: 1
+ })
+ : [];
+
+ const walletSelector = this.actionSheetProvider.createInfoSheet(
+ 'linkEthWallet',
+ {
+ wallets: eligibleWallets,
+ isEthMultisig: true
+ }
+ );
+ walletSelector.present();
+ walletSelector.onDidDismiss(pairedWallet => {
+ this.isOpenSelector = false;
+ if (!_.isEmpty(pairedWallet)) {
+ this.pairedWallet = pairedWallet;
+ }
+ });
+ }
+
+ private updateCodeHandler: any = data => {
+ if (this.coin.toLowerCase() == 'eth') {
+ this.joinForm.controls['invitationCode'].setValue(data.value);
+ } else {
+ const invitationCode = data.value.replace('copay:', '');
+ this.onQrCodeScannedJoin(invitationCode);
+ }
+ };
+
+ public onQrCodeScannedJoin(data: string): void {
+ if (this.regex.test(data)) {
+ this.joinForm.controls['invitationCode'].setValue(data);
+ this.processInvitation(data);
+ } else {
+ this.errorsProvider.showDefaultError(
+ this.translate.instant('Invalid data'),
+ this.translate.instant('Error')
+ );
+ }
+ }
+
+ public seedOptionsChange(seed): void {
+ if (seed === 'set') {
+ this.joinForm.get('recoveryPhrase').setValidators([Validators.required]);
+ } else {
+ this.joinForm.get('recoveryPhrase').setValidators(null);
+ }
+ this.joinForm.controls['recoveryPhrase'].setValue(null);
+ this.joinForm.controls['selectedSeed'].setValue(seed);
+ this.processInvitation(this.joinForm.value.invitationCode);
+ }
+
+ private setDerivationPath(network: string): void {
+ const path: string =
+ network == 'testnet'
+ ? this.derivationPathForTestnet
+ : this.derivationPathByDefault;
+ this.joinForm.controls['derivationPath'].setValue(path);
+ }
+
+ public processInvitation(invitation: string): void {
+ if (this.regex.test(invitation)) {
+ this.logger.info('Processing invitation code...');
+ let walletData;
+ try {
+ walletData = this.bwcProvider.parseSecret(invitation);
+ this.coin = walletData.coin;
+ this.derivationPathForTestnet = this.derivationPathHelperProvider.defaultTestnet;
+ this.derivationPathByDefault = this.getDerivationPathByDefault();
+ this.setDerivationPath(walletData.network);
+ this.logger.info('Correct invitation code for ' + walletData.network);
+ } catch (ex) {
+ this.logger.warn('Error parsing invitation: ' + ex);
+ }
+ }
+ }
+
+ public cleanSearch(){
+ this.joinForm.controls['invitationCode'].setValue('');
+ }
+
+ private getDerivationPathByDefault(): string {
+ let derivationPathByDefault: string;
+ switch (this.coin) {
+ case 'bch':
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigBCH;
+ break;
+ case 'doge':
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigDOGE;
+ break;
+ case 'xec':
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigXEC;
+ break;
+ case 'xpi':
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigXPI;
+ break;
+ default:
+ derivationPathByDefault = this.derivationPathHelperProvider
+ .defaultMultisigBTC;
+ }
+
+ return derivationPathByDefault;
+ }
+
+ public async setOptsAndJoin() {
+
+ const opts: Partial = {
+ keyId: this.keyId,
+ secret: this.joinForm.value.invitationCode,
+ myName: this.joinForm.value.myName,
+ bwsurl: this.joinForm.value.bwsURL,
+ coin: this.coin
+ };
+
+ const setSeed = this.joinForm.value.selectedSeed == 'set';
+ opts['setSeed'] = setSeed;
+ if (setSeed) {
+ const words = this.joinForm.value.recoveryPhrase;
+ if (
+ words.indexOf(' ') == -1 &&
+ words.indexOf('prv') == 1 &&
+ words.length > 108
+ ) {
+ opts.extendedPrivateKey = words;
+ } else {
+ opts.mnemonic = words;
+ }
+
+ const derivationPath = this.joinForm.value.derivationPath;
+ opts.networkName = this.derivationPathHelperProvider.getNetworkName(
+ derivationPath
+ );
+ opts.derivationStrategy = this.derivationPathHelperProvider.getDerivationStrategy(
+ derivationPath
+ );
+ opts.account = this.derivationPathHelperProvider.getAccount(
+ derivationPath
+ );
+
+ // set opts.useLegacyPurpose
+ if (
+ this.derivationPathHelperProvider.parsePath(derivationPath).purpose ==
+ "44'"
+ ) {
+ opts.useLegacyPurpose = true;
+ this.logger.debug('Using 44 for Multisig');
+ }
+
+ // set opts.useLegacyCoinType
+ if (
+ this.coin == 'bch' &&
+ this.derivationPathHelperProvider.parsePath(derivationPath).coinCode ==
+ "0'"
+ ) {
+ opts.useLegacyCoinType = true;
+ this.logger.debug('Using 0 for BCH creation');
+ }
+
+ if (
+ !opts.networkName ||
+ !opts.derivationStrategy ||
+ !Number.isInteger(opts.account)
+ ) {
+ const title = this.translate.instant('Error');
+ const subtitle = this.translate.instant('Invalid derivation path');
+ this.errorsProvider.showDefaultError(subtitle, title);
+ return;
+ }
+
+ if (
+ !this.derivationPathHelperProvider.isValidDerivationPathCoin(
+ this.joinForm.value.derivationPath,
+ this.coin
+ )
+ ) {
+ const title = this.translate.instant('Error');
+ const subtitle = this.translate.instant(
+ 'Invalid derivation path for selected coin'
+ );
+ this.errorsProvider.showDefaultError(subtitle, title);
+ return;
+ }
+ }
+
+ if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
+ const title = this.translate.instant('Error');
+ const subtitle = this.translate.instant(
+ 'Please enter the account recovery phrase'
+ );
+ this.errorsProvider.showDefaultError(subtitle, title);
+ return;
+ }
+
+ const joinWarningSheet = this.actionSheetProvider.createInfoSheet(
+ 'join-wallet-warning'
+ );
+ joinWarningSheet.present();
+ joinWarningSheet.onDidDismiss(option => {
+ if (option) {
+ // TODO: update support page of AbcPay
+ this.externalLinkProvider.open(
+ 'https://support.bitpay.com/hc/en-us/articles/360032618692-What-is-a-Multisignature-Multisig-or-Shared-Wallet-'
+ );
+ } else {
+ this.join(opts);
+ }
+ });
+ }
+
+ private join(opts): void {
+ this.onGoingProcessProvider.set('joiningWallet');
+ opts['keyId'] = this.keyId;
+ this.profileProvider
+ .joinWallet(opts)
+ .then(wallet => {
+ this.clipboardProvider.clearClipboardIfValidData(['JoinWallet']);
+ this.onGoingProcessProvider.clear();
+ this.walletProvider.updateRemotePreferences(wallet);
+ this.pushNotificationsProvider.updateSubscription(wallet);
+ this.events.publish('Local/GetData', true);
+ if (!opts['setSeed'] && !this.keyId) {
+ this.router.navigate(['/recovery-key'], {
+ state: {
+ keyId: wallet.keyId,
+ isOnboardingFlow: false,
+ hideBackButton: true,
+ walletId: wallet.credentials.walletId,
+ isNewSharedWallet: true
+ }
+ });
+ }
+ else {
+ this.router.navigate(['']).then(() => {
+ setTimeout(() => {
+ if (wallet.isComplete()) {
+ this.router.navigate(['/wallet-details'], {
+ state: { walletId: wallet.credentials.walletId }
+ });
+ } else {
+ const copayerModal = this.modalCtrl.create({
+ component: CopayersPage,
+ componentProps: {
+ walletId: wallet.credentials.walletId
+ },
+ cssClass: 'wallet-details-modal'
+ }).then(rs => {
+ rs.present();
+ });
+ }
+ }, 1000);
+ });
+ }
+ })
+ .catch(err => {
+ this.onGoingProcessProvider.clear();
+ const title = this.translate.instant('Error');
+ this.errorsProvider.showDefaultError(
+ this.bwcErrorProvider.msg(err),
+ title
+ );
+ return;
+ });
+ }
+
+ public openScanner(): void {
+ this.router.navigate(['/scan'], { state: { fromJoin: true } });
+ }
+}
diff --git a/src/app/pages/add/select-currency/select-currency.html b/src/app/pages/add/select-currency/select-currency.html
new file mode 100644
index 00000000000..e037e99c5f4
--- /dev/null
+++ b/src/app/pages/add/select-currency/select-currency.html
@@ -0,0 +1,60 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/add/select-currency/select-currency.scss b/src/app/pages/add/select-currency/select-currency.scss
new file mode 100644
index 00000000000..ef9ae66a9d7
--- /dev/null
+++ b/src/app/pages/add/select-currency/select-currency.scss
@@ -0,0 +1,48 @@
+page-select-currency {
+ ion-content {
+ height: calc(100% - 200px) !important;
+ }
+
+ .list-button {
+ --padding-start: 1rem !important;
+ --padding-end: 1rem !important;
+ --inner-padding-top: 1rem;
+ --inner-padding-bottom: 1rem;
+ --inner-padding-end: 0;
+ padding: 0;
+ margin-top: 0 !important;
+
+ ion-icon {
+ margin: 0;
+ padding: 0;
+ margin-right: 1rem;
+ height: 40px;
+ width: 40px;
+ }
+
+ .item-title {
+ font-size: 18px;
+ font-weight: 500;
+ h3{
+ font-size: 16px;
+ font-weight: 600;
+ margin: 0;
+ }
+ span{
+ font-size: 14px;
+ font-weight: 400;
+ color: rgba(0, 30, 46, 0.6);
+ }
+ }
+
+ .item-note {
+ font-size: 12.5px;
+ padding-top: 4px;
+ color: lightgrey;
+ }
+ }
+
+ .list-subtitle {
+ padding-left: 20px;
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/add/select-currency/select-currency.ts b/src/app/pages/add/select-currency/select-currency.ts
new file mode 100644
index 00000000000..951423be54d
--- /dev/null
+++ b/src/app/pages/add/select-currency/select-currency.ts
@@ -0,0 +1,278 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import * as _ from 'lodash';
+
+import {
+ Coin,
+ CoinsMap,
+ CurrencyProvider
+} from '../../../providers/currency/currency';
+import { Token } from '../../../providers/currency/token';
+import { ActionSheetProvider } from 'src/app/providers/action-sheet/action-sheet';
+import { ModalController, NavParams } from '@ionic/angular';
+import { Logger } from 'src/app/providers/logger/logger';
+import { WalletProvider } from 'src/app/providers/wallet/wallet';
+import { OnGoingProcessProvider } from 'src/app/providers/on-going-process/on-going-process';
+import { ProfileProvider } from 'src/app/providers/profile/profile';
+import { PushNotificationsProvider } from 'src/app/providers/push-notifications/push-notifications';
+import { BwcErrorProvider } from 'src/app/providers/bwc-error/bwc-error';
+import { PersistenceProvider } from 'src/app/providers/persistence/persistence';
+import { ErrorsProvider } from 'src/app/providers/errors/errors';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { KeyOnboardingPage } from '../../settings/key-settings/key-onboarding/key-onboarding';
+import { ThemeProvider } from 'src/app/providers';
+
+@Component({
+ selector: 'page-select-currency',
+ templateUrl: 'select-currency.html',
+ styleUrls: ['select-currency.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class SelectCurrencyPage {
+ private showKeyOnboarding: boolean;
+
+ public title: string;
+ public coin: Coin;
+ public coinsSelected = {} as CoinsMap;
+ public tokensSelected = {} as CoinsMap;
+ public tokenDisabled = {} as CoinsMap;
+
+ public availableChains: string[];
+ public availableTokens: Token[];
+ public isOnboardingFlow: boolean;
+ public isZeroState: boolean;
+ public isJoin: boolean;
+ public isShared: boolean;
+ public keyId;
+ navParamsData;
+ img: string = '';
+ constructor(
+ private actionSheetProvider: ActionSheetProvider,
+ private currencyProvider: CurrencyProvider,
+ private router: Router,
+ private route: ActivatedRoute,
+ private logger: Logger,
+ public navParam: NavParams,
+ private profileProvider: ProfileProvider,
+ private onGoingProcessProvider: OnGoingProcessProvider,
+ private walletProvider: WalletProvider,
+ private pushNotificationsProvider: PushNotificationsProvider,
+ private bwcErrorProvider: BwcErrorProvider,
+ private translate: TranslateService,
+ private modalCtrl: ModalController,
+ private persistenceProvider: PersistenceProvider,
+ private errorsProvider: ErrorsProvider,
+ private events: EventManagerService,
+ private themeProvider: ThemeProvider
+ ) {
+ const themeCurrent = this.themeProvider.currentAppTheme;
+ this.img = 'assets/img/onboarding/select-currencies-' + themeCurrent + '.svg';
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+
+ this.isJoin = this.navParamsData.isJoin ? this.navParamsData.isJoin : false;
+ this.isShared = this.navParamsData.isShared;
+ this.keyId = this.navParamsData.keyId;
+ this.availableChains =
+ this.isShared || this.isJoin
+ ? this.currencyProvider.getMultiSigCoins()
+ : this.currencyProvider.getAvailableChains();
+ this.availableTokens = this.currencyProvider.getAvailableTokens();
+ for (const chain of this.availableChains) {
+ this.coinsSelected[chain] = false;
+ }
+ this.coinsSelected.xpi = true;
+ this.shouldShowKeyOnboarding();
+ this.setTokens();
+ }
+
+
+ ngOnInit() {
+ this.logger.info('Loaded: SelectCurrencyPage');
+ this.isOnboardingFlow = this.navParamsData.isOnboardingFlow;
+ this.route.queryParams.subscribe(params => {
+ this.isZeroState = this.router.getCurrentNavigation().extras.state.isZeroState;
+ })
+ this.title = this.isZeroState
+ ? this.translate.instant('Select Currencies')
+ : this.translate.instant('Select Currency');
+ }
+
+ private shouldShowKeyOnboarding() {
+ this.persistenceProvider.getKeyOnboardingFlag().then(value => {
+ if (!value) {
+ this.showKeyOnboarding = true;
+ const wallets = this.profileProvider.getWallets();
+ const walletsGroups = _.values(_.groupBy(wallets, 'keyId'));
+ walletsGroups.forEach((walletsGroup: any) => {
+ if (walletsGroup[0].canAddNewAccount) this.showKeyOnboarding = false;
+ });
+ } else {
+ this.showKeyOnboarding = false;
+ }
+ });
+ }
+
+ async showKeyOnboardingSlides(coins: Coin[]) {
+ this.logger.debug('Showing key onboarding');
+ const modal = await this.modalCtrl.create({
+ component: KeyOnboardingPage,
+ componentProps: null,
+ showBackdrop: false,
+ backdropDismiss: false
+ });
+ await modal.present();
+ const data = await modal.onDidDismiss();
+ if(data){
+ this.persistenceProvider.setKeyOnboardingFlag();
+ this._createWallets(coins);
+ }
+ }
+
+ public goToCreateWallet(coin: string): void {
+ if (this.isJoin) {
+ this.router.navigate(['/join-wallet'], {
+ state: {
+ keyId: this.keyId,
+ url: this.navParamsData.url,
+ coin
+ }});
+ } else {
+ this.router.navigate(['/create-wallet'], {
+ state: {
+ isShared: this.isShared,
+ coin,
+ keyId: this.keyId,
+ showKeyOnboarding: this.showKeyOnboarding
+ }});
+ }
+ }
+
+ public getCoinName(coin: Coin | any): string {
+ return this.currencyProvider.getCoinName(coin);
+ }
+
+ public goToImportWallet(): void {
+ this.router.navigate(['/import-wallet']);
+ }
+
+ private _createWallets(coins: Coin[]): void {
+ const selectedCoins = _.keys(_.pickBy(this.coinsSelected)) as Coin[];
+ coins = coins || selectedCoins;
+ const selectedTokens = _.keys(_.pickBy(this.tokensSelected));
+ this.onGoingProcessProvider.set('creatingWallet');
+ this.profileProvider
+ .createMultipleWallets(coins, selectedTokens)
+ .then(async wallets => {
+ this.walletProvider.updateRemotePreferences(wallets);
+ this.pushNotificationsProvider.updateSubscription(wallets);
+ await new Promise(resolve => setTimeout(resolve, 1000));
+ this.profileProvider.setNewWalletGroupOrder(
+ wallets[0].credentials.keyId
+ );
+ this.endProcess(wallets[0].credentials.keyId);
+ })
+ .catch(e => {
+ this.showError(e);
+ });
+ }
+
+ public createWallets(coins?: Coin[]): void {
+ if (this.isZeroState && !this.isOnboardingFlow) {
+ this.showInfoSheet(coins);
+ return;
+ }
+ this._createWallets(coins);
+ }
+
+ private showError(err) {
+ this.onGoingProcessProvider.clear();
+ this.logger.error('Create: could not create wallet', err);
+ const title = this.translate.instant('Error');
+ err = this.bwcErrorProvider.msg(err);
+ this.errorsProvider.showDefaultError(err, title);
+ }
+
+ private endProcess(keyId?: string) {
+ this.onGoingProcessProvider.clear();
+ this.router.navigate(['/recovery-key'], {
+ state: {
+ keyId,
+ isOnboardingFlow: this.isOnboardingFlow,
+ hideBackButton: true
+ }});
+ }
+
+ public createAndBindTokenWallet(pairedWallet, token) {
+ if (!_.isEmpty(pairedWallet)) {
+ this.profileProvider.createTokenWallet(pairedWallet, token).then(() => {
+ // store preferences for the paired eth wallet
+ this.walletProvider.updateRemotePreferences(pairedWallet);
+ if (pairedWallet.needsBackup) {
+ this.endProcess();
+ } else {
+ this.router.navigate(['']).then(() => {
+ this.events.publish('Local/FetchWallets');
+ });
+ }
+ });
+ }
+ }
+
+ public showPairedWalletSelector(token) {
+ const eligibleWallets = this.keyId
+ ? this.profileProvider.getWalletsFromGroup({
+ keyId: this.keyId,
+ network: 'livenet',
+ pairFor: token
+ })
+ : [];
+
+ const walletSelector = this.actionSheetProvider.createInfoSheet(
+ 'linkEthWallet',
+ {
+ wallets: eligibleWallets,
+ token
+ }
+ );
+ walletSelector.present();
+ walletSelector.onDidDismiss(pairedWallet => {
+ return this.createAndBindTokenWallet(pairedWallet, token);
+ });
+ }
+ public setTokens(coin?: string): void {
+ if (coin === 'eth' || !coin) {
+ for (const token of this.availableTokens) {
+ if (this.isZeroState) {
+ this.tokensSelected[token.symbol] = false;
+ } else {
+ let canCreateit = _.isEmpty(
+ this.profileProvider.getWalletsFromGroup({
+ keyId: this.keyId,
+ network: 'livenet',
+ pairFor: token
+ })
+ );
+ this.tokenDisabled[token.symbol] = canCreateit;
+ }
+ }
+ }
+ }
+
+ private showInfoSheet(coins: Coin[]) {
+ const infoSheet = this.actionSheetProvider.createInfoSheet('new-key');
+ infoSheet.present();
+ infoSheet.onDidDismiss(option => {
+ if (option) {
+ this.showKeyOnboardingSlides(coins);
+ return;
+ }
+ this._createWallets(coins);
+ });
+ }
+}
diff --git a/src/app/pages/backup/backup-component/backup-word/backup-word.component.html b/src/app/pages/backup/backup-component/backup-word/backup-word.component.html
new file mode 100644
index 00000000000..cf65f9932c5
--- /dev/null
+++ b/src/app/pages/backup/backup-component/backup-word/backup-word.component.html
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/backup/backup-game/backup-game.scss b/src/app/pages/backup/backup-game/backup-game.scss
new file mode 100644
index 00000000000..3c70d281fcc
--- /dev/null
+++ b/src/app/pages/backup/backup-game/backup-game.scss
@@ -0,0 +1,65 @@
+page-backup-game {
+ ion-content.content {
+ background: white;
+ }
+
+ ion-content::part(scroll) {
+ padding-bottom: calc(
+ var(--padding-bottom) + var(--keyboard-offset)
+ ) !important;
+ }
+
+ .page-container {
+ padding-top: unset;
+ }
+
+ .main-header {
+ font-size: 22px;
+ font-weight: 600;
+ margin-bottom: 16px;
+ }
+
+ .sub-header {
+ font-size: 14px;
+ color: rgba(0, 30, 46, 0.6);
+ margin-bottom: 16px;
+ }
+
+ .word-container {
+ .word-title {
+ font-size: 18px;
+ padding: 20px;
+ color: var(--color-dark);
+ }
+ }
+ .word-guess-conatiner {
+ background-color: #fafafb;
+ padding: 16px;
+ margin-bottom: 32px;
+ .word-guess-title {
+ font-weight: 600;
+ font-size: 14px;
+ }
+ .word-guess-content {
+ margin-top: 16px;
+ display: flex;
+ ion-button {
+ height: 32px;
+ margin-right: 15px;
+ --background: rgba(0, 93, 141, 0.05);
+ color: #1c3745;
+ font-size: 12px;
+ --border-width: 1px;
+ --border-color: #70818a;
+ --box-shadow: unset;
+ --border-style: solid;
+ --border-radius: 8px;
+ --padding-start: 16px;
+ --padding-end: 16px;
+ --padding-top: 6px;
+ --padding-bottom: 6px;
+ font-weight: 600;
+ }
+ }
+ }
+}
diff --git a/src/app/pages/backup/backup-game/backup-game.ts b/src/app/pages/backup/backup-game/backup-game.ts
new file mode 100644
index 00000000000..cb2d49bd0d0
--- /dev/null
+++ b/src/app/pages/backup/backup-game/backup-game.ts
@@ -0,0 +1,212 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import * as _ from 'lodash';
+import { Location } from '@angular/common';
+
+// providers
+import { ActionSheetProvider } from '../../../providers/action-sheet/action-sheet';
+import { BwcProvider } from '../../../providers/bwc/bwc';
+import { KeyProvider } from '../../../providers/key/key';
+import { Logger } from '../../../providers/logger/logger';
+import { PersistenceProvider } from '../../../providers/persistence/persistence';
+import { ProfileProvider } from '../../../providers/profile/profile';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { Router } from '@angular/router';
+import { SwiperOptions } from 'swiper';
+
+import { BackupWordModel } from '../backup-component/backup-word/backup-word.model';
+import { ModalController } from '@ionic/angular';
+import { CopayersPage } from '../../add/copayers/copayers';
+@Component({
+ selector: 'page-backup-game',
+ templateUrl: 'backup-game.html',
+ styleUrls: ['./backup-game.scss'],
+ encapsulation: ViewEncapsulation.None,
+})
+export class BackupGamePage {
+ wideHeader;
+ config: SwiperOptions = {
+ slidesPerView: 2,
+ spaceBetween: 20,
+ centeredSlides: true,
+ speed: 400
+ }
+ public mnemonicWords: string[];
+ public mnemonicWordsConverted: BackupWordModel[];
+
+ public shuffledMnemonicWords;
+ public password: string;
+ public customWords;
+ public selectComplete: boolean;
+ public mnemonicHasPassphrase;
+ public useIdeograms;
+ public keys;
+ public keyId: string;
+ public libWord: string[];
+ public countWord = 0;
+ public randomListFinal: string[];
+ navParamsData;
+ constructor(
+ private logger: Logger,
+ private profileProvider: ProfileProvider,
+ private bwcProvider: BwcProvider,
+ private actionSheetProvider: ActionSheetProvider,
+ private keyProvider: KeyProvider,
+ private persistenceProvider: PersistenceProvider,
+ private events: EventManagerService,
+ private router: Router,
+ private modalCtrl: ModalController,
+ private location: Location) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ this.mnemonicWords = (this.navParamsData.words as BackupWordModel[]).map(s => s.word);
+ this.mnemonicWordsConverted = (this.navParamsData.words as BackupWordModel[]).map(s => new BackupWordModel({
+ word: s.word,
+ isBlur: true,
+ isCorrect: true,
+ }));
+ this.keys = this.navParamsData.keys;
+ this.keyId = this.navParamsData.keyId;
+ this.setFlow();
+ this.readFile();
+ }
+
+ readFile() {
+ fetch('assets/backup-word.txt')
+ .then(response => response.text())
+ .then(data => {
+ this.libWord = data.split(/\r\n|\n/);
+ this.createRandom();
+ })
+ }
+
+ createRandom() {
+ const randomList = [this.mnemonicWordsConverted[this.countWord].word];
+ for (let i = 0; i < 2; i++) {
+ let isDone = true;
+ while (isDone) {
+ const randomNumber = Math.floor(Math.random() * (this.libWord.length));
+ const wordRandom = this.libWord[randomNumber];
+ if (wordRandom !== this.mnemonicWordsConverted[this.countWord].word) {
+ randomList.push(wordRandom);
+ isDone = false;
+ }
+ }
+ }
+ this.shuffleArray(randomList);
+ this.randomListFinal = [...randomList];
+ }
+
+ shuffleArray(array) {
+ for (let i = array.length - 1; i > 0; i--) {
+ const j = Math.floor(Math.random() * (i + 1));
+ [array[i], array[j]] = [array[j], array[i]];
+ }
+ }
+
+ checkWord(word) {
+ if (word === this.mnemonicWordsConverted[this.countWord].word) {
+ this.mnemonicWordsConverted[this.countWord].isCorrect = true;
+ this.mnemonicWordsConverted[this.countWord].isBlur = false;
+ this.countWord++;
+ if (this.countWord === 12) {
+ this.finalStep();
+ } else {
+ this.createRandom();
+ }
+ }
+ else {
+ this.mnemonicWordsConverted[this.countWord].isCorrect = false;
+ }
+ }
+
+ back() {
+ this.location.back();
+ }
+
+
+ private setFlow() {
+ if (!this.mnemonicWords) return;
+
+ this.mnemonicHasPassphrase = this.keyProvider.mnemonicHasPassphrase(
+ this.keyId
+ );
+ this.useIdeograms = this.mnemonicWords.indexOf('\u3000') >= 0;
+ this.password = '';
+ this.customWords = [];
+ this.selectComplete = false;
+ }
+
+ public finalStep(): void {
+ if (this.mnemonicHasPassphrase) {
+ const keyClient = this.bwcProvider.getKey();
+ const separator = this.useIdeograms ? '\u3000' : ' ';
+ const customSentence = this.mnemonicWords.join(separator);
+ const password = this.password || '';
+ let key;
+
+ try {
+ key = new keyClient({
+ seedType: 'mnemonic',
+ seedData: customSentence,
+ useLegacyCoinType: false,
+ useLegacyPurpose: false,
+ passphrase: password
+ });
+ } catch (err) {
+ this.showErrorInfoSheet(err);
+ return;
+ }
+
+ if (key.get().xPrivKey != this.keys.xPrivKey) {
+ this.showErrorInfoSheet('Private key mismatch');
+ return;
+ }
+ }
+ this.profileProvider.setBackupGroupFlag(this.keyId);
+ const opts = {
+ keyId: this.keyId,
+ showHidden: true
+ };
+ const wallets = this.profileProvider.getWalletsFromGroup(opts);
+ wallets.forEach(w => {
+ this.profileProvider.setWalletBackup(w.credentials.walletId);
+ });
+ this.showSuccessInfoSheet();
+ }
+
+ private showSuccessInfoSheet() {
+ const infoSheet = this.actionSheetProvider.createInfoSheet(
+ 'correct-recovery-prhase'
+ );
+ infoSheet.present();
+ infoSheet.onDidDismiss(async () => {
+ if(this.navParamsData.isNewSharedWallet){
+ const copayerModal = await this.modalCtrl.create({
+ component: CopayersPage,
+ componentProps: {
+ walletId: this.navParamsData.walletId
+ },
+ cssClass: 'wallet-details-modal'
+ });
+ await copayerModal.present();
+ }
+ this.router.navigate(['']).then(() => {
+ this.events.publish('Local/FetchWallets');
+ });
+ });
+ }
+
+ private showErrorInfoSheet(err) {
+ this.logger.warn('Failed to verify backup: ', err);
+ const infoSheet = this.actionSheetProvider.createInfoSheet(
+ 'incorrect-recovery-prhase'
+ );
+ infoSheet.present();
+ infoSheet.onDidDismiss(() => {
+ this.setFlow();
+ });
+ }
+}
diff --git a/src/app/pages/backup/backup-key/backup-key.html b/src/app/pages/backup/backup-key/backup-key.html
new file mode 100644
index 00000000000..358e396c9a6
--- /dev/null
+++ b/src/app/pages/backup/backup-key/backup-key.html
@@ -0,0 +1,25 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/backup/backup-key/backup-key.scss b/src/app/pages/backup/backup-key/backup-key.scss
new file mode 100644
index 00000000000..8e0f24f6da2
--- /dev/null
+++ b/src/app/pages/backup/backup-key/backup-key.scss
@@ -0,0 +1,48 @@
+page-backup-key {
+ ::ng-deep {
+ expandable-header-primary {
+ text-align: left !important;
+ }
+ }
+
+ ion-content.content {
+ background: white;
+ }
+
+ .page-container {
+ padding-top: unset;
+ }
+
+ .main-header {
+ font-size: 22px;
+ font-weight: 600;
+ margin-bottom: 16px;
+ }
+
+ .sub-header {
+ font-size: 14px;
+ color: rgba(0, 30, 46, 0.6);
+ margin-bottom: 16px;
+ }
+
+ .notification-container {
+ display: flex;
+ margin-bottom: 36px;
+ padding: 12px 18px;
+ background: #ffddb6;
+ border-radius: 8px;
+ color: #482a00;
+ font-size: 14px;
+ .notification-content {
+ margin-left: 10px;
+ }
+ }
+
+ .word-container {
+ .word-title {
+ font-size: 18px;
+ padding: 20px;
+ color: var(--color-dark);
+ }
+ }
+}
diff --git a/src/app/pages/backup/backup-key/backup-key.ts b/src/app/pages/backup/backup-key/backup-key.ts
new file mode 100644
index 00000000000..facf0a4adde
--- /dev/null
+++ b/src/app/pages/backup/backup-key/backup-key.ts
@@ -0,0 +1,168 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import * as _ from 'lodash';
+
+// providers
+import { ActionSheetProvider } from '../../../providers/action-sheet/action-sheet';
+import { AppProvider } from '../../../providers/app/app';
+import { BwcErrorProvider } from '../../../providers/bwc-error/bwc-error';
+import { ErrorsProvider } from '../../../providers/errors/errors';
+import { KeyProvider } from '../../../providers/key/key';
+import { Logger } from '../../../providers/logger/logger';
+import { LogsProvider } from '../../../providers/logs/logs';
+import { PlatformProvider } from '../../../providers/platform/platform';
+import { PopupProvider } from '../../../providers/popup/popup';
+import { ProfileProvider } from '../../../providers/profile/profile';
+import { NavController, NavParams } from '@ionic/angular';
+import { Router } from '@angular/router';
+import { Location } from '@angular/common';
+import { BackupWordModel } from '../backup-component/backup-word/backup-word.model';
+@Component({
+ selector: 'page-backup-key',
+ templateUrl: 'backup-key.html',
+ styleUrls: ['./backup-key.scss'],
+ encapsulation: ViewEncapsulation.None,
+})
+export class BackupKeyPage {
+ public mnemonicWords: string[];
+ public mnemonicWordsConverted: BackupWordModel[];
+ public credentialsEncrypted: boolean;
+ public walletGroup;
+ public keys;
+ private keyId: string;
+ navParamsData;
+
+ constructor(
+ private navCtrl: NavController,
+ private navParams: NavParams,
+ private logger: Logger,
+ private profileProvider: ProfileProvider,
+ private bwcErrorProvider: BwcErrorProvider,
+ private translate: TranslateService,
+ private actionSheetProvider: ActionSheetProvider,
+ private keyProvider: KeyProvider,
+ private errorsProvider: ErrorsProvider,
+ private popupProvider: PopupProvider,
+ private platformProvider: PlatformProvider,
+ private logsProvider: LogsProvider,
+ private appProvider: AppProvider,
+ private location: Location,
+ private router: Router
+ ) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ this.keyId = this.navParamsData.keyId;
+ this.walletGroup = this.profileProvider.getWalletGroup(this.keyId);
+ this.credentialsEncrypted = this.walletGroup.isPrivKeyEncrypted;
+ }
+
+ ionViewDidEnter() {
+ if (!this.walletGroup.canSign) {
+ this.showNoRecoveryPhraseError();
+ return;
+ }
+
+ this.keyProvider
+ .handleEncryptedWallet(this.keyId)
+ .then((password: string) => {
+ let keys;
+ try {
+ keys = this.keyProvider.get(this.keyId, password);
+ } catch (err) {
+ const title =
+ 'Your wallet is in a corrupt state. Please contact support and share the logs provided.';
+ let message;
+ try {
+ message =
+ err instanceof Error ? err.toString() : JSON.stringify(err);
+ } catch (error) {
+ message = 'Unknown error';
+ }
+ this.popupProvider.ionicAlert(title, message).then(() => {
+ // Share logs
+ const platform = this.platformProvider.isCordova
+ ? this.platformProvider.isAndroid
+ ? 'android'
+ : 'ios'
+ : 'desktop';
+ this.logsProvider.get(this.appProvider.info.nameCase, platform);
+ });
+ }
+ if (_.isEmpty(keys)) {
+ this.logger.warn('Empty keys');
+ }
+ this.credentialsEncrypted = false;
+ this.keys = keys;
+ if (!this.keys || !this.keys.mnemonic) {
+ this.showNoRecoveryPhraseError();
+ return;
+ }
+ this.setFlow();
+ })
+ .catch(err => {
+ if (
+ err &&
+ err.message != 'FINGERPRINT_CANCELLED' &&
+ err.message != 'PASSWORD_CANCELLED'
+ ) {
+ const title = this.translate.instant('Could not decrypt account');
+ if (err.message == 'WRONG_PASSWORD') {
+ this.errorsProvider.showWrongEncryptPasswordError();
+ } else {
+ this.showErrorInfoSheet(this.bwcErrorProvider.msg(err), title);
+ }
+ }
+ this.location.back();
+ });
+ }
+
+ private showNoRecoveryPhraseError() {
+ const title = this.translate.instant(
+ 'Account recovery phrase not available'
+ );
+ let err = this.translate.instant(
+ 'You can still export it from "Export Account" option.'
+ );
+ this.showErrorInfoSheet(err, title);
+ this.location.back();
+ this.logger.warn('no mnemonics');
+ }
+
+ private showErrorInfoSheet(
+ err: Error | string,
+ infoSheetTitle: string
+ ): void {
+ if (!err) return;
+ this.logger.warn('Could not get keys:', err);
+ this.errorsProvider.showDefaultError(err, infoSheetTitle);
+ }
+
+ public goToBackupGame(): void {
+ this.router.navigate(['/backup-game'], {
+ state: {
+ words: this.mnemonicWordsConverted,
+ keys: this.keys,
+ keyId: this.keyId,
+ walletId: this.navParamsData.walletId,
+ isOnboardingFlow: this.navParamsData.isOnboardingFlow,
+ isNewSharedWallet: this.navParamsData.isNewSharedWallet
+ }
+ });
+ }
+
+ private setFlow(): void {
+ if (!this.keys) return;
+
+ let words = this.keys.mnemonic;
+
+ this.mnemonicWords = words.split(/[\u3000\s]+/);
+ this.mnemonicWordsConverted = this.mnemonicWords.map(s => new BackupWordModel({
+ word: s,
+ isBlur: false,
+ isCorrect: true
+ }))
+ }
+}
diff --git a/src/app/pages/choose-fee-level/choose-fee-level.html b/src/app/pages/choose-fee-level/choose-fee-level.html
new file mode 100644
index 00000000000..eebd58f25dc
--- /dev/null
+++ b/src/app/pages/choose-fee-level/choose-fee-level.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/choose-fee-level/choose-fee-level.scss b/src/app/pages/choose-fee-level/choose-fee-level.scss
similarity index 91%
rename from src/pages/choose-fee-level/choose-fee-level.scss
rename to src/app/pages/choose-fee-level/choose-fee-level.scss
index 5c75b9a86fe..42133f5eb36 100644
--- a/src/pages/choose-fee-level/choose-fee-level.scss
+++ b/src/app/pages/choose-fee-level/choose-fee-level.scss
@@ -29,7 +29,7 @@ page-choose-fee-level {
&-check {
font-size: 28px;
&.success {
- color: color($colors, success);
+ color: var(--color-success);
}
}
&-speed-name {
@@ -37,6 +37,7 @@ page-choose-fee-level {
font-size: 20px;
color: #434d5a;
line-height: 29px;
+ margin-right: 5px;
}
&-speed-satByte {
color: #434d5a;
@@ -61,4 +62,8 @@ page-choose-fee-level {
box-shadow: 0 4px 5px 0 rgba(0, 0, 0, 0.14);
}
}
+
+ .apply-button {
+ display: flex;
+ }
}
diff --git a/src/pages/choose-fee-level/choose-fee-level.ts b/src/app/pages/choose-fee-level/choose-fee-level.ts
similarity index 94%
rename from src/pages/choose-fee-level/choose-fee-level.ts
rename to src/app/pages/choose-fee-level/choose-fee-level.ts
index acf9f5cea18..53768dbceb3 100644
--- a/src/pages/choose-fee-level/choose-fee-level.ts
+++ b/src/app/pages/choose-fee-level/choose-fee-level.ts
@@ -1,6 +1,6 @@
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
+import { ModalController, NavParams } from '@ionic/angular';
import { TranslateService } from '@ngx-translate/core';
-import { NavParams, ViewController } from 'ionic-angular';
import * as _ from 'lodash';
import { Coin, CurrencyProvider } from '../../providers/currency/currency';
import { ExternalLinkProvider } from '../../providers/external-link/external-link';
@@ -22,7 +22,9 @@ enum ethAvgTime {
@Component({
selector: 'page-choose-fee-level',
- templateUrl: 'choose-fee-level.html'
+ templateUrl: 'choose-fee-level.html',
+ styleUrls: ['choose-fee-level.scss'],
+ encapsulation : ViewEncapsulation.None
})
export class ChooseFeeLevelModal {
private blockTime: number;
@@ -62,7 +64,7 @@ export class ChooseFeeLevelModal {
private translate: TranslateService,
private externalLinkProvider: ExternalLinkProvider,
private navParams: NavParams,
- private viewCtrl: ViewController
+ private viewCtrl: ModalController
) {}
ngOnInit() {
@@ -128,7 +130,7 @@ export class ChooseFeeLevelModal {
this.feeOpts[i].feePerSatByte = (
feeLevel.feePerKb / this.feeUnitAmount
).toFixed();
- if (this.coin == 'eth' || this.isERCToken) {
+ if (this.isERCToken) {
this.feeOpts[i].avgConfirmationTime = ethAvgTime[feeLevel.level];
} else {
let avgConfirmationTime = feeLevel.nbBlocks * this.blockTime;
@@ -194,7 +196,7 @@ export class ChooseFeeLevelModal {
return parseInt((maxValue / this.feeUnitAmount).toFixed(), 10);
}
- public checkFees(feePerSatByte: string): void {
+ public checkFees(feePerSatByte: string | any): void {
let fee = Number(feePerSatByte);
this.showError = fee <= this.minFeeAllowed ? true : false;
this.showMinWarning =
diff --git a/src/app/pages/confirm-token/confirm-token.html b/src/app/pages/confirm-token/confirm-token.html
new file mode 100644
index 00000000000..2eeb5d7f522
--- /dev/null
+++ b/src/app/pages/confirm-token/confirm-token.html
@@ -0,0 +1,100 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/confirm-token/confirm-token.scss b/src/app/pages/confirm-token/confirm-token.scss
new file mode 100644
index 00000000000..ff266a283b5
--- /dev/null
+++ b/src/app/pages/confirm-token/confirm-token.scss
@@ -0,0 +1,408 @@
+confirm-token {
+ .ellipsis{
+ display: block !important;
+ }
+ ion-content {
+ height: calc(100% - 130px) !important;
+ }
+
+ ion-note {
+ // margin-left: unset;
+ // margin-right: unset;
+ margin-inline: unset;
+ }
+ .amount-label {
+ padding-top: 1rem;
+
+ .amount {
+ display: flex;
+ font-size: 3.5rem;
+ justify-content: space-between;
+ font-size: 3.5rem;
+
+ img.sending-img {
+ width: auto;
+ height: 40px;
+ }
+
+ .amount-coin {
+ font-size: 1.5rem;
+ margin-top: 0.35rem;
+ margin-left: 0.8rem;
+ }
+
+ div {
+ display: flex;
+ }
+ }
+
+ .alternative {
+ margin-top: 0.5rem;
+ color: var(--color-light-grey);
+ }
+ }
+
+ // button.item {
+ // width: 100%;
+ // }
+ .item-fee {
+
+ .fee-loading {
+ font-weight: 300;
+ color: var(--color-light-grey);
+ }
+
+ &.warn {
+ color: var(--color-error);
+
+ .fee-details {
+ color: var(--color-error);
+ }
+ }
+
+ &.btn-opacity {
+ background-color: #fbfbfb;
+ }
+ }
+
+ .padded-input {
+ padding-top: 10px;
+ padding-bottom: 15px;
+ }
+
+ .paypro {
+ width: 100%;
+ cursor: pointer;
+ }
+
+ .no-wallet-message {
+ ion-item {
+ text-align: center;
+ text-transform: uppercase;
+ }
+ }
+
+ .payment-proposal-to {
+ padding: 10px;
+ height: 39px;
+ max-width: 200px;
+ border-radius: 19.5px;
+ background-color: #f6f7fc;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ &.align-right {
+ margin-left: auto;
+ }
+
+ .multiple-length {
+ display: flex;
+ }
+
+ .coin-img {
+ width: 18px;
+ height: 18px;
+ margin-right: 6px;
+ }
+
+ .text-address {
+ display: flex;
+ width: 25px;
+ justify-content: space-between;
+ }
+
+ .debit-card {
+ width: 40px;
+ }
+ }
+
+ .not-clickable {
+ pointer-events: none;
+ }
+
+ .last-item {
+ margin-left: auto !important;
+ }
+
+ .multi-amount {
+ text-align: right;
+ margin-top: 15px;
+ }
+
+ .bp-list {
+ .item{
+ --inner-padding-start: 16px;
+ border-radius: 12px;
+ }
+ .list-container{
+ display: flex;
+ flex-flow: column;
+ width: 100%;
+ .row-container{
+ display: flex;
+ justify-content: space-between;
+ }
+ .row-container:nth-child(n+2){
+ padding: 16px 0;
+ margin: 0 16px;
+ .item-name{
+ font-weight: 400;
+ font-size: 16px;
+ flex: 0 0 auto;
+ margin-right: 32px;
+ }
+ .item-detail{
+ font-size: 16px;
+ font-weight: 600 !important;
+ text-align: end;
+ .sub-note{
+ color: rgba(0, 30, 46, 0.6);
+ font-size: 11px;
+ }
+ }
+ }
+ .send-to-content{
+ .item-name{
+ font-weight: 600 !important;
+ color:rgba(98, 90, 124, 1);
+ }
+ .item-detail{
+ color: rgba(255, 184, 93, 1);
+ }
+ }
+ .row-container:nth-child(n+3) {
+ border-top: 1px solid rgba(112, 129, 138, 0.38);
+ }
+ }
+
+ .summary-amount-info{
+ justify-content: center;
+ .total-amount{
+ margin-top: 16px;
+ margin-bottom: 4px;
+ color: rgba(204, 128, 0, 1) !important;
+ font-size: 22px;
+ font-weight: 600;
+ text-align: center;
+ }
+ .total-amount-alt{
+ display: flex;
+ justify-content: center;
+ color: rgba(255, 184, 93, 1);
+ font-size: 16px;
+ font-weight: 600;
+ text-align: center;
+ }
+ }
+
+ .sub-title {
+ color: #000000;
+ font-size: 16px;
+ font-weight: 500;
+ line-height: 18px;
+ }
+
+
+ .custom-list {
+ --inner-padding-start: 0;
+ --padding-end: 0;
+ --inner-padding-end: 0;
+ &::part(native){
+ padding: 0;
+ }
+
+ .first-row{
+ border-bottom: 1px solid rgba(112, 129, 138, 0.38);
+ padding-bottom: 17px;
+ display: flex;
+ justify-content: center;
+ }
+
+ .first-row-send-to{
+ justify-content: space-between;
+ padding-top: 16px;
+ padding-right: 16px;
+ padding-left: 16px;
+ }
+ // &.item-ios,
+ // &.item-md {
+ // padding-left: 19px;
+
+
+ // }
+ // .item-inner {
+ // padding-top: 0px;
+ // padding-bottom: 0px;
+ // padding-right: 0px !important;
+ // }
+ }
+
+
+ }
+
+ .background-content {
+ display: flex;
+ padding: 0px 10px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ align-items: center;
+ padding-left: 0px
+ }
+
+ .note-container {
+ font-size: 16px !important;
+ font-weight: 600 !important;
+ color: rgba(204, 128, 0, 1) !important;
+ display: flex;
+ justify-content: flex-end;
+ }
+
+ .wallet,
+ .multi-recip-title {
+ span {
+ height: 19px;
+ color: #000000;
+ font-size: 14px;
+ font-weight: 500;
+ line-height: 19px;
+ text-align: right;
+ }
+
+ ion-icon.item-img.icon {
+
+ &.icon-md,
+ &.icon-ios {
+ margin: 9px 0px 9px 0;
+ justify-content: center;
+ padding: 7px;
+
+ img {
+ width: 20px;
+ }
+
+ &.rectangle {
+ border-radius: 7px;
+ justify-content: center;
+ }
+
+ .coin-img {
+ width: 18px;
+ height: 18px;
+ margin: 0px;
+ }
+ }
+ }
+
+ .gravatar {
+ ion-icon {
+ padding: 0px !important;
+ margin: 0px !important;
+
+ img {
+ width: 18px;
+ }
+
+ &.rectangle {
+ border-radius: 12px !important;
+ }
+ }
+ }
+ }
+
+ .multi-recip-title {
+ display: flex;
+ align-items: center;
+ }
+
+ .line-divider {
+ margin: 0px 17px;
+ }
+
+ .background-button-content {
+ height: 47px;
+ background-color: #edf0fe;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ max-width: 200px;
+ border-radius: 21px;
+ margin: 25px auto;
+ }
+
+ .scanner-icon {
+ z-index: 99;
+ font-size: 28px;
+ color: var(--color-primary);
+ padding-top: 20px;
+ }
+
+ .item-img {
+ &.info {
+ padding-left: 10px;
+ width: 22px;
+ height: 22px;
+ }
+ }
+
+ .item.item-input span {
+ width: auto;
+ }
+
+ .item.item-input input {
+ width: 80px;
+ }
+
+ .add-new-contact {
+ width: 25px;
+ height: 25px;
+ }
+
+ .add-new-contact-button {
+ float: right;
+ padding: 0px;
+ margin-right: 0px;
+ margin-left: 10px;
+ }
+
+ .address-note-custom {
+ display: flex;
+ }
+
+ .input-contact-custom {
+ background-color: #f8f8f8;
+ border-radius: 10px;
+ margin-bottom: 10px;
+ margin-right: 10px;
+ margin-top: 5px;
+
+ input {
+ width: 100% !important;
+ padding-left: 15px !important ;
+ }
+ }
+
+ coin-icon {
+ img {
+ margin: 0;
+ width: 20px;
+ height: 20px;
+ }
+ }
+ ion-label{
+ margin: 1rem;
+ margin-right: 32px;
+ flex: 0 0 auto;
+ }
+ ion-note{
+ flex-grow: 1;
+ overflow: hidden;
+ display: flex;
+ width: 100%;
+ justify-content: flex-end;
+ }
+ .no-margin-left{
+ margin-left: 0 !important;
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/confirm-token/confirm-token.ts b/src/app/pages/confirm-token/confirm-token.ts
new file mode 100644
index 00000000000..2efb252dd54
--- /dev/null
+++ b/src/app/pages/confirm-token/confirm-token.ts
@@ -0,0 +1,204 @@
+import { HttpClient } from "@angular/common/http";
+import { Component, ViewChild, ViewEncapsulation } from "@angular/core";
+import { Router } from "@angular/router";
+import { ModalController } from '@ionic/angular';
+import _ from "lodash";
+import { KeyProvider } from "src/app/providers/key/key";
+import { ProfileProvider } from "src/app/providers/profile/profile";
+import { TokenProvider } from "src/app/providers/token-sevice/token-sevice";
+import { WalletProvider } from "src/app/providers/wallet/wallet";
+import { PlatformProvider } from "src/app/providers/platform/platform";
+import { TranslateService } from "@ngx-translate/core";
+import { Coin, CurrencyProvider } from "src/app/providers/currency/currency";
+import { FinishModalPage } from "../finish/finish";
+import { Logger } from "src/app/providers/logger/logger";
+import { ErrorsProvider } from "src/app/providers/errors/errors";
+import { BwcErrorProvider } from "src/app/providers/bwc-error/bwc-error";
+import { Location } from '@angular/common';
+import { OnGoingProcessProvider } from "src/app/providers/on-going-process/on-going-process";
+
+@Component({
+ selector: 'confirm-token',
+ templateUrl: 'confirm-token.html',
+ styleUrls: ['confirm-token.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class ConfirmTokenPage {
+ @ViewChild('slideButton')
+ slideButton;
+ navPramss;
+ wallet;
+ token;
+ amountTokenToSend;
+ selectedTheme;
+ hideSlideButton: boolean;
+ isCordova: boolean;
+ buttonText: string;
+ successText: string;
+ sendToAddress: string;
+ fee: number
+ precision;
+ constructor(
+ public http: HttpClient,
+ private router: Router,
+ private profileProvider: ProfileProvider,
+ private tokenProvider: TokenProvider,
+ private walletProvider: WalletProvider,
+ private keyProvider: KeyProvider,
+ private platformProvider: PlatformProvider,
+ private translate: TranslateService,
+ private currencyProvider: CurrencyProvider,
+ private modalCtrl: ModalController,
+ private logger: Logger,
+ private errorsProvider: ErrorsProvider,
+ private bwcErrorProvider: BwcErrorProvider,
+ private onGoingProcessProvider: OnGoingProcessProvider,
+ private location: Location
+ ) {
+ if (this.router.getCurrentNavigation()) {
+ this.navPramss = this.router.getCurrentNavigation().extras.state;
+ } else {
+ this.navPramss = history ? history.state : {};
+ }
+ this.wallet = this.profileProvider.getWallet(this.navPramss.walletId);
+ this.token = this.navPramss.token;
+ this.sendToAddress = this.navPramss.toAddress;
+ this.amountTokenToSend = this.navPramss.amount / Math.pow(10, this.token.tokenInfo.decimals);
+ this.isCordova = this.platformProvider.isCordova;
+ this.hideSlideButton = false;
+ this.setButtonText();
+ this.fee = this.estimateFee();
+ }
+
+ ionViewDidEnter() {
+ this.loadInit();
+ }
+
+ estimateFee() {
+ // Send dust transaction representing tokens being sent.
+ const dustRepresenting = 546;
+ // Return any token change back to the sender.
+ const dustReturnAnyToken = 546
+ // fee
+ const fee = 250;
+
+ this.precision = _.get(this.currencyProvider.getPrecision(this.wallet.coin as Coin), 'unitToSatoshi', 0);
+ if (this.precision == 0) return 0;
+ return ((dustRepresenting + dustReturnAnyToken + fee) / this.precision)
+ }
+
+ loadInit() {
+ if (this.isCordova) {
+ window.addEventListener('keyboardWillShow', () => {
+ this.hideSlideButton = true;
+ });
+
+ window.addEventListener('keyboardWillHide', () => {
+ this.hideSlideButton = false;
+ });
+ }
+ }
+
+ private setButtonText() {
+ this.buttonText = this.isCordova
+ ? this.translate.instant('Slide to send')
+ : this.translate.instant('Click to send');
+ this.successText = this.translate.instant(' Sent Token Success');
+ }
+
+ ngOnInit() {
+ this.tokenProvider.getUtxosToken(this.wallet).then(utxos => {
+ let amountXec = 0;
+ let amountToken = 0
+ _.forEach(utxos, item => {
+ if (item.isNonSLP) {
+ amountXec += item.value;
+ } else {
+ amountToken += item.amountToken;
+ }
+ })
+ if (amountXec < this.fee * this.precision) this.showErrorInfoSheet(`Not enough ${this.wallet.coin} to send token.`, null, true);
+ if (amountToken < this.navPramss.amount) this.showErrorInfoSheet(`Not enough ${this.token.tokenInfo.symbol} to send.`, null, true);
+ }).catch(err => {
+ this.showErrorInfoSheet(err, null, true);
+ })
+ }
+
+ async approve(wallet) {
+ const pass = await this.walletProvider.prepare(wallet);
+ const mnemonic = this.keyProvider.getMnemonic(wallet, pass);
+ this.onGoingProcessProvider.set('Sending Token ...');
+ this.tokenProvider.sendToken(wallet, mnemonic, this.token.tokenInfo, this.amountTokenToSend, this.sendToAddress).then(() => {
+ this.onGoingProcessProvider.clear();
+ this.annouceFinish();
+ }).catch(err => {
+ this.onGoingProcessProvider.clear();
+ this.showErrorInfoSheet(err)
+ })
+ }
+
+ protected async annouceFinish() {
+ let params: {
+ finishText: string;
+ finishComment?: string;
+ autoDismiss?: boolean;
+ } = {
+ finishText: this.successText,
+ autoDismiss: true
+ };
+
+ setTimeout(() => {
+ this.router.navigate(['/tabs/wallets'], { replaceUrl: true},).then(() => {
+ this.router.navigate(['/token-details'], {
+ state: {
+ walletId: this.wallet.credentials.walletId,
+ token: this.token,
+ finishParam: params
+ }
+ });
+ })
+ }, 100);
+ }
+
+ public showErrorInfoSheet(
+ error: Error | string,
+ title?: string,
+ exit?: boolean
+ ): void {
+ let msg: string;
+ if (!error) return;
+ this.logger.warn('ERROR:', error);
+ if (this.isCordova) this.slideButton.isConfirmed(false);
+
+ if (
+ (error as Error).message === 'FINGERPRINT_CANCELLED' ||
+ (error as Error).message === 'PASSWORD_CANCELLED'
+ ) {
+ return;
+ }
+
+ if ((error as Error).message === 'WRONG_PASSWORD') {
+ this.errorsProvider.showWrongEncryptPasswordError();
+ return;
+ }
+
+ // Currently the paypro error is the following string: 500 - "{}"
+ if (error.toString().includes('500 - "{}"')) {
+ msg = this.translate.instant(
+ 'Error 500 - There is a temporary problem, please try again later.'
+ );
+ }
+
+ const infoSheetTitle = title ? title : this.translate.instant('Error');
+
+ this.errorsProvider.showDefaultError(
+ msg || this.bwcErrorProvider.msg(error),
+ infoSheetTitle,
+ () => {
+ if (exit) {
+ this.location.back()
+ }
+ }
+ );
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/feedback/send-feedback/send-feedback.html b/src/app/pages/feedback/send-feedback/send-feedback.html
new file mode 100644
index 00000000000..3fde43e2383
--- /dev/null
+++ b/src/app/pages/feedback/send-feedback/send-feedback.html
@@ -0,0 +1,39 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/feedback/send-feedback/send-feedback.scss b/src/app/pages/feedback/send-feedback/send-feedback.scss
new file mode 100644
index 00000000000..08c9715f35f
--- /dev/null
+++ b/src/app/pages/feedback/send-feedback/send-feedback.scss
@@ -0,0 +1,65 @@
+page-send-feedback {
+ .send-feedback-star {
+ height: 2rem;
+ margin-left: 5px;
+ }
+ .rating-title {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ img {
+ height: 36px;
+ }
+ }
+ .feedback-title {
+ font-size: 28px;
+ font-weight: bold;
+ color: black;
+ max-width: 200px;
+ line-height: 32px;
+ }
+ .feedback-msg {
+ font-size: 16px;
+ color: rgb(16, 16, 16);
+ font-weight: 300;
+ margin-top: 12px;
+ }
+ .msg-to-user {
+ padding: 30px;
+ padding-top: 25px;
+ padding-bottom: 25px;
+ }
+ .user-feedback-card {
+ cursor: pointer;
+ }
+
+ ion-list {
+ margin-top: 2rem;
+ ion-item {
+ ion-label {
+ color: var(--color-primary) !important;
+ }
+ }
+ }
+
+ a {
+ text-decoration: none;
+ }
+
+ .feedback-form {
+ margin: -12px 12px 12px 12px;
+ ion-item {
+ .item-inner {
+ border-bottom: none !important;
+ box-shadow: none !important;
+ }
+ }
+ ion-textarea {
+ textarea {
+ font-size: 16px;
+ margin: 0px;
+ }
+ }
+ }
+
+}
diff --git a/src/app/pages/feedback/send-feedback/send-feedback.spec.ts b/src/app/pages/feedback/send-feedback/send-feedback.spec.ts
new file mode 100644
index 00000000000..fd9dc739437
--- /dev/null
+++ b/src/app/pages/feedback/send-feedback/send-feedback.spec.ts
@@ -0,0 +1,44 @@
+// import { async, ComponentFixture } from '@angular/core/testing';
+
+// import { TestUtils } from '../../../test';
+// import { SendFeedbackPage } from './send-feedback';
+
+// describe('SendFeedbackPage', () => {
+// let fixture: ComponentFixture;
+// let instance;
+
+// beforeEach(async(() =>
+// TestUtils.configurePageTestingModule([SendFeedbackPage]).then(testEnv => {
+// fixture = testEnv.fixture;
+// instance = testEnv.instance;
+// fixture.detectChanges();
+// })));
+// afterEach(() => {
+// fixture.destroy();
+// });
+
+// describe('Methods', () => {
+// describe('#showAppreciationSheet', () => {
+// it('should create new info sheet', () => {
+// const appSheet = spyOn(
+// instance.actionSheetProvider,
+// 'createInfoSheet'
+// ).and.returnValue({
+// present() {},
+// onDidDismiss() {}
+// });
+// instance.showAppreciationSheet();
+// expect(appSheet).toHaveBeenCalledWith('appreciate-review', {
+// storeName: 'App Store'
+// });
+// });
+// });
+// describe('#openExternalLink', () => {
+// it('should open external link with correct arguments', () => {
+// const openLink = spyOn(instance.externalLinkProvider, 'open');
+// instance.openExternalLink('https://bitpay.canny.io');
+// expect(openLink).toHaveBeenCalledWith('https://bitpay.canny.io');
+// });
+// });
+// });
+// });
diff --git a/src/pages/feedback/send-feedback/send-feedback.ts b/src/app/pages/feedback/send-feedback/send-feedback.ts
similarity index 82%
rename from src/pages/feedback/send-feedback/send-feedback.ts
rename to src/app/pages/feedback/send-feedback/send-feedback.ts
index 3038cdd8efe..c9524c871a1 100644
--- a/src/pages/feedback/send-feedback/send-feedback.ts
+++ b/src/app/pages/feedback/send-feedback/send-feedback.ts
@@ -1,19 +1,15 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, ViewEncapsulation } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { TranslateService } from '@ngx-translate/core';
-import { ModalController, NavController, NavParams } from 'ionic-angular';
import * as _ from 'lodash';
-import { Observable } from 'rxjs';
+import { timer } from 'rxjs';
// native
-import { Device } from '@ionic-native/device';
-import { LaunchReview } from '@ionic-native/launch-review';
+import { Device } from '@ionic-native/device/ngx';
+import { LaunchReview } from '@ionic-native/launch-review/ngx';
// providers
-import {
- ActionSheetProvider,
- InfoSheetType
-} from '../../../providers/action-sheet/action-sheet';
+
import { AppProvider } from '../../../providers/app/app';
import { ConfigProvider } from '../../../providers/config/config';
import { ExternalLinkProvider } from '../../../providers/external-link/external-link';
@@ -24,11 +20,15 @@ import { PopupProvider } from '../../../providers/popup/popup';
// pages
import { FinishModalPage } from '../../finish/finish';
-import { SharePage } from '../../settings/share/share';
+import { ActionSheetProvider, InfoSheetType } from 'src/app/providers/action-sheet/action-sheet';
+import { ModalController } from '@ionic/angular';
+import { Router } from '@angular/router';
@Component({
selector: 'page-send-feedback',
- templateUrl: 'send-feedback.html'
+ templateUrl: 'send-feedback.html',
+ styleUrls: ['send-feedback.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class SendFeedbackPage {
@ViewChild('focusMe')
@@ -45,15 +45,14 @@ export class SendFeedbackPage {
public fromCard: boolean;
private isAndroid: boolean;
-
+ navParamsData;
constructor(
private actionSheetProvider: ActionSheetProvider,
private configProvider: ConfigProvider,
private externalLinkProvider: ExternalLinkProvider,
private launchReview: LaunchReview,
private modalCtrl: ModalController,
- private navCtrl: NavController,
- private navParams: NavParams,
+ private router: Router,
private platformProvider: PlatformProvider,
private appProvider: AppProvider,
private onGoingProcessProvider: OnGoingProcessProvider,
@@ -63,14 +62,19 @@ export class SendFeedbackPage {
private translate: TranslateService,
private device: Device
) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
this.feedbackForm = this.formBuilder.group({
comment: [
'',
Validators.compose([Validators.minLength(1), Validators.required])
]
});
- this.fromCard = this.navParams.data.fromCard;
- this.score = this.navParams.data.score;
+ this.fromCard = this.navParamsData.fromCard;
+ this.score = this.navParamsData.score;
this.appName = this.appProvider.info.nameCase;
this.leavingFeedback = false;
this.isCordova = this.platformProvider.isCordova;
@@ -126,7 +130,7 @@ export class SendFeedbackPage {
public async leaveFeedback() {
this.leavingFeedback = this.leavingFeedback ? false : true;
if (this.leavingFeedback) {
- await Observable.timer(50).toPromise();
+ await timer(50).toPromise();
this.feedbackTextarea.setFocus();
}
}
@@ -136,11 +140,11 @@ export class SendFeedbackPage {
}
public goHome() {
- this.navCtrl.popToRoot({ animate: false });
+ this.router.navigate([''], { replaceUrl: true });
}
public openSharePage(): void {
- this.navCtrl.push(SharePage);
+ this.router.navigate(['share']);
}
public async sendFeedback(feedback: string, goHome: boolean): Promise {
@@ -180,12 +184,15 @@ export class SendFeedbackPage {
finishComment:
'A member of the team will review your feedback as soon as possible.'
};
- const modal = this.modalCtrl.create(FinishModalPage, params, {
+ const modal = this.modalCtrl.create({
+ component: FinishModalPage,
+ componentProps: params,
showBackdrop: true,
- enableBackdropDismiss: false
+ backdropDismiss: false
+ }).then(rp => {
+ rp.present();
});
- await modal.present();
- this.navCtrl.popToRoot({ animate: false });
+ this.router.navigate([''], { replaceUrl: true });
})
.catch(() => {
if (goHome) return;
@@ -197,7 +204,7 @@ export class SendFeedbackPage {
this.popupProvider.ionicAlert(title, subtitle);
});
if (goHome) {
- this.navCtrl.popToRoot({ animate: false });
+ this.router.navigate([''], { replaceUrl: true });
}
}
@@ -206,10 +213,10 @@ export class SendFeedbackPage {
infoSheet.present();
infoSheet.onDidDismiss(async option => {
if (!option) {
- this.openExternalLink(externalLink);
+ this.openExternalLink('https://t.me/AbcPay');
} else {
// Click on Get Help
- this.openExternalLink('https://support.bitpay.com/hc/en-us');
+ this.openExternalLink(externalLink);
}
});
}
diff --git a/src/app/pages/fingerprint/fingerprint.html b/src/app/pages/fingerprint/fingerprint.html
new file mode 100644
index 00000000000..14216b8f5be
--- /dev/null
+++ b/src/app/pages/fingerprint/fingerprint.html
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/fingerprint/fingerprint.scss b/src/app/pages/fingerprint/fingerprint.scss
new file mode 100644
index 00000000000..a494fea7117
--- /dev/null
+++ b/src/app/pages/fingerprint/fingerprint.scss
@@ -0,0 +1,31 @@
+page-fingerprint {
+ ion-content {
+ height: 100%;
+ .fingerprint-container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ background: url(../../../assets/img/bg-lock-screen-light.svg) no-repeat;
+ background-size: cover;
+ .fingerprint-button {
+ width: 100%;
+ text-align: center;
+ margin-bottom: 7rem;
+ .unlock-btn {
+ margin-top: 2rem;
+ font-weight: 600;
+ font-size: 16px;
+ line-height: 24px;
+ letter-spacing: 0.1px;
+ color: #001E2E;
+ }
+ }
+ &.fingerprint-bg-dark {
+ background: url(../../../assets/img/bg-lock-screen-dark.svg) no-repeat !important;
+ background-size: cover !important;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/fingerprint/fingerprint.ts b/src/app/pages/fingerprint/fingerprint.ts
new file mode 100644
index 00000000000..ea0d2e8ad75
--- /dev/null
+++ b/src/app/pages/fingerprint/fingerprint.ts
@@ -0,0 +1,34 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { ModalController, Platform } from '@ionic/angular';
+import { ThemeProvider } from 'src/app/providers/theme/theme';
+import { TouchIdProvider } from 'src/app/providers/touchid/touchid';
+
+// Providers
+
+@Component({
+ selector: 'page-fingerprint',
+ templateUrl: 'fingerprint.html',
+ styleUrls: ['fingerprint.scss'],
+ encapsulation: ViewEncapsulation.None
+
+})
+export class FingerprintModalPage {
+ public unregister;
+ public currentTheme: string;
+ constructor(
+ private touchid: TouchIdProvider,
+ private platform: Platform,
+ private viewCtrl: ModalController,
+ private themeProvider: ThemeProvider
+ ) {
+ this.checkFingerprint();
+ // Get Theme
+ this.currentTheme = this.themeProvider.currentAppTheme;
+ }
+
+ public checkFingerprint(): void {
+ this.touchid.check().then(() => {
+ this.viewCtrl.dismiss();
+ });
+ }
+}
diff --git a/src/pages/finish/finish.html b/src/app/pages/finish/finish.html
similarity index 100%
rename from src/pages/finish/finish.html
rename to src/app/pages/finish/finish.html
diff --git a/src/pages/finish/finish.scss b/src/app/pages/finish/finish.scss
similarity index 77%
rename from src/pages/finish/finish.scss
rename to src/app/pages/finish/finish.scss
index b8cfa08bcd9..2a7cea6b7e4 100644
--- a/src/pages/finish/finish.scss
+++ b/src/app/pages/finish/finish.scss
@@ -38,10 +38,10 @@ page-finish {
}
}
.success-img {
- mask-image: url(../assets/img/backup/success.svg);
- height: 19rem;
+ mask-image: url(../../../assets/img/backup/success.svg);
+ height: 18rem;
width: 50%;
- background-color: color($colors, success);
+ background-color: var(--color-success);
mask-repeat: no-repeat;
mask-position: 50% 50%;
mask-size: 14rem;
@@ -50,9 +50,9 @@ page-finish {
}
}
.footer {
- padding: 2rem;
- padding-bottom: calc(2rem + env(safe-area-inset-bottom));
- padding-bottom: -webkit-calc(2rem + env(safe-area-inset-bottom));
+ padding: 20px;
+ padding-bottom: calc(20px + env(safe-area-inset-bottom));
+ padding-bottom: -webkit-calc(20px + env(safe-area-inset-bottom));
margin: 0 1.75rem;
border-top: 0.1rem solid rgba(255, 255, 255, 0.45);
position: absolute;
@@ -61,23 +61,23 @@ page-finish {
right: 0rem;
text-align: center;
color: #ffffff;
- font-size: 2rem;
+ font-size: 20px;
letter-spacing: 2.86px;
font-weight: 600;
cursor: pointer;
}
}
.primary {
- background-color: color($colors, secondary);
+ background-color: var(--color-secondary);
}
.success {
background-color: #11d1a6;
}
.warning {
- background-color: color($colors, warning);
+ background-color: var(--color-warning);
}
.danger {
- background-color: color($colors, danger);
+ background-color: var(--color-danger);
}
.bg-none {
background-color: #ffffff;
diff --git a/src/pages/finish/finish.ts b/src/app/pages/finish/finish.ts
similarity index 78%
rename from src/pages/finish/finish.ts
rename to src/app/pages/finish/finish.ts
index b9f79c153f9..d152866f4fa 100644
--- a/src/pages/finish/finish.ts
+++ b/src/app/pages/finish/finish.ts
@@ -1,10 +1,12 @@
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
+import { ModalController, NavParams } from '@ionic/angular';
import { TranslateService } from '@ngx-translate/core';
-import { NavParams, ViewController } from 'ionic-angular';
@Component({
selector: 'page-finish',
- templateUrl: 'finish.html'
+ templateUrl: 'finish.html',
+ styleUrls: ['/finish.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class FinishModalPage {
public finishText: string;
@@ -12,7 +14,7 @@ export class FinishModalPage {
public cssClass: string; // success, warning, danger, primary
constructor(
- private viewCtrl: ViewController,
+ private viewCtrl: ModalController,
private navParams: NavParams,
private translate: TranslateService
) {
diff --git a/src/app/pages/home/home.html b/src/app/pages/home/home.html
new file mode 100644
index 00000000000..29d26094931
--- /dev/null
+++ b/src/app/pages/home/home.html
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/home/home.scss b/src/app/pages/home/home.scss
new file mode 100644
index 00000000000..6e6a97e08dd
--- /dev/null
+++ b/src/app/pages/home/home.scss
@@ -0,0 +1,263 @@
+swiper {
+ max-height: 220px;
+ ion-slide {
+ justify-content: normal;
+ align-items: normal;
+ }
+}
+button.bitpay-id-login {
+ height: 2.1em;
+ margin-top: -12px;
+ float: right;
+}
+
+.icon-bitpay-id {
+ font-family: 'Heebo-Medium' !important;
+ background: #1a2c57;
+ color: #9faff5;
+ font-size: 16px;
+ border-radius: 50%;
+ width: 35px;
+ height: 35px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.icon-bitpay-id.icon-small {
+ font-size: 12px;
+ width: 25px;
+ height: 25px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.total-amount-container {
+ background: #fafafb;
+ margin: 1rem;
+ display: flex;
+ justify-content: space-between;
+ position: relative;
+ .section-header {
+ color: rgba(0, 30, 46, 0.6);
+ font-size: 14px;
+ font-weight: 600;
+ margin: 0;
+ letter-spacing: 0.1px;
+ }
+ .total-amount {
+ padding: 1rem;
+ }
+
+ img {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ height: 100%;
+ }
+
+ .total-amount-value {
+ color: #000000;
+ font-size: 32px;
+ line-height: 40px;
+ font-weight: 400;
+ margin-top: 4px;
+ .iso-code {
+ font-size: 14px;
+ }
+ ion-spinner {
+ margin-left: 15px;
+ * {
+ stroke: var(--ion-color-primary);
+ }
+ }
+ }
+ .average-container {
+ display: flex;
+ text-align: center;
+ height: 21px;
+ .negative-avg {
+ color: #ba1b1b;
+ border-radius: 50vh;
+ }
+ .possitive-avg {
+ color: #37a372;
+ border-radius: 50vh;
+ }
+ .average {
+ font-size: 14px;
+ line-height: 19px;
+ height: 21px;
+ font-weight: 400;
+ }
+ .date {
+ font-size: 14px;
+ font-weight: 400;
+ color: rgba(0, 30, 46, 0.6);
+ margin-left: 10px;
+ }
+ }
+}
+.balance-hidden {
+ padding-top: 20px;
+ padding-bottom: 20px;
+ .title {
+ cursor: pointer;
+ font-size: 32px;
+ font-weight: 500;
+ }
+ .subtitle {
+ padding-top: 10px;
+ font-size: 15px;
+ }
+}
+.message {
+ &-background {
+ width: 90%;
+ border-radius: 12px;
+ background-color: #f9f9fb;
+ margin: 2rem auto 0 auto;
+ &.no-margin {
+ margin-top: 0;
+ }
+ .line-divider {
+ margin: 0px 15px;
+ }
+ }
+
+ &-header {
+ &.no-dismissible {
+ height: 30px;
+ }
+ .button[icon-only] {
+ font-size: 10px;
+ }
+ }
+ &-icon {
+ padding: 0 15px;
+ display: flex;
+ img {
+ width: 18px;
+ height: 18px;
+ }
+ }
+
+ &-title {
+ text-align: left;
+ font-size: 18px;
+ font-weight: 700;
+ &-adv {
+ padding: 0px 15px 7px 0px;
+ }
+ &-info {
+ color: var(--color-info);
+ }
+
+ &-critical {
+ color: var(--ion-color-danger);
+ }
+ }
+
+ &-body {
+ color: grey;
+ font-weight: 400;
+ text-align: left;
+ white-space: normal;
+ font-size: 16px;
+ padding: 10px 15px 20px 15px;
+ &-adv {
+ padding: 0px 15px 7px 0px;
+ }
+ }
+
+ &-button {
+ cursor: pointer;
+ padding-left: 15px;
+ font-size: 16px;
+ display: flex;
+ justify-content: left;
+ align-items: center;
+ color: #4f6ef7;
+ height: 45px;
+ }
+ &-img {
+ img {
+ border-radius: 50%;
+ width: 60px;
+ height: 60px;
+ }
+ img.card-img {
+ border-radius: 0;
+ width: 60px;
+ height: 60px;
+ }
+ }
+}
+
+.services-list {
+ &-label {
+ font-weight: 500;
+ font-size: 20px;
+ line-height: 25px;
+ margin-left: 6px;
+ }
+ &-arrow {
+ margin-right: 10px;
+ }
+}
+.date-label {
+ display: inline-block;
+ background: #f6f7fc;
+ border-radius: 25vh;
+ padding: 0 18px;
+ color: #9ba3ae;
+ font-size: 12px;
+ cursor: default;
+}
+
+.wide-header__title {
+ padding-top: 0;
+ padding-bottom: 0;
+ --padding-end: 1rem;
+ --padding-start: 1rem;
+ expandable-header-primary {
+ font-weight: 600;
+ font-size: 16px;
+ letter-spacing: 0.1px;
+ }
+}
+
+.home-icon {
+ display: flex;
+ justify-content: space-between;
+ padding: 0 1rem;
+ align-items: center;
+ .key-notifications {
+ height: 36px;
+ --overflow: visible;
+ --padding-end: 0;
+ }
+
+ .custom-notification-icon {
+ position: absolute;
+ bottom: 17px;
+ left: 17px;
+ z-index: 1;
+ }
+}
+
+.exchange-rate {
+ justify-content: flex-start !important;
+ align-items: baseline;
+ margin: 2rem 1rem 0 1rem;
+ .exchange-rate-title {
+ font-size: 22px;
+ font-weight: 600;
+ color: #001e2e;
+ }
+ .date-label {
+ background: none;
+ font-size: 14px;
+ color: rgba(0, 30, 46, 0.6);
+ padding-left: 0.5rem;
+ }
+}
diff --git a/src/app/pages/home/home.ts b/src/app/pages/home/home.ts
new file mode 100644
index 00000000000..bd912791e68
--- /dev/null
+++ b/src/app/pages/home/home.ts
@@ -0,0 +1,524 @@
+import { Component, ElementRef, NgZone, Renderer2, ViewChild } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import * as _ from 'lodash';
+import * as moment from 'moment';
+
+// Providers
+import {
+ AppProvider,
+ DynamicLinksProvider,
+ EmailNotificationsProvider,
+ EventManagerService,
+ ExternalLinkProvider,
+ FeedbackProvider,
+ Logger,
+ NewFeatureData,
+ PersistenceProvider,
+ PlatformProvider,
+ PopupProvider,
+ ProfileProvider,
+ RateProvider,
+ ReleaseProvider,
+ ThemeProvider
+} from '../../providers';
+import { ActionSheetProvider } from '../../providers/action-sheet/action-sheet';
+import { ConfigProvider } from '../../providers/config/config';
+
+// Pages
+import { SplashScreen } from '@ionic-native/splash-screen/ngx';
+import { IonSlides, ModalController } from '@ionic/angular';
+import { Network } from 'src/app/providers/persistence/persistence';
+import { Router } from '@angular/router';
+import { AddFundsPage } from '../onboarding/add-funds/add-funds';
+import { NewFeaturePage } from '../new-feature/new-feature';
+
+export interface Advertisement {
+ name: string;
+ advertisementId?: string;
+ title: string;
+ country?: string;
+ body: string;
+ app: string;
+ linkText: string;
+ link: any;
+ isTesting: boolean;
+ linkParams?: any;
+ dismissible: true;
+ imgSrc: string;
+ signature?: string;
+}
+
+@Component({
+ selector: 'page-home',
+ templateUrl: 'home.html',
+ styleUrls: ['home.scss']
+})
+export class HomePage {
+ public tapped = 0;
+ showBuyCryptoOption: boolean;
+ showExchangeCryptoOption: boolean;
+ showShoppingOption: boolean;
+ showWalletConnect: boolean;
+ @ViewChild('showCard')
+ showCard;
+
+ @ViewChild(IonSlides) slides: IonSlides;
+ public serverMessages: any[];
+ public showServerMessage: boolean;
+ public showAdvertisements: boolean;
+ public advertisements: Advertisement[] = [];
+ public productionAds: Advertisement[] = [];
+ public testingAds: Advertisement[] = [];
+ public totalBalanceAlternative: string;
+ public totalBalanceAlternativeIsoCode: string;
+ public totalBalanceChange: number;
+ public showTotalBalance: boolean = true;
+ public fetchingStatus: boolean;
+ public showRateCard: boolean;
+ public accessDenied: boolean;
+ public newReleaseAvailable: boolean = false;
+ public cardExperimentEnabled: boolean;
+ public testingAdsEnabled: boolean;
+ public showCoinbase: boolean = false;
+ public bitPayIdUserInfo: any;
+ public accountInitials: string;
+ public isCopay: boolean;
+ private newReleaseVersion: string;
+ private pagesMap: any;
+ public currentTheme: any;
+
+ public isCordova: boolean;
+ private zone;
+ public txpsN: number;
+ public isScroll: boolean;
+
+ constructor(
+ private persistenceProvider: PersistenceProvider,
+ private logger: Logger,
+ private appProvider: AppProvider,
+ private externalLinkProvider: ExternalLinkProvider,
+ private router: Router,
+ private feedbackProvider: FeedbackProvider,
+ private translate: TranslateService,
+ private configProvider: ConfigProvider,
+ private events: EventManagerService,
+ private releaseProvider: ReleaseProvider,
+ public platformProvider: PlatformProvider,
+ private modalCtrl: ModalController,
+ private profileProvider: ProfileProvider,
+ private actionSheetProvider: ActionSheetProvider,
+ private dynamicLinkProvider: DynamicLinksProvider,
+ private newFeatureData: NewFeatureData,
+ private emailProvider: EmailNotificationsProvider,
+ private popupProvider: PopupProvider,
+ private splashScreen: SplashScreen,
+ private rateProvider: RateProvider,
+ private themeProvider: ThemeProvider,
+ private renderer: Renderer2
+ ) {
+ this.currentTheme = this.themeProvider.currentAppTheme;
+ this.logger.info('Loaded: HomePage');
+ this.isCopay = this.appProvider.info.name === 'copay';
+ this.zone = new NgZone({ enableLongStackTrace: false });
+ this.subscribeEvents();
+ this.persistenceProvider
+ .getCardExperimentFlag()
+ .then(status => (this.cardExperimentEnabled = status === 'enabled'));
+ this.isCordova = this.platformProvider.isCordova;
+ }
+
+ async handleScrolling(event) {
+ if (event.detail.currentY > 0) {
+ this.isScroll = true;
+ }
+ else {
+ this.isScroll = false;
+ }
+ }
+
+ private showNewFeatureSlides() {
+ if (this.appProvider.isLockModalOpen) return;
+ this.events.unsubscribe('Local/showNewFeaturesSlides');
+ const disclaimerAccepted = this.profileProvider.profile.disclaimerAccepted;
+ const currentVs =
+ this.appProvider.version.major + '.' + this.appProvider.version.minor;
+ if (!disclaimerAccepted) {
+ // first time using the App -> don't show
+ this.persistenceProvider.setNewFeatureSlidesFlag(currentVs);
+ return;
+ }
+ this.persistenceProvider.getNewFeatureSlidesFlag().then(value => {
+ if (!value || String(value) !== currentVs) {
+ this.newFeatureData.get().then(async feature_list => {
+ if (feature_list && feature_list.features.length > 0) {
+ const modal = await this.modalCtrl.create({
+ component: NewFeaturePage,
+ componentProps: { featureList: feature_list },
+ showBackdrop: false,
+ backdropDismiss: false
+ });
+ modal.present();
+ modal.onDidDismiss().then(({ data }) => {
+ if (data) {
+ if (typeof data.done === 'boolean' && data.done === true) {
+ this.persistenceProvider.setNewFeatureSlidesFlag(currentVs);
+ }
+ if (typeof data.data !== 'boolean') {
+ this.events.publish('IncomingDataRedir', data.data);
+ }
+ }
+ });
+ } else {
+ this.persistenceProvider.setNewFeatureSlidesFlag(currentVs);
+ }
+ });
+ }
+ });
+ }
+
+ private updateTxps() {
+ this.profileProvider
+ .getTxps({ limit: 3 })
+ .then(data => {
+ this.events.publish('Local/UpdateTxps', {
+ n: data.n
+ });
+ this.zone.run(() => {
+ this.txpsN = data.n;
+ });
+ })
+ .catch(err => {
+ this.logger.error(err);
+ });
+ }
+
+ ionViewWillEnter() {
+ const config = this.configProvider.get();
+ this.totalBalanceAlternativeIsoCode =
+ config.wallet.settings.alternativeIsoCode;
+ this.events.publish('Local/showNewFeaturesSlides');
+ this.checkFeedbackInfo();
+ this.showTotalBalance = config.totalBalance.show;
+ if (this.showTotalBalance)
+ this.updateTotalBalance(this.appProvider.homeBalance);
+ if (this.platformProvider.isElectron) this.checkNewRelease();
+ this.persistenceProvider.getDynamicLink().then((deepLink: string) => {
+ if (deepLink) {
+ this.persistenceProvider.setOnboardingFlowFlag('disabled');
+ this.persistenceProvider.removeDynamicLink();
+ this.dynamicLinkProvider.processDeepLink(deepLink);
+ } else {
+ this.persistenceProvider
+ .getOnboardingFlowFlag()
+ .then(async (value: string) => {
+ // TODO: Disable advertisement value = disable
+ value = 'disable';
+ if (value === 'enabled' && this.appProvider.info.name !== 'copay')
+ await this.openAddFunds();
+ });
+ }
+ });
+ this.updateTxps();
+ }
+
+ ngOnInit() {
+ this.preFetchWallets();
+ //Detect Change theme
+ this.themeProvider.themeChange.subscribe(() => {
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
+ });
+ // Required delay to improve performance loading
+ setTimeout(() => {
+ this.checkEmailLawCompliance();
+ this.checkAltCurrency(); // Check if the alternative currency setted is no longer supported
+ }, 2000);
+ }
+
+ getAdPageOrLink(link) {
+ let linkTo;
+ // link is of formate page:PAGE_TITLE or url e.g. https://google.com
+
+ if (link.startsWith('page:')) {
+ let pageArray = link.split(':');
+ let pageTitle = pageArray[1];
+ if (pageTitle in this.pagesMap) {
+ linkTo = this.pagesMap[pageTitle];
+ return linkTo;
+ }
+ } else if (link.startsWith('https://')) {
+ linkTo = link;
+ }
+
+ return linkTo;
+ }
+
+ private updateTotalBalance(data) {
+ if (!data) return;
+ this.zone.run(() => {
+ this.totalBalanceAlternative = data.totalBalanceAlternative;
+ this.totalBalanceChange = data.totalBalanceChange;
+ this.totalBalanceAlternativeIsoCode = data.totalBalanceAlternativeIsoCode;
+ });
+ }
+
+ private setTotalBalance(data) {
+ this.updateTotalBalance(data);
+ this.appProvider.homeBalance = data;
+ this.persistenceProvider.setTotalBalance(data);
+ }
+
+ private subscribeEvents() {
+ this.events.subscribe('Local/HomeBalance', data => {
+ if (data && this.showTotalBalance) this.setTotalBalance(data);
+ else {
+ this.totalBalanceAlternative = '0';
+ }
+ this.fetchingStatus = false;
+ });
+ this.events.subscribe('Local/ServerMessages', data => {
+ this.serverMessages = _.orderBy(
+ data.serverMessages,
+ ['priority'],
+ ['asc']
+ );
+ this.serverMessages.forEach(serverMessage => {
+ this.checkServerMessage(serverMessage);
+ });
+ });
+ this.events.subscribe('Local/AccessDenied', () => {
+ this.accessDenied = true;
+ });
+ this.events.subscribe('Local/TestAdsToggle', testAdsStatus => {
+ this.testingAdsEnabled = testAdsStatus;
+ });
+ this.events.subscribe('Local/ConnectionError', () => {
+ this.fetchingStatus = false;
+ });
+ this.events.subscribe('Local/showNewFeaturesSlides', () => {
+ this.showNewFeatureSlides();
+ });
+ }
+
+ private preFetchWallets() {
+ // Avoid heavy tasks that can slow down the unlocking experience
+ if (this.appProvider.isLockModalOpen) return;
+ this.fetchingStatus = true;
+ this.events.publish('Local/FetchWallets');
+ }
+
+ public doRefresh(refresher) {
+ this.preFetchWallets();
+ setTimeout(() => {
+ refresher.target.complete();
+ this.updateTxps();
+ }, 2000);
+ }
+
+ private removeServerMessage(id): void {
+ this.serverMessages = _.filter(this.serverMessages, s => s.id !== id);
+ }
+
+ public dismissServerMessage(serverMessage): void {
+ this.showServerMessage = false;
+ this.logger.debug(`Server message id: ${serverMessage.id} dismissed`);
+ this.persistenceProvider.setServerMessageDismissed(serverMessage.id);
+ this.removeServerMessage(serverMessage.id);
+ }
+
+ public dismissNewReleaseMessage(): void {
+ this.newReleaseAvailable = false;
+ this.logger.debug(
+ `New release message dismissed. version: ${this.newReleaseVersion}`
+ );
+ this.persistenceProvider.setNewReleaseMessageDismissed(
+ this.newReleaseVersion
+ );
+ }
+
+ public checkServerMessage(serverMessage): void {
+ if (serverMessage.app && serverMessage.app != this.appProvider.info.name) {
+ this.removeServerMessage(serverMessage.id);
+ return;
+ }
+
+ this.persistenceProvider
+ .getServerMessageDismissed(serverMessage.id)
+ .then((value: string) => {
+ if (value === 'dismissed') {
+ this.removeServerMessage(serverMessage.id);
+ return;
+ }
+ this.showServerMessage = true;
+ });
+ }
+
+ public openServerMessageLink(url): void {
+ this.externalLinkProvider.open(url);
+ }
+
+ private checkNewRelease() {
+ this.persistenceProvider
+ .getNewReleaseMessageDismissed()
+ .then(dismissedVersion => {
+ this.releaseProvider.getLatestAppVersion().then((data: any) => {
+ if (data && data.version === dismissedVersion) return;
+ this.newReleaseVersion = data.version;
+ this.newReleaseAvailable = this.releaseProvider.newReleaseAvailable(
+ data.version
+ );
+ });
+ });
+ }
+
+ private checkFeedbackInfo() {
+ this.persistenceProvider.getFeedbackInfo().then(info => {
+ if (!info) {
+ this.initFeedBackInfo();
+ } else {
+ const feedbackInfo = info;
+ // Check if current version is greater than saved version
+ const currentVersion = this.appProvider.info.version;
+ const savedVersion = feedbackInfo.version;
+ const isVersionUpdated = this.feedbackProvider.isVersionUpdated(
+ currentVersion,
+ savedVersion
+ );
+ if (!isVersionUpdated) {
+ this.initFeedBackInfo();
+ return;
+ }
+ const now = moment().unix();
+ const timeExceeded = now - feedbackInfo.time >= 24 * 7 * 60 * 60;
+ this.showRateCard = timeExceeded && !feedbackInfo.sent;
+ }
+ });
+ }
+
+ private initFeedBackInfo() {
+ this.persistenceProvider.setFeedbackInfo({
+ time: moment().unix(),
+ version: this.appProvider.info.version,
+ sent: false
+ });
+ this.showRateCard = false;
+ }
+
+ public openCountryBannedLink(): void {
+ const url =
+ "https://github.com/bitpay/copay/wiki/Why-can't-I-use-BitPay's-services-in-my-country%3F";
+ this.externalLinkProvider.open(url);
+ }
+
+ public toggleTestnet() {
+ this.tapped++;
+ if (this.tapped >= 10) {
+ this.persistenceProvider
+ .getNetwork()
+ .then((currentNetwork: Network | undefined) => {
+ const newNetwork =
+ !currentNetwork || currentNetwork === Network.livenet
+ ? Network.testnet
+ : Network.livenet;
+ this.persistenceProvider.setNetwork(newNetwork);
+ const infoSheet = this.actionSheetProvider.createInfoSheet(
+ 'in-app-notification',
+ {
+ title: 'Network Changed',
+ body: `Network changed to ${newNetwork}. Restarting app.`
+ }
+ );
+ infoSheet.present();
+ infoSheet.onDidDismiss(() => {
+ window.location.reload();
+ if (this.platformProvider.isCordova) this.splashScreen.show();
+ });
+
+ this.tapped = 0;
+ });
+ }
+ }
+
+ private async openAddFunds() {
+ const wallets = this.profileProvider.getWallets();
+ const modal = await this.modalCtrl.create({
+ component: AddFundsPage,
+ componentProps: {
+ keyId: wallets[0].credentials.keyId
+ }
+ });
+ await modal.present().then(() => {
+ this.persistenceProvider.setOnboardingFlowFlag('disabled');
+ });
+ }
+
+ private showInfoSheet(altCurrency): void {
+ const infoSheet = this.actionSheetProvider.createInfoSheet(
+ 'unsupported-alt-currency',
+ altCurrency
+ );
+ infoSheet.present();
+ infoSheet.onDidDismiss(option => {
+ if (option) {
+ this.router.navigate(['/tabs/setting']).then(() => {
+ this.router.navigate(['/alt-curency']);
+ })
+ }
+ });
+ }
+
+ private openEmailDisclaimer() {
+ const message = this.translate.instant(
+ 'By providing your email address, you give explicit consent to BitPay to use your email address to send you email notifications about payments.'
+ );
+ const title = this.translate.instant('Privacy Notice update');
+ const okText = this.translate.instant('Accept');
+ const cancelText = this.translate.instant('Disable notifications');
+ this.popupProvider
+ .ionicConfirm(title, message, okText, cancelText)
+ .then(ok => {
+ if (ok) {
+ // Accept new Privacy Notice
+ this.persistenceProvider.setEmailLawCompliance('accepted');
+ } else {
+ // Disable email notifications
+ this.persistenceProvider.setEmailLawCompliance('rejected');
+ this.emailProvider.updateEmail({
+ enabled: false,
+ email: 'null@email'
+ });
+ }
+ });
+ }
+
+ private checkEmailLawCompliance(): void {
+ setTimeout(() => {
+ if (this.emailProvider.getEmailIfEnabled()) {
+ this.persistenceProvider.getEmailLawCompliance().then(value => {
+ if (!value) this.openEmailDisclaimer();
+ });
+ }
+ }, 2000);
+ }
+
+ private checkAltCurrency(): void {
+ const config = this.configProvider.get();
+ const altCurrency = {
+ name: config.wallet.settings.alternativeName,
+ isoCode: config.wallet.settings.alternativeIsoCode
+ };
+ if (
+ !this.rateProvider.isAltCurrencyAvailable(altCurrency.isoCode) &&
+ !_.isEmpty(this.rateProvider.alternatives)
+ ) {
+ this.showInfoSheet(altCurrency);
+ }
+ }
+
+ public openSettingPage() {
+ this.router.navigate(['/setting']);
+ }
+
+ public openProposalsNotificationsPage(): void {
+ this.router.navigate(['/proposals-notifications']);
+ }
+}
diff --git a/src/app/pages/home/price-page/price-page.html b/src/app/pages/home/price-page/price-page.html
new file mode 100644
index 00000000000..1d81cddd9e2
--- /dev/null
+++ b/src/app/pages/home/price-page/price-page.html
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ card.unitCode | translate}}
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/home/price-page/price-page.scss b/src/app/pages/home/price-page/price-page.scss
new file mode 100644
index 00000000000..cabc27b61c8
--- /dev/null
+++ b/src/app/pages/home/price-page/price-page.scss
@@ -0,0 +1,105 @@
+expandable-header {
+ margin-top: 0.5rem;
+ .card-title {
+ font-weight: 400;
+ margin: 1rem;
+ text-transform: uppercase;
+ font-size: 24px;
+ line-height: 32px;
+ }
+}
+ion-title {
+ text-transform: uppercase;
+}
+.price-wraper {
+ margin: 1rem;
+ overflow: hidden;
+ border-radius: 12px;
+ background: var(--bg-color-inner-item-light-theme);
+ box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.02), 0px 4px 10px rgba(0, 0, 0, 0.04);
+}
+
+.total-amount-container {
+ padding: 1rem;
+
+ .section-header {
+ margin: 0;
+ display: none
+ }
+
+ .total-amount-value {
+ transition: opacity 350ms ease 0s;
+ color: #000000;
+ font-size: 22px;
+ line-height: 28px;
+ font-weight: 500;
+ }
+
+ .negative-avg {
+ color: #cf2f32;
+ border-radius: 50vh;
+ }
+
+ .possitive-avg {
+ color: #2fcfa4;
+ border-radius: 50vh;
+ }
+
+ .average {
+ font-size: 14px;
+ line-height: 20px;
+ font-weight: 500;
+ }
+
+ .percent {
+ margin-left: .5rem;
+ background-color: transparent;
+ transition: opacity 350ms ease 0s;
+ font-size: 14px;
+ line-height: 20px;
+ font-weight: 500;
+ }
+}
+
+.labels {
+ display: flex;
+ justify-content: space-between;
+ font-weight: 500;
+ padding: 0 1rem;
+}
+
+
+.footer-price {
+ margin-top: -47px;
+ border-bottom-left-radius: 12px;
+ border-bottom-right-radius: 12px;
+
+ ion-chip {
+ padding: 4px 2rem;
+ }
+ .active,
+ .inactive {
+ ion-label {
+ font-size: 12px;
+ }
+ }
+ .active {
+ ion-label {
+ color: var(--color-primary);
+ }
+ background: linear-gradient(0deg, rgba(0, 101, 141, 0.14), rgba(0, 101, 141, 0.14)), #FAFAFB;
+ }
+
+ .inactive {
+ ion-label {
+ color: rgba(0, 30, 46, 0.6);
+ }
+ background: transparent;
+ }
+}
+
+.donation-footer {
+ ion-button {
+ margin-top: 1rem;
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/home/price-page/price-page.ts b/src/app/pages/home/price-page/price-page.ts
new file mode 100644
index 00000000000..03cb22b7bff
--- /dev/null
+++ b/src/app/pages/home/price-page/price-page.ts
@@ -0,0 +1,239 @@
+import { Component, ViewChild } from '@angular/core';
+import * as _ from 'lodash';
+import * as moment from 'moment';
+import { FormatCurrencyPipe } from '../../../pipes/format-currency';
+
+import { Card } from '../../../components/exchange-rates/exchange-rates';
+import { PriceChart } from '../../../components/price-chart/price-chart';
+
+
+
+import { DateRanges, RateProvider } from 'src/app/providers/rate/rate';
+import { ConfigProvider } from 'src/app/providers/config/config';
+import { Logger } from 'src/app/providers/logger/logger';
+import { WalletProvider } from 'src/app/providers/wallet/wallet';
+import { AnalyticsProvider } from 'src/app/providers/analytics/analytics';
+import { Router } from '@angular/router';
+import { LoadingController } from '@ionic/angular';
+import { PlatformProvider } from 'src/app/providers';
+
+@Component({
+ selector: 'price-page',
+ templateUrl: 'price-page.html',
+ styleUrls: ['price-page.scss']
+})
+export class PricePage {
+ wallet: any;
+ wallets: any[];
+ @ViewChild('canvas', {static: true}) canvas: PriceChart;
+ card: Card;
+ public isDonation: boolean = false;
+ public activeOption: string = '1D';
+ public availableOptions;
+ public updateOptions = [
+ { label: '1D', dateRange: DateRanges.Day },
+ { label: '1W', dateRange: DateRanges.Week },
+ { label: '1M', dateRange: DateRanges.Month }
+ ];
+ public isFiatIsoCodeSupported: boolean;
+ public fiatIsoCode: string;
+ public fiatCodes;
+ navParamsData;
+ constructor(
+ private router: Router,
+ private rateProvider: RateProvider,
+ private formatCurrencyPipe: FormatCurrencyPipe,
+ private configProvider: ConfigProvider,
+ private logger: Logger,
+ private walletProvider: WalletProvider,
+ private analyticsProvider: AnalyticsProvider,
+ private loadingCtr: LoadingController,
+ public platformProvider: PlatformProvider
+ ) {
+ this.getCoinDonate();
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state;
+ } else {
+ this.navParamsData = history ? history.state : undefined;
+ }
+ this.card = this.navParamsData?.card;
+ this.setFiatIsoCode();
+ }
+
+ ngOnInit() {
+ const loading = this.loadingCtr.create({
+ message: 'Please wait...'
+ })
+ loading.then(loadingEl => loadingEl.present());
+ this.drawCanvas();
+ // Let the canvas settle
+ setTimeout(() => {
+ this.getPrice(DateRanges.Day);
+ loading.then(loadingEl => loadingEl.dismiss());
+ }, 1000);
+ }
+
+ private getCoinDonate() {
+ this.walletProvider.getDonationInfo().then((data: any) => {
+ const donationSupportCoins = data.donationSupportCoins;
+ this.isDonation = _.some(donationSupportCoins, (item: any) => item.coin === this.navParamsData.card.unitCode);
+ });
+ }
+
+ private getPrice(dateRange) {
+ this.canvas.loading = true;
+ this.rateProvider.fetchHistoricalRates(this.fiatIsoCode, dateRange).then(
+ response => {
+ this.card.historicalRates = response[this.card.unitCode];
+ this.updateValues();
+ this.setPrice();
+ if (this.canvas.chart) {
+ this.redrawCanvas();
+ } else {
+ this.canvas.loading = false;
+ }
+ },
+ err => {
+ this.canvas.loading = false;
+ this.logger.error('Error getting rates:', err);
+ }
+ );
+ }
+
+ private formatDate(date) {
+ if (this.activeOption === '1Y') {
+ return `${moment(date).format('MMM DD YYYY')}`;
+ } else if (this.activeOption === '1M') {
+ return `${moment(date).format('MMM DD hh A')}`;
+ } else if (this.activeOption === '1W') {
+ return `${moment(date).format('ddd hh:mm A')}`;
+ } else {
+ return `${moment(date).format('hh:mm A')}`;
+ }
+ }
+
+ public setPrice(points: { date?: number; price?: number } = {}) {
+ const { date = this.card.currentTime, price = this.card.currentPrice } = points;
+ const displayDate = date
+ ? this.formatDate(date)
+ : undefined
+ const minPrice = this.card.historicalRates[
+ this.card.historicalRates.length - 1
+ ].rate;
+ this.card.totalBalanceChangeAmount = price - minPrice;
+ this.card.totalBalanceChange =
+ (this.card.totalBalanceChangeAmount * 100) / minPrice;
+ const customPrecision =
+ this.card.unitCode === 'xrp' || this.card.unitCode === 'doge' ? 4 : 2 || this.card.unitCode === 'xpi' ? 6 : 2;
+ document.getElementById(
+ 'displayPrice'
+ ).textContent = `${this.formatCurrencyPipe.transform(
+ price,
+ this.fiatIsoCode,
+ customPrecision
+ )}`;
+ if (displayDate) document.getElementById('displayDate').textContent = `${displayDate}`;
+ document.getElementById(
+ 'averagePriceAmount'
+ ).textContent = `${this.formatCurrencyPipe.transform(
+ this.card.totalBalanceChangeAmount,
+ this.fiatIsoCode,
+ customPrecision
+ )}`;
+ document.getElementById(
+ 'averagePricePercent'
+ ).textContent = `${this.formatCurrencyPipe.transform(
+ this.card.totalBalanceChange,
+ '%',
+ 2
+ )}`;
+ }
+
+ private redrawCanvas() {
+ const data = this.card.historicalRates.map(rate => [rate.ts, rate.rate]);
+ this.canvas.chart.updateOptions(
+ {
+ chart: {
+ animations: {
+ enabled: false
+ }
+ },
+ series: [
+ {
+ data
+ }
+ ],
+ tooltip: {
+ x: {
+ show: false
+ }
+ }
+ },
+ false,
+ false,
+ false
+ );
+ this.canvas.loading = false;
+ }
+
+ private drawCanvas() {
+ const dataSeries = this.card.historicalRates.map(historicalRate => [
+ historicalRate.ts,
+ historicalRate.rate
+ ]);
+ this.canvas.initChartData({
+ data: dataSeries,
+ color: this.card.backgroundColor
+ });
+ }
+
+ public updateChart(option) {
+ const { label, dateRange } = option;
+ this.activeOption = label;
+ this.getPrice(dateRange);
+ }
+
+ private updateValues() {
+ this.card.currentPrice = this.card.historicalRates[0].rate;
+ this.card.currentTime = this.card.historicalRates[0].ts;
+ const minPrice = this.card.historicalRates[
+ this.card.historicalRates.length - 1
+ ].rate;
+ this.card.totalBalanceChangeAmount = this.card.currentPrice - minPrice;
+ this.card.totalBalanceChange =
+ (this.card.totalBalanceChangeAmount * 100) / minPrice;
+ }
+
+ private setFiatIsoCode() {
+ const { alternativeIsoCode } = this.configProvider.get().wallet.settings;
+ this.fiatIsoCode = this.rateProvider.isAltCurrencyAvailable(
+ alternativeIsoCode
+ )
+ ? alternativeIsoCode
+ : 'USD';
+ this.isFiatIsoCodeSupported = _.includes(this.fiatCodes, this.fiatIsoCode);
+ }
+
+ public goToAmountPage(): void {
+ this.analyticsProvider.logEvent('buy_crypto_button_clicked', {
+ from: 'priceChartsPage',
+ coin: this.card.unitCode
+ });
+ this.router.navigate(['/amount'], {
+ state: {
+ coin: this.card.unitCode,
+ fromBuyCrypto: true,
+ nextPage: 'CryptoOrderSummaryPage',
+ currency: this.configProvider.get().wallet.settings.alternativeIsoCode
+ }
+ })
+ }
+
+ public goToDonation(){
+ this.router.navigate(['/accounts-page'], {
+ state: {
+ isDonation: true
+ }
+ });
+ }
+}
diff --git a/src/app/pages/includes/coin-selector/coin-selector.html b/src/app/pages/includes/coin-selector/coin-selector.html
new file mode 100644
index 00000000000..0ea4a3701ee
--- /dev/null
+++ b/src/app/pages/includes/coin-selector/coin-selector.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/includes/coin-selector/coin-selector.scss b/src/app/pages/includes/coin-selector/coin-selector.scss
new file mode 100644
index 00000000000..583a5d91251
--- /dev/null
+++ b/src/app/pages/includes/coin-selector/coin-selector.scss
@@ -0,0 +1,51 @@
+page-coin-selector {
+ background-color: white;
+ .description {
+ font-size: 14px;
+ letter-spacing: 0.25px;
+ padding: 0 1rem 1rem 1rem;
+ }
+ .list-button {
+ --padding-start: 1rem !important;
+ --padding-end: 1rem !important;
+ --inner-padding-top: 1rem;
+ --inner-padding-bottom: 1rem;
+ --inner-padding-end: 0;
+ --padding-top: 5px;
+ --padding-bottom: 5px;
+ padding: 0;
+ margin-top: 0 !important;
+ }
+ ion-icon {
+ margin: 0 !important;
+ padding: 0 !important;
+ margin-right: 1rem !important;
+ height: 40px;
+ width: 40px;
+ &[name="chevron-back"] {
+ width: 28px !important;
+ height: 28px !important;
+ }
+ }
+
+ .item-title {
+ font-size: 18px;
+ font-weight: 500;
+ h3{
+ font-size: 16px;
+ font-weight: 600;
+ margin: 0;
+ }
+ span{
+ font-size: 14px;
+ font-weight: 400;
+ color: rgba(0, 30, 46, 0.6);
+ }
+ }
+
+ .item-note {
+ font-size: 12.5px;
+ padding-top: 4px;
+ color: lightgrey;
+ }
+}
diff --git a/src/app/pages/includes/coin-selector/coin-selector.ts b/src/app/pages/includes/coin-selector/coin-selector.ts
new file mode 100644
index 00000000000..ec3ed02c54a
--- /dev/null
+++ b/src/app/pages/includes/coin-selector/coin-selector.ts
@@ -0,0 +1,38 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { ModalController, NavParams } from '@ionic/angular';
+import { Coin, CurrencyProvider } from 'src/app/providers/currency/currency';
+import { Logger } from 'src/app/providers/logger/logger';
+
+// Providers
+
+@Component({
+ selector: 'page-coin-selector',
+ templateUrl: 'coin-selector.html',
+ styleUrls: ['coin-selector.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class CoinSelectorPage {
+ public description: string;
+ public availableChains: string[];
+
+ constructor(
+ private currencyProvider: CurrencyProvider,
+ private logger: Logger,
+ private viewCtrl: ModalController,
+ private navParams: NavParams
+ ) {
+ this.logger.debug('Coin selector initialized;');
+ this.description = this.navParams.data.description;
+ this.availableChains = this.currencyProvider.getAvailableChains();
+ }
+
+ public getCoinName(coin: Coin | any): string {
+ return this.currencyProvider.getCoinName(coin);
+ }
+
+ public selectedCoin(coin?: string): void {
+ this.viewCtrl.dismiss({
+ selectedCoin: coin
+ });
+ }
+}
diff --git a/src/app/pages/includes/create-new-wallet/create-new-wallet.html b/src/app/pages/includes/create-new-wallet/create-new-wallet.html
new file mode 100644
index 00000000000..6a1fb296140
--- /dev/null
+++ b/src/app/pages/includes/create-new-wallet/create-new-wallet.html
@@ -0,0 +1,10 @@
+
+
+ Send to
+ Amount
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/includes/multiple-outputs/multiple-outputs.scss b/src/app/pages/includes/multiple-outputs/multiple-outputs.scss
new file mode 100644
index 00000000000..b27088b23d4
--- /dev/null
+++ b/src/app/pages/includes/multiple-outputs/multiple-outputs.scss
@@ -0,0 +1,32 @@
+page-multiple-outputs {
+ .output-note {
+ font-size: 12.5px;
+ padding-top: 4px;
+ color: var(--color-light-grey);
+ }
+ .misunderstood-msg {
+ font-size: 1.6rem;
+ }
+ .payment-proposal-to{
+ background: unset;
+ color: #001e2e;
+ font-weight: 600;
+ height: fit-content;
+ justify-content: flex-end;
+ max-width: unset;
+ font-size: 16px;
+ letter-spacing: 0.4px;
+ }
+ .no-margin{
+ margin: 0 !important;
+ }
+ .tx-detail-list{
+ margin-top: 0px;
+ margin-bottom: 0px;
+ .list-content-container{
+ ion-item{
+ margin: 0 1rem !important;
+ }
+ }
+ }
+}
diff --git a/src/app/pages/includes/multiple-outputs/multiple-outputs.ts b/src/app/pages/includes/multiple-outputs/multiple-outputs.ts
new file mode 100644
index 00000000000..a17bb2d3593
--- /dev/null
+++ b/src/app/pages/includes/multiple-outputs/multiple-outputs.ts
@@ -0,0 +1,83 @@
+import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+// Providers
+import { AddressBookProvider } from '../../../providers/address-book/address-book';
+import { AddressProvider } from '../../../providers/address/address';
+import { Coin } from '../../../providers/currency/currency';
+import { WalletProvider } from '../../../providers/wallet/wallet';
+
+@Component({
+ selector: 'page-multiple-outputs',
+ templateUrl: 'multiple-outputs.html',
+ styleUrls: ['multiple-outputs.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class MultipleOutputsPage {
+ public coin: Coin;
+ private _tx;
+ private _misunderstoodOutputsMsg;
+
+ public showMultiplesOutputs: boolean;
+
+ constructor(
+ private addressBookProvider: AddressBookProvider,
+ private addressProvider: AddressProvider,
+ private translate: TranslateService,
+ private walletProvider: WalletProvider
+ ) {
+ this.showMultiplesOutputs = false;
+ }
+
+ @Output() openBlockChainEvent = new EventEmitter();
+ @Input()
+ set tx(tx) {
+ this._tx = tx;
+ this._misunderstoodOutputsMsg = tx.misunderstoodOutputs
+ ? this.translate.instant(
+ 'There are some misunderstood outputs, please view on blockchain.'
+ )
+ : undefined;
+ if (this._tx.tokenId) this._tx.hasMultiplesOutputs = false;
+ this.tx.outputs.forEach(output => {
+ let outputAddr = output.toAddress ? output.toAddress : output.address;
+ this.coin = this._tx.coin
+ ? this._tx.coin
+ : this.addressProvider.getCoinAndNetwork(outputAddr, this._tx.network)
+ .coin;
+
+ let addressToShow = this.walletProvider.getAddressView(
+ this.coin,
+ this._tx.network,
+ outputAddr,
+ this._tx.tokenId ? true : false
+ );
+
+ if(addressToShow == 'false'){
+ output.addressToShow = 'Unparsed address';
+ } else{
+ outputAddr = addressToShow;
+ output.addressToShow = addressToShow;
+ }
+
+ this.addressBookProvider
+ .getContactName(outputAddr, this.tx.network)
+ .then(contact => {
+ output.contactName = contact;
+ });
+
+ });
+ }
+
+ get tx() {
+ return this._tx;
+ }
+
+ get misunderstoodOutputsMsg() {
+ return this._misunderstoodOutputsMsg;
+ }
+
+ viewOnBlockchain(): void {
+ this.openBlockChainEvent.next();
+ }
+}
diff --git a/src/app/pages/includes/txp/txp.html b/src/app/pages/includes/txp/txp.html
new file mode 100644
index 00000000000..9eaa16282f4
--- /dev/null
+++ b/src/app/pages/includes/txp/txp.html
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/includes/txp/txp.scss b/src/app/pages/includes/txp/txp.scss
new file mode 100644
index 00000000000..0e0282bc517
--- /dev/null
+++ b/src/app/pages/includes/txp/txp.scss
@@ -0,0 +1,41 @@
+.proposal-title {
+ margin-bottom: 0.3rem;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ line-clamp: 2;
+ -webkit-line-clamp: 2;
+ box-orient: vertical;
+ -webkit-box-orient: vertical;
+}
+.proposal-container {
+ --inner-padding-bottom: 1rem;
+ --inner-padding-top: 1rem;
+
+ .left-part{
+ display: flex;
+ flex-flow: column;
+ }
+ .item-subtitle {
+ .icon-container {
+ vertical-align: middle;
+ width: 18px;
+ margin: 0 2px 0 0;
+ }
+ }
+ .proposal-subtitle {
+ display: flex;
+ align-items: center;
+ }
+}
+ion-note {
+ text-align: end;
+ .amount {
+ padding-bottom: 10px;
+ font-size: 16px;
+ color: var(--color-dark);
+ }
+ .date {
+ font-size: 14px;
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/includes/txp/txp.ts b/src/app/pages/includes/txp/txp.ts
new file mode 100644
index 00000000000..07701c9be2d
--- /dev/null
+++ b/src/app/pages/includes/txp/txp.ts
@@ -0,0 +1,124 @@
+import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
+
+// Providers
+import { Contact } from '../../../providers/address-book/address-book';
+import { TimeProvider } from '../../../providers/time/time';
+import { TxpDetailsPage } from '../../txp-details/txp-details';
+
+// Pages
+import { ConfirmPage } from '../../send/confirm/confirm';
+
+import _ from 'lodash';
+import { ModalController, NavController, ToastController } from '@ionic/angular';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'page-txp',
+ templateUrl: 'txp.html',
+ styleUrls: ['./txp.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class TxpPage implements OnInit {
+ private _tx;
+ private _addressbook: Contact[];
+ private _noOpenModal: boolean;
+
+ public contactName: string;
+
+ constructor(
+ private timeProvider: TimeProvider,
+ private modalCtrl: ModalController,
+ private navCtrl: NavController,
+ private router: Router,
+ public toastController: ToastController
+ ) { }
+
+ @Input()
+ set tx(tx) {
+ this._tx = tx;
+ }
+
+ get tx() {
+ return this._tx;
+ }
+
+ @Input()
+ set addressbook(addressbook) {
+ this._addressbook = addressbook;
+ }
+
+ get addressbook() {
+ return this._addressbook;
+ }
+
+ @Input()
+ set noOpenModal(noOpenModal) {
+ this._noOpenModal = noOpenModal;
+ }
+
+ get noOpenModal() {
+ return this._noOpenModal;
+ }
+
+ ngOnInit() {
+ this.contactName = this.getContact(this._tx.toAddress, this._tx.coin);
+ }
+
+ public createdWithinPastDay(time) {
+ return this.timeProvider.withinPastDay(time);
+ }
+
+ public async openTxpModal(txp): Promise {
+ if (this._noOpenModal) return;
+ const modal = await this.modalCtrl.create({
+ component: TxpDetailsPage,
+ componentProps: { tx: txp },
+ showBackdrop: false,
+ backdropDismiss: false
+ });
+ await modal.present();
+ modal.onDidDismiss().then(({ data }) => {
+ if (data && data.multisigContractAddress) {
+ this.router.navigate(['/confirm'], { state: data });
+ }
+ if (data && data.finishText) {
+ setTimeout(() => {
+ this.presentToast(data.finishText);
+ }, 100);
+ }
+ });
+ }
+
+ async presentToast(finishText) {
+ const toast = await this.toastController.create({
+ message: finishText,
+ duration: 3000,
+ position: 'top',
+ animated: true,
+ cssClass: 'custom-finish-toast',
+ buttons: [
+ {
+ side: 'start',
+ icon: 'checkmark-circle',
+ handler: () => {
+ console.log('');
+ }
+ }
+ ]
+ });
+ toast.present();
+ }
+
+ private getContact(addr: string, coin: string) {
+ const existsContact = _.find(
+ this.addressbook,
+ c => c.address === addr && c.coin === coin
+ );
+ if (existsContact) return existsContact.name;
+ return undefined;
+ }
+
+ converDate(number) {
+ return new Date(number);
+ }
+}
diff --git a/src/app/pages/new-feature/new-feature.html b/src/app/pages/new-feature/new-feature.html
new file mode 100644
index 00000000000..a6c0afa004d
--- /dev/null
+++ b/src/app/pages/new-feature/new-feature.html
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/onboarding/add-funds/add-funds.scss b/src/app/pages/onboarding/add-funds/add-funds.scss
similarity index 96%
rename from src/pages/onboarding/add-funds/add-funds.scss
rename to src/app/pages/onboarding/add-funds/add-funds.scss
index 0e86c620ee4..afc7037565c 100644
--- a/src/pages/onboarding/add-funds/add-funds.scss
+++ b/src/app/pages/onboarding/add-funds/add-funds.scss
@@ -1,11 +1,14 @@
page-add-funds {
padding-bottom: calc(env(safe-area-inset-bottom));
background-color: #ffffff;
+
ion-list {
padding: 30px 15px 15px 15px;
+
&-terms {
padding: 0 15px;
}
+
.option-container {
border-radius: 9px;
background-color: #ffffff;
@@ -14,26 +17,32 @@ page-add-funds {
grid-template-columns: max-content auto;
padding: 20px 32px 20px 0;
margin-top: 24px;
+
ion-item {
background: none;
justify-self: center;
align-self: center;
+
img {
width: 50px;
height: 50px;
+
@media (max-width: 350px) {
width: 30px;
height: 30px;
}
+
&.coinbase-icon {
border-radius: 50%;
}
}
}
+
.info {
margin-right: 21px;
display: grid;
grid-template-rows: auto auto;
+
.title {
align-self: center;
color: #000000;
@@ -41,17 +50,20 @@ page-add-funds {
font-weight: 500;
letter-spacing: 0;
line-height: 25px;
+
@media (max-width: 350px) {
font-size: 15px;
line-height: 15px;
}
}
+
.note {
align-self: start;
font-size: 16px;
- color: color($colors, grey);
+ color: var(--color-grey);
font-weight: 300;
line-height: 25px;
+
@media (max-width: 350px) {
font-size: 12px;
line-height: 15px;
@@ -60,7 +72,8 @@ page-add-funds {
}
}
}
+
.disclaimer-footer {
background-color: #ffffff;
}
-}
+}
\ No newline at end of file
diff --git a/src/app/pages/onboarding/add-funds/add-funds.ts b/src/app/pages/onboarding/add-funds/add-funds.ts
new file mode 100644
index 00000000000..2adcefd48aa
--- /dev/null
+++ b/src/app/pages/onboarding/add-funds/add-funds.ts
@@ -0,0 +1,94 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+
+// Providers
+import { ActionSheetProvider } from '../../../providers/action-sheet/action-sheet';
+import { AnalyticsProvider } from '../../../providers/analytics/analytics';
+import { ConfigProvider } from '../../../providers/config/config';
+import { Logger } from '../../../providers/logger/logger';
+import { PlatformProvider } from '../../../providers/platform/platform';
+import { ProfileProvider } from '../../../providers/profile/profile';
+
+import { ModalController, NavParams } from '@ionic/angular';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'page-add-funds',
+ templateUrl: 'add-funds.html',
+ styleUrls: ['add-funds.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class AddFundsPage {
+ private keyId;
+ public needsBackup: boolean;
+ public showCoinbase: boolean;
+
+ constructor(
+ public router: Router,
+ public navParams: NavParams,
+ private logger: Logger,
+ private profileProvider: ProfileProvider,
+ private analyticsProvider: AnalyticsProvider,
+ private configProvider: ConfigProvider,
+ private actionSheetProvider: ActionSheetProvider,
+ private platformProvider: PlatformProvider,
+ private viewCtrl: ModalController
+ ) {
+ this.keyId = this.navParams.data.keyId;
+ this.showCoinbase = !this.platformProvider.isMacApp();
+ }
+
+ ngOnInit() {
+ this.logger.info('Loaded: AddFundsPage');
+ }
+
+ ionViewWillEnter() {
+ this.needsBackup = this.keyId ? this.checkIfNeedsBackup() : false;
+ }
+
+ private checkIfNeedsBackup(): boolean {
+ const walletsGroup = this.profileProvider.getWalletGroup(this.keyId);
+ return walletsGroup.needsBackup;
+ }
+
+ public goToAmountPage() {
+ if (this.needsBackup) {
+ this.showInfoSheet();
+ return;
+ }
+
+ this.analyticsProvider.logEvent('buy_crypto_button_clicked', {
+ from: 'addFundsPage'
+ });
+ this.router.navigate(['/amount'], {
+ state: {
+ fromBuyCrypto: true,
+ nextPage: 'CryptoOrderSummaryPage',
+ currency: this.configProvider.get().wallet.settings.alternativeIsoCode
+ }
+ });
+ }
+
+ public close(): void {
+ this.viewCtrl.dismiss();
+ }
+
+ public goToImportWallet(): void {
+ this.router.navigate(['/import-wallet']);
+ }
+
+ private showInfoSheet() {
+ const infoSheet = this.actionSheetProvider.createInfoSheet(
+ 'key-verification-required'
+ );
+ infoSheet.present();
+ infoSheet.onDidDismiss(option => {
+ if (option) {
+ this.router.navigate(['/recovery-key'], {
+ state: {
+ keyId: this.keyId
+ }
+ });
+ }
+ });
+ }
+}
diff --git a/src/app/pages/onboarding/collect-email/collect-email.html b/src/app/pages/onboarding/collect-email/collect-email.html
new file mode 100644
index 00000000000..0b04868ccda
--- /dev/null
+++ b/src/app/pages/onboarding/collect-email/collect-email.html
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/onboarding/collect-email/collect-email.scss b/src/app/pages/onboarding/collect-email/collect-email.scss
similarity index 79%
rename from src/pages/onboarding/collect-email/collect-email.scss
rename to src/app/pages/onboarding/collect-email/collect-email.scss
index 1dc1fe1153e..5b04023a73c 100644
--- a/src/pages/onboarding/collect-email/collect-email.scss
+++ b/src/app/pages/onboarding/collect-email/collect-email.scss
@@ -1,6 +1,6 @@
page-collect-email {
& > ion-content {
- background-image: $onboarding-background-image !important;
+ background-image: var(--onboarding-background-image) !important;
background-position: top center;
background-size: contain;
background-repeat: no-repeat;
@@ -8,7 +8,7 @@ page-collect-email {
ion-header {
.toolbar-title,
ion-icon {
- color: color($colors, primary);
+ color: var(--color-primary);
}
.toolbar-background {
background-color: transparent;
@@ -16,7 +16,7 @@ page-collect-email {
}
text-align: center;
.title {
- color: color($colors, blank);
+ color: var(--color-blank);
}
p {
margin-left: 1em;
@@ -45,6 +45,6 @@ page-collect-email {
overflow-y: hidden;
}
.primary-color {
- color: $onboarding-primary-color;
+ color: var(--onboarding-primary-color);
}
}
diff --git a/src/pages/onboarding/collect-email/collect-email.ts b/src/app/pages/onboarding/collect-email/collect-email.ts
similarity index 84%
rename from src/pages/onboarding/collect-email/collect-email.ts
rename to src/app/pages/onboarding/collect-email/collect-email.ts
index 96ab7ca0e7e..b3fe95634dc 100644
--- a/src/pages/onboarding/collect-email/collect-email.ts
+++ b/src/app/pages/onboarding/collect-email/collect-email.ts
@@ -1,26 +1,24 @@
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Component } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Logger } from '../../../providers/logger/logger';
// native
-import { Device } from '@ionic-native/device';
-
-// providers
-import { AppProvider } from '../../../providers/app/app';
-import { PlatformProvider } from '../../../providers/platform/platform';
-
-// pages
-import { EmailNotificationsProvider } from '../../../providers/email-notifications/email-notifications';
+import { Device } from '@ionic-native/device/ngx';
+import { AppProvider } from 'src/app/providers/app/app';
+import { EmailNotificationsProvider } from 'src/app/providers/email-notifications/email-notifications';
+import { Logger } from 'src/app/providers/logger/logger';
+import { PlatformProvider } from 'src/app/providers/platform/platform';
@Component({
selector: 'page-collect-email',
- templateUrl: 'collect-email.html'
+ templateUrl: 'collect-email.html',
+ styleUrls: ['collect-email.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class CollectEmailPage {
public showConfirmForm: boolean;
- private emailForm: FormGroup;
+ emailForm: FormGroup;
private URL: string;
constructor(
@@ -46,7 +44,7 @@ export class CollectEmailPage {
: null;
}
- ionViewDidLoad() {
+ ngOnInit(){
this.logger.info('Loaded: CollectEmailPage');
}
@@ -108,4 +106,5 @@ export class CollectEmailPage {
}
);
}
+ skip() {}
}
diff --git a/src/app/pages/onboarding/feature-education/feature-education.html b/src/app/pages/onboarding/feature-education/feature-education.html
new file mode 100644
index 00000000000..95ff209b449
--- /dev/null
+++ b/src/app/pages/onboarding/feature-education/feature-education.html
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'Create a new account' | translate}}
+
+
+ {{'Import from backup' | translate}}
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/onboarding/feature-education/feature-education.scss b/src/app/pages/onboarding/feature-education/feature-education.scss
new file mode 100644
index 00000000000..11e3ef197a9
--- /dev/null
+++ b/src/app/pages/onboarding/feature-education/feature-education.scss
@@ -0,0 +1,144 @@
+page-feature-education {
+ :host {
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ display: flex;
+ position: absolute;
+ flex-direction: column;
+ justify-content: space-between;
+ contain: layout size style;
+ overflow: hidden;
+ z-index: 0;
+ }
+ animation: 1.5s opacityAnimation;
+ @keyframes opacityAnimation {
+ 0% {
+ opacity: 0;
+ }
+ 100% {
+ opacity: 1;
+ }
+ }
+ ion-content {
+ --offset-bottom: 0px !important;
+ }
+ .custom-footer{
+ ion-button{
+ opacity: 0;
+ }
+ .show-button{
+ ion-button{
+ opacity: 1;
+ }
+ }
+ .button-next {
+ width: 22% !important;
+ ion-icon {
+ margin-left: 0.5rem;
+ width: 16px;
+ }
+ }
+ }
+ .onboarding-slides {
+ width: 100%;
+ height: 100%;
+ display: block;
+ .swiper-slide {
+ height: 100%;
+
+ .slide-info {
+ height: 100%;
+ display: grid;
+ grid-template-rows: 1fr 1fr 30px;
+ justify-content: center;
+
+ .img-container {
+ align-self: end;
+ display: flex;
+
+ img {
+ margin: 3rem auto 0;
+ max-width: 65%;
+ min-height: 343px;
+
+ @media (max-width: 768px) {
+ min-height: 270px;
+ max-height: 14rem;
+ }
+ }
+ }
+
+ .info {
+ align-self: start;
+ display: grid;
+ grid-template-rows: max-content max-content;
+ height: 100%;
+ padding: 2rem;
+
+ .title {
+ color: #060606;
+ font-weight: 600;
+ align-items: center;
+ text-align: center;
+ line-height: 34px;
+
+ @media (max-width: 768px) {
+ font-size: 20px;
+ line-height: 20px;
+ }
+
+ @media (max-width: 350px) {
+ font-size: 17px;
+ line-height: 20px;
+ }
+ }
+
+ .text {
+ font-size: 16px;
+ text-align: center;
+ color: rgb(46, 46, 46);
+ font-weight: 300;
+ padding-top: 15px;
+ line-height: 28px;
+
+ @media (max-width: 768px) {
+ font-size: 14px;
+ line-height: 20px;
+ }
+
+ @media (max-width: 350px) {
+ font-size: 12px;
+ line-height: 15px;
+ }
+
+ .note {
+ font-size: 14px;
+ text-align: center;
+ color: var(--color-light-grey);
+ font-weight: 300;
+ padding-top: 15px;
+ line-height: 25px;
+
+ @media (max-width: 768px) {
+ font-size: 11px;
+ line-height: 20px;
+ }
+
+ @media (max-width: 350px) {
+ font-size: 8px;
+ line-height: 15px;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .no-background {
+ --background: transparent !important;
+ }
+}
+
diff --git a/src/app/pages/onboarding/feature-education/feature-education.ts b/src/app/pages/onboarding/feature-education/feature-education.ts
new file mode 100644
index 00000000000..883e71d9a60
--- /dev/null
+++ b/src/app/pages/onboarding/feature-education/feature-education.ts
@@ -0,0 +1,104 @@
+import { Component, NgZone, ViewChild, ViewEncapsulation, AfterContentChecked } from '@angular/core';
+
+// Providers
+import { ActionSheetProvider } from '../../../providers/action-sheet/action-sheet';
+import { ConfigProvider } from '../../../providers/config/config';
+import { Logger } from '../../../providers/logger/logger';
+import { PlatformProvider } from '../../../providers/platform/platform';
+
+// Pages
+import { ExternalLinkProvider } from 'src/app/providers/external-link/external-link';
+import { NavController } from '@ionic/angular';
+import { Router } from '@angular/router';
+import { SwiperComponent } from 'swiper/angular';
+import { Pagination, SwiperOptions } from 'swiper';
+import SwiperCore from 'swiper';
+import { ThemeProvider } from 'src/app/providers';
+
+SwiperCore.use([Pagination]);
+@Component({
+ selector: 'page-feature-education',
+ templateUrl: 'feature-education.html',
+ styleUrls: ['./feature-education.scss'],
+ encapsulation : ViewEncapsulation.None
+})
+export class FeatureEducationPage {
+
+
+ @ViewChild('swiper', { static: true }) swiper: SwiperComponent;
+
+ public isCordova: boolean;
+ public selectedTheme;
+ slideEnd: boolean = false;
+ private params = {
+ isOnboardingFlow: true,
+ isZeroState: true
+ };
+
+ config: SwiperOptions = {
+ slidesPerView: 1,
+ pagination: true,
+ speed: 400,
+ resistanceRatio: 0
+ }
+ zone;
+ constructor(
+ public navCtrl: NavController,
+ private logger: Logger,
+ private externalLinkProvider: ExternalLinkProvider,
+ private actionSheetProvider: ActionSheetProvider,
+ private configProvider: ConfigProvider,
+ private platformProvider: PlatformProvider,
+ private router: Router,
+ private themeProvider: ThemeProvider
+ ) {
+ this.zone = new NgZone({ enableLongStackTrace: false });
+ this.isCordova = this.platformProvider.isCordova;
+ this.selectedTheme = this.themeProvider.currentAppTheme;
+ }
+ ngAfterViewInit() {
+ this.swiper.swiperRef.allowSlidePrev = true;
+ }
+ ngOnInit() {
+ this.logger.info('Loaded: FeatureEducationPage');
+ }
+
+ public slideChanged() {
+ // Disable first bounce
+ this.zone.run(() => {
+ this.swiper.swiperRef.update();
+ this.slideEnd = this.swiper.swiperRef.isEnd;
+ if (this.swiper.swiperRef.isBeginning) {
+ this.swiper.swiperRef.allowSlidePrev = false;
+ }
+ })
+ }
+
+ public goToNextPage(nextViewName: string): void {
+ const config = this.configProvider.get();
+ if ((config.lock && config.lock.method) || !this.isCordova) {
+ const path = nextViewName == 'SelectCurrencyPage' ? '/select-currency' : '/import-wallet';
+ this.router.navigate([path], {
+ state: this.params
+ });
+ } else {
+ this.goToLockMethodPage(nextViewName);
+ }
+ }
+
+ private goToLockMethodPage(name: string): void {
+ let nextView = {
+ name,
+ params: this.params
+ };
+ this.router.navigate(['/lock-method'], {
+ state: {
+ nextView
+ },
+ })
+ }
+
+ public openLink(url) {
+ this.externalLinkProvider.open(url);
+ }
+}
diff --git a/src/app/pages/onboarding/lock-method/lock-method.html b/src/app/pages/onboarding/lock-method/lock-method.html
new file mode 100644
index 00000000000..f57e51b559c
--- /dev/null
+++ b/src/app/pages/onboarding/lock-method/lock-method.html
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+ {{'Continue' | translate}}
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/onboarding/lock-method/lock-method.scss b/src/app/pages/onboarding/lock-method/lock-method.scss
new file mode 100644
index 00000000000..8e38aa2c16e
--- /dev/null
+++ b/src/app/pages/onboarding/lock-method/lock-method.scss
@@ -0,0 +1,106 @@
+.lock-method {
+ height: 100%;
+ &-info {
+ height: 100%;
+ display: grid;
+ grid-template-rows: 35% 40% 25%;
+ justify-content: center;
+ .img-container {
+ align-self: end;
+ justify-self: center;
+ img {
+ margin: auto;
+ max-height: 7rem;
+ @media (max-width: 350px) {
+ max-height: 5rem;
+ }
+ }
+ }
+ .info {
+ align-self: start;
+ display: grid;
+ grid-template-rows: max-content max-content;
+ height: 100%;
+ padding: 0 2rem;
+ .title {
+ color: #060606;
+ font-weight: 600;
+ align-items: center;
+ text-align: center;
+ line-height: 34px;
+ @media (max-width: 350px) {
+ font-size: 17px;
+ line-height: 20px;
+ }
+ }
+ .text {
+ font-size: 16px;
+ text-align: center;
+ color: rgb(46, 46, 46);
+ font-weight: 300;
+ padding-top: 15px;
+ line-height: 25px;
+ @media (max-width: 350px) {
+ font-size: 12px;
+ line-height: 15px;
+ }
+ }
+ }
+ }
+}
+
+ion-toolbar {
+ --padding-start: 0;
+ --padding-end: 0;
+ .term-container {
+ ion-item {
+ --background: var(--color-inner-item-light-theme);
+ --background-activated: transparent;
+ display: flex;
+ align-items: flex-start;
+ }
+ padding: 20px 0;
+ margin: 1rem;
+ border-radius: 11px;
+ background-color: var(--color-inner-item-light-theme);
+ .term-title {
+ color: var(--color-light-on-background-theme);
+ font-size: 16px;
+ font-weight: 500;
+ letter-spacing: 0;
+ line-height: 25px;
+ margin-bottom: 10px;
+ }
+ .term-note {
+ color: gray;
+ font-size: 14px;
+ }
+ }
+}
+
+.select-method {
+ padding: 0 1rem;
+ ion-item {
+ --background: var(--color-inner-item-light-theme);
+ --padding-start: 1rem;
+ --padding-end: 1rem;
+ --padding-bottom: 6px;
+ --padding-top: 6px;
+ --inner-padding-end: 0;
+ --border-radius: 10px;
+ ion-label {
+ color: var(--color-light-on-background-theme);
+ }
+ }
+}
+
+.button-standard {
+ width: 92% !important;
+ --color: white;
+ &[disabled] {
+ --background: rgba(0, 30, 46, 0.12);
+ --color: rgba(28, 55, 69, 0.38);
+
+ }
+}
+
diff --git a/src/app/pages/onboarding/lock-method/lock-method.ts b/src/app/pages/onboarding/lock-method/lock-method.ts
new file mode 100644
index 00000000000..ebfeb712394
--- /dev/null
+++ b/src/app/pages/onboarding/lock-method/lock-method.ts
@@ -0,0 +1,136 @@
+import { Component } from '@angular/core';
+
+// Providers
+import {
+ ActionSheetProvider,
+ InfoSheetType
+} from '../../../providers/action-sheet/action-sheet';
+import { ConfigProvider } from '../../../providers/config/config';
+import { Logger } from '../../../providers/logger/logger';
+import { TouchIdProvider } from '../../../providers/touchid/touchid';
+
+// Pages
+import { PinModalPage } from '../../../pages/pin/pin-modal/pin-modal';
+import { ModalController } from '@ionic/angular';
+import { Router } from '@angular/router';
+import { Location } from '@angular/common';
+import { ThemeProvider } from 'src/app/providers';
+@Component({
+ selector: 'page-lock-method',
+ templateUrl: 'lock-method.html',
+ styleUrls: ['lock-method.scss'],
+
+})
+export class LockMethodPage {
+ public biometricMethod: string;
+ public pinMethodSelected: boolean = false;
+ private navParamsData;
+ public acceptedTerm: boolean = false;
+ public toogleChecked: boolean = false;
+ public currentTheme: string;
+
+ private pageMap = {
+ SelectCurrencyPage: '/select-currency',
+ ImportWalletPage: '/import-wallet'
+ };
+
+ constructor(
+ private logger: Logger,
+ private modalCtrl: ModalController,
+ private touchIdProvider: TouchIdProvider,
+ private actionSheetProvider: ActionSheetProvider,
+ private configProvider: ConfigProvider,
+ private location: Location,
+ private router: Router,
+ private themeProvider: ThemeProvider
+ ) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ this.currentTheme = this.themeProvider.currentAppTheme;
+ }
+
+ ngOnInit() {
+ this.logger.info('Loaded: LockMethodPage');
+ }
+
+ ionViewWillEnter() {
+ this.checkLockOptions();
+ }
+
+ public verifyPasscode(event) {
+ if (event.detail.checked) {
+ this.toogleChecked = true;
+ this.pinMethodSelected = true;
+ this.openPinModal();
+ } else {
+ this.pinMethodSelected = false;
+ this.toogleChecked = false;
+ }
+ }
+
+ private checkLockOptions() {
+ this.touchIdProvider.isAvailable().then((isAvailable: boolean) => {
+ if (isAvailable) {
+ this.biometricMethod =
+ this.touchIdProvider.getIosBiometricMethod() === 'face'
+ ? 'faceId'
+ : 'fingerprint';
+ }
+ });
+ }
+
+ public verifyBiometricLockMethod(event) {
+ if (event.detail.checked) {
+ this.toogleChecked = true;
+ if (
+ this.biometricMethod === 'fingerprint' ||
+ this.biometricMethod === 'faceId'
+ ) {
+ this.touchIdProvider.check().then(() => {
+ let lock = { method: 'fingerprint', value: null, bannedUntil: null };
+ this.configProvider.set({ lock });
+ });
+ }
+ } else {
+ this.toogleChecked = false;
+ }
+ }
+
+ public nextPage() {
+ this.router.navigate(
+ [this.pageMap[this.navParamsData.nextView.name]], {
+ state: this.navParamsData.nextView.params
+ });
+ }
+
+ async openPinModal() {
+ const modal = await this.modalCtrl.create({
+ component: PinModalPage,
+ cssClass: 'fullscreen-modal',
+ componentProps: { action: 'pinSetUp' }
+ }
+ );
+ modal.onDidDismiss().then((cancelClicked) => {
+ if (cancelClicked.data) {
+ this.pinMethodSelected = false;
+ this.toogleChecked = false;
+ }
+ });
+
+ return await modal.present();
+ }
+
+ public showInfoSheet(infoSheetType: InfoSheetType): void {
+ const infoSheet = this.actionSheetProvider.createInfoSheet(infoSheetType);
+ infoSheet.present();
+ infoSheet.onDidDismiss(option => {
+ if (option) {
+ this.pinMethodSelected = true;
+ this.openPinModal();
+ }
+ });
+ }
+}
diff --git a/src/app/pages/onboarding/recovery-key/recovery-key.html b/src/app/pages/onboarding/recovery-key/recovery-key.html
new file mode 100644
index 00000000000..d5a80181f77
--- /dev/null
+++ b/src/app/pages/onboarding/recovery-key/recovery-key.html
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+ Back up my phrase
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/onboarding/recovery-key/recovery-key.scss b/src/app/pages/onboarding/recovery-key/recovery-key.scss
new file mode 100644
index 00000000000..51b1d975516
--- /dev/null
+++ b/src/app/pages/onboarding/recovery-key/recovery-key.scss
@@ -0,0 +1,71 @@
+ion-content {
+ --overflow: hidden;
+}
+ .recovery-key {
+ height: 100%;
+
+ &-info {
+ height: 100%;
+ display: flex;
+ flex-flow: column;
+ justify-content: flex-start;
+
+ .img-container {
+ display: flex;
+
+ img {
+ margin: auto;
+ max-height: 23rem;
+
+ @media (max-width: 768px) {
+ max-height: 18rem;
+ }
+
+ @media (max-width: 350px) {
+ max-height: 10rem;
+ }
+ }
+ }
+
+ .info {
+ padding: 20px 32px;
+
+ .title {
+ color: #060606;
+ font-weight: 600;
+ align-items: center;
+ text-align: center;
+ line-height: 34px;
+
+ @media (max-width: 768px) {
+ font-size: 20px;
+ line-height: 20px;
+ }
+
+ @media (max-width: 350px) {
+ font-size: 17px;
+ line-height: 20px;
+ }
+ }
+
+ .text {
+ font-size: 16px;
+ text-align: center;
+ color: rgba(0, 30, 46, 0.6);
+ font-weight: 300;
+ padding-top: 2px;
+ line-height: 25px;
+
+ @media (max-width: 768px) {
+ font-size: 14px;
+ line-height: 20px;
+ }
+
+ @media (max-width: 350px) {
+ font-size: 12px;
+ line-height: 15px;
+ }
+ }
+ }
+ }
+ }
\ No newline at end of file
diff --git a/src/app/pages/onboarding/recovery-key/recovery-key.ts b/src/app/pages/onboarding/recovery-key/recovery-key.ts
new file mode 100644
index 00000000000..65b7886173e
--- /dev/null
+++ b/src/app/pages/onboarding/recovery-key/recovery-key.ts
@@ -0,0 +1,109 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import {
+ ModalController,
+ NavController,
+ NavParams,
+ Platform
+} from '@ionic/angular';
+import { PlatformProvider, ProfileProvider, ThemeProvider } from 'src/app/providers';
+import { ActionSheetProvider } from 'src/app/providers/action-sheet/action-sheet';
+import { EventManagerService } from 'src/app/providers/event-manager.service';
+import { Logger } from 'src/app/providers/logger/logger';
+
+// Providers
+
+// Pages
+import { DisclaimerModal } from '../../includes/disclaimer-modal/disclaimer-modal';
+
+@Component({
+ selector: 'page-recovery-key',
+ templateUrl: 'recovery-key.html',
+ styleUrls: ['./recovery-key.scss']
+})
+export class RecoveryKeyPage {
+ private unregisterBackButtonAction;
+ public isOnboardingFlow: boolean;
+ public hideBackButton: boolean;
+ navParamsData;
+ themeCurrent: string;
+ constructor(
+ public navCtrl: NavController,
+ private logger: Logger,
+ private events: EventManagerService,
+ private actionSheetProvider: ActionSheetProvider,
+ private router: Router,
+ private modalCtrl: ModalController,
+ private themeProvider: ThemeProvider,
+ private profileProvider: ProfileProvider,
+ public platformProvider: PlatformProvider
+ ) {
+ this.themeCurrent = this.themeProvider.currentAppTheme;
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state
+ ? this.router.getCurrentNavigation().extras.state
+ : {};
+ } else {
+ this.navParamsData = history ? history.state : undefined;
+ }
+ if (this.navParamsData) {
+ this.isOnboardingFlow = this.navParamsData.isOnboardingFlow;
+ }
+ }
+
+ ngOnInit() {
+ this.logger.info('Loaded: RecoveryKeyPage');
+ }
+
+ ionViewWillLeave() {
+ this.unregisterBackButtonAction && this.unregisterBackButtonAction();
+ }
+
+ public async goToBackupKey(): Promise {
+ this.profileProvider.isDisclaimerAccepted().then(async onboardingState => {
+ if (onboardingState === 'UNFINISHEDONBOARDING') {
+ const modal = await this.modalCtrl.create({
+ component: DisclaimerModal,
+ backdropDismiss: false,
+ cssClass: 'fixscreen-modal'
+ });
+ await modal.present();
+ modal.onDidDismiss().then(({ data }) => {
+ if (data.isConfirm) {
+ this.router.navigate(['/backup-key'], {
+ state: {
+ keyId: this.navParamsData.keyId,
+ isOnboardingFlow: this.isOnboardingFlow,
+ walletId: this.navParamsData.walletId,
+ isNewSharedWallet: this.navParamsData.isNewSharedWallet
+ }
+ });
+ }
+ });
+ } else {
+ this.router.navigate(['/backup-key'], {
+ state: {
+ keyId: this.navParamsData.keyId,
+ isOnboardingFlow: this.isOnboardingFlow,
+ walletId: this.navParamsData.walletId,
+ isNewSharedWallet: this.navParamsData.isNewSharedWallet
+ }
+ });
+ }
+ });
+ }
+
+ public showInfoSheet() {
+ const infoSheet = this.actionSheetProvider.createInfoSheet(
+ 'backup-later-warning'
+ );
+ infoSheet.present();
+ infoSheet.onDidDismiss(option => {
+ if (option) {
+ this.router.navigate([''], { replaceUrl: true }).then(() => {
+ this.events.publish('Local/FetchWallets');
+ });
+ }
+ });
+ }
+}
diff --git a/src/app/pages/pages.ts b/src/app/pages/pages.ts
new file mode 100644
index 00000000000..70bd4d21826
--- /dev/null
+++ b/src/app/pages/pages.ts
@@ -0,0 +1,206 @@
+/* Pages */
+import { AddWalletPage } from '../pages/add-wallet/add-wallet';
+import { AddPage } from '../pages/add/add';
+import { CopayersPage } from '../pages/add/copayers/copayers';
+import { CreateWalletPage } from '../pages/add/create-wallet/create-wallet';
+import { ImportWalletPage } from '../pages/add/import-wallet/import-wallet';
+import { JoinWalletPage } from '../pages/add/join-wallet/join-wallet';
+import { SelectCurrencyPage } from '../pages/add/select-currency/select-currency';
+import { BackupGamePage } from '../pages/backup/backup-game/backup-game';
+import { BackupKeyPage } from '../pages/backup/backup-key/backup-key';
+import { ChooseFeeLevelModal } from '../pages/choose-fee-level/choose-fee-level';
+import { SendFeedbackPage } from '../pages/feedback/send-feedback/send-feedback';
+import { FinishModalPage } from '../pages/finish/finish';
+import { NewFeaturePage } from '../pages/new-feature/new-feature';
+import { AddFundsPage } from '../pages/onboarding/add-funds/add-funds';
+import { CollectEmailPage } from '../pages/onboarding/collect-email/collect-email';
+import { FeatureEducationPage } from '../pages/onboarding/feature-education/feature-education';
+import { LockMethodPage } from '../pages/onboarding/lock-method/lock-method';
+import { RecoveryKeyPage } from '../pages/onboarding/recovery-key/recovery-key';
+import { PaperWalletPage } from '../pages/paper-wallet/paper-wallet';
+import { SlideToAcceptPage } from '../pages/slide-to-accept/slide-to-accept';
+import { TxDetailsModal } from '../pages/tx-details/tx-details';
+import { TxpDetailsPage } from '../pages/txp-details/txp-details';
+import { SearchTxModalPage } from '../pages/wallet-details/search-tx-modal/search-tx-modal';
+import { WalletBalanceModal } from '../pages/wallet-details/wallet-balance/wallet-balance';
+import { WalletDetailsPage } from '../pages/wallet-details/wallet-details';
+
+/*Includes */
+import { CoinSelectorPage } from '../pages/includes/coin-selector/coin-selector';
+import { CreateNewWalletPage } from '../pages/includes/create-new-wallet/create-new-wallet';
+import { GravatarPage } from '../pages/includes/gravatar/gravatar';
+import { LotusDonationCard } from '../pages/includes/lotus-donation-card/lotus-donation-card';
+import { MultipleOutputsPage } from '../pages/includes/multiple-outputs/multiple-outputs';
+import { TxpPage } from '../pages/includes/txp/txp';
+
+/* Tabs */
+import { HomePage } from '../pages/home/home';
+import { ScanPage } from '../pages/scan/scan';
+import { SendPage } from '../pages/send/send';
+import { SettingsPage } from '../pages/settings/settings';
+import { WalletsPage } from '../pages/wallets/wallets';
+
+/* Home */
+import { ProposalsNotificationsPage } from '../pages/wallets/proposals-notifications/proposals-notifications';
+import { PricePage } from './home/price-page/price-page';
+
+/* Settings */
+import { FingerprintModalPage } from '../pages/fingerprint/fingerprint';
+import { PIN_COMPONENTS } from '../pages/pin/pin';
+import { AboutPage } from '../pages/settings/about/about';
+import { SessionLogPage } from '../pages/settings/about/session-log/session-log';
+import { AddressbookAddPage } from '../pages/settings/addressbook/add/add';
+import { AddressbookPage } from '../pages/settings/addressbook/addressbook';
+import { AddressbookViewPage } from '../pages/settings/addressbook/view/view';
+import { AdvancedPage } from '../pages/settings/advanced/advanced';
+import { AltCurrencyPage } from '../pages/settings/alt-currency/alt-currency';
+import { BitPayIdPage } from '../pages/settings/bitpay-id/bitpay-id';
+import { FeePolicyPage } from '../pages/settings/fee-policy/fee-policy';
+import { LanguagePage } from '../pages/settings/language/language';
+import { LocalThemePage } from '../pages/settings/local-theme/local-theme';
+import { LockPage } from '../pages/settings/lock/lock';
+import { NavigationPage } from '../pages/settings/navigation/navigation';
+import { NotificationsPage } from '../pages/settings/notifications/notifications';
+import { SharePage } from '../pages/settings/share/share';
+
+/* Wallet Group Settings */
+import { ClearEncryptPasswordPage } from '../pages/settings/key-settings/clear-encrypt-password/clear-encrypt-password';
+import { ExtendedPrivateKeyPage } from '../pages/settings/key-settings/extended-private-key/extended-private-key';
+import { KeyDeletePage } from '../pages/settings/key-settings/key-delete/key-delete';
+import { KeyNamePage } from '../pages/settings/key-settings/key-name/key-name';
+import { KeyOnboardingPage } from '../pages/settings/key-settings/key-onboarding/key-onboarding';
+import { KeyQrExportPage } from '../pages/settings/key-settings/key-qr-export/key-qr-export';
+import { KeySettingsPage } from '../pages/settings/key-settings/key-settings';
+
+/* Wallet Settings */
+import { WalletDeletePage } from '../pages/settings/wallet-settings/wallet-delete/wallet-delete';
+import { WalletNamePage } from '../pages/settings/wallet-settings/wallet-name/wallet-name';
+import { WalletSettingsPage } from '../pages/settings/wallet-settings/wallet-settings';
+import { WalletMnemonicRecoverPage } from './settings/advanced/wallet-recover-page/wallet-mnemonic-recover-page/wallet-mnemonic-recover-page';
+import { WalletRecoverPage } from './settings/advanced/wallet-recover-page/wallet-recover-page';
+
+/* Wallet Advanced Settings */
+import { AllAddressesPage } from '../pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/all-addresses/all-addresses';
+import { WalletAddressesPage } from '../pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/wallet-addresses';
+import { WalletDuplicatePage } from '../pages/settings/wallet-settings/wallet-settings-advanced/wallet-duplicate/wallet-duplicate';
+import { WalletExportPage } from '../pages/settings/wallet-settings/wallet-settings-advanced/wallet-export/wallet-export';
+import { WalletInformationPage } from '../pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information';
+import { WalletServiceUrlPage } from '../pages/settings/wallet-settings/wallet-settings-advanced/wallet-service-url/wallet-service-url';
+import { WalletTransactionHistoryPage } from '../pages/settings/wallet-settings/wallet-settings-advanced/wallet-transaction-history/wallet-transaction-history';
+
+/* Send */
+import { AmountPage } from '../pages/send/amount/amount';
+import { ConfirmPage } from '../pages/send/confirm/confirm';
+import { MultiSendPage } from '../pages/send/multi-send/multi-send';
+import { SelectInputsPage } from '../pages/send/select-inputs/select-inputs';
+import { SelectInputsSendPage } from '../pages/send/send-select-inputs/send-select-inputs';
+
+import { TransferToModalPage } from '../pages/send/transfer-to-modal/transfer-to-modal';
+import { TransferToPage } from '../pages/send/transfer-to/transfer-to';
+
+/* Receive */
+import { CustomAmountPage } from '../pages/receive/custom-amount/custom-amount';
+import { WideHeaderPage } from './templates/wide-header-page/wide-header-page';
+import { BackupWordComponent } from './backup/backup-component/backup-word/backup-word.component';
+import { DisclaimerModal } from './includes/disclaimer-modal/disclaimer-modal';
+import { TokenDetailsPage } from './token-details/token-details';
+import { ConfirmTokenPage } from './confirm-token/confirm-token';
+import { TokenInforPage } from './token-info/token-info';
+import { AccountsPage } from './accounts/accounts';
+import { SearchContactPage } from './search/search-contact/search-contact.component';
+
+export const PAGES = [
+ AddPage,
+ AddWalletPage,
+ AmountPage,
+ AddressbookPage,
+ AddressbookAddPage,
+ AddressbookViewPage,
+ AboutPage,
+ AdvancedPage,
+ AllAddressesPage,
+ AltCurrencyPage,
+ BitPayIdPage,
+ CreateWalletPage,
+ CreateNewWalletPage,
+ CopayersPage,
+ SelectInputsPage,
+ SelectInputsSendPage,
+ LotusDonationCard,
+ SharePage,
+ ImportWalletPage,
+ JoinWalletPage,
+ BackupGamePage,
+ BackupWordComponent,
+ BackupKeyPage,
+ ConfirmPage,
+ MultiSendPage,
+ SearchContactPage,
+ TransferToModalPage,
+ TransferToPage,
+ CustomAmountPage,
+ AddFundsPage,
+ FeatureEducationPage,
+ LockMethodPage,
+ RecoveryKeyPage,
+ CollectEmailPage,
+ // ...GIFT_CARD_PAGES,
+ GravatarPage,
+ FingerprintModalPage,
+ HomePage,
+ // CardsPage,
+ WalletsPage,
+ AccountsPage,
+ TokenDetailsPage,
+ TokenInforPage,
+ ConfirmTokenPage,
+ FeePolicyPage,
+ LanguagePage,
+ LockPage,
+ MultipleOutputsPage,
+ PaperWalletPage,
+ ...PIN_COMPONENTS,
+ PricePage,
+ ProposalsNotificationsPage,
+ ScanPage,
+ SendPage,
+ SettingsPage,
+ SelectCurrencyPage,
+ NotificationsPage,
+ SearchTxModalPage,
+ SessionLogPage,
+ SendFeedbackPage,
+ FinishModalPage,
+ TxpDetailsPage,
+ TxDetailsModal,
+ TxpPage,
+ WalletSettingsPage,
+ WalletDeletePage,
+ WalletNamePage,
+ WalletInformationPage,
+ WalletAddressesPage,
+ WalletExportPage,
+ WalletServiceUrlPage,
+ WalletTransactionHistoryPage,
+ WalletDuplicatePage,
+ ExtendedPrivateKeyPage,
+ ClearEncryptPasswordPage,
+ KeyDeletePage,
+ KeyQrExportPage,
+ KeySettingsPage,
+ KeyNamePage,
+ KeyOnboardingPage,
+ WalletDetailsPage,
+ WalletRecoverPage,
+ WalletMnemonicRecoverPage,
+ WalletBalanceModal,
+ ChooseFeeLevelModal,
+ WideHeaderPage,
+ CoinSelectorPage,
+ DisclaimerModal,
+ SlideToAcceptPage,
+ LocalThemePage,
+ NavigationPage,
+ NewFeaturePage,
+ // Phases: card pages
+];
diff --git a/src/app/pages/paper-wallet/paper-wallet.html b/src/app/pages/paper-wallet/paper-wallet.html
new file mode 100644
index 00000000000..934126b230c
--- /dev/null
+++ b/src/app/pages/paper-wallet/paper-wallet.html
@@ -0,0 +1,43 @@
+
+
+ {{'Sweep paper wallet' | translate}}
+
+
+
+
+
+ Funds found:
+
+
+
+
+
+ {{'Sweep' | translate}}
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/paper-wallet/paper-wallet.scss b/src/app/pages/paper-wallet/paper-wallet.scss
new file mode 100644
index 00000000000..0edeb3ca1f8
--- /dev/null
+++ b/src/app/pages/paper-wallet/paper-wallet.scss
@@ -0,0 +1,10 @@
+page-paper-wallet {
+ .message {
+ text-align: center;
+ background: var(--color-warning);
+ color: white;
+ }
+ .title {
+ padding: 10px;
+ }
+}
diff --git a/src/pages/paper-wallet/paper-wallet.ts b/src/app/pages/paper-wallet/paper-wallet.ts
similarity index 84%
rename from src/pages/paper-wallet/paper-wallet.ts
rename to src/app/pages/paper-wallet/paper-wallet.ts
index d01b758cb1c..eda2d9e0770 100644
--- a/src/pages/paper-wallet/paper-wallet.ts
+++ b/src/app/pages/paper-wallet/paper-wallet.ts
@@ -1,8 +1,7 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, ViewEncapsulation } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
-import { ModalController, NavController, NavParams } from 'ionic-angular';
import * as _ from 'lodash';
-
+import { Location } from '@angular/common';
// pages
import { FinishModalPage } from '../finish/finish';
@@ -10,11 +9,7 @@ import { FinishModalPage } from '../finish/finish';
import { ActionSheetProvider } from '../../providers/action-sheet/action-sheet';
import { BwcErrorProvider } from '../../providers/bwc-error/bwc-error';
import { BwcProvider } from '../../providers/bwc/bwc';
-import {
- Coin,
- CoinsMap,
- CurrencyProvider
-} from '../../providers/currency/currency';
+
import { FeeProvider } from '../../providers/fee/fee';
import { Logger } from '../../providers/logger/logger';
import { OnGoingProcessProvider } from '../../providers/on-going-process/on-going-process';
@@ -22,10 +17,15 @@ import { PlatformProvider } from '../../providers/platform/platform';
import { PopupProvider } from '../../providers/popup/popup';
import { ProfileProvider } from '../../providers/profile/profile';
import { WalletOptions, WalletProvider } from '../../providers/wallet/wallet';
+import { Coin, CoinsMap, CurrencyProvider } from 'src/app/providers/currency/currency';
+import { IonRouterOutlet, ModalController, NavController, NavParams } from '@ionic/angular';
+import { Router } from '@angular/router';
@Component({
selector: 'page-paper-wallet',
- templateUrl: 'paper-wallet.html'
+ templateUrl: 'paper-wallet.html',
+ styleUrls: ['/paper-wallet.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class PaperWalletPage {
@ViewChild('slideButton')
@@ -52,7 +52,7 @@ export class PaperWalletPage {
// Platform info
public isCordova: boolean;
-
+ navParamsData
constructor(
private actionSheetProvider: ActionSheetProvider,
private navCtrl: NavController,
@@ -68,12 +68,22 @@ export class PaperWalletPage {
private translate: TranslateService,
private platformProvider: PlatformProvider,
private bwcErrorProvider: BwcErrorProvider,
- private currencyProvider: CurrencyProvider
+ private currencyProvider: CurrencyProvider,
+ private router: Router,
+ private location: Location,
+ protected routerOutlet: IonRouterOutlet
) {
+ if (this.router.getCurrentNavigation()) {
+ this.navParamsData = this.router.getCurrentNavigation().extras.state ? this.router.getCurrentNavigation().extras.state : {};
+ } else {
+ this.navParamsData = history ? history.state : {};
+ }
+ if (_.isEmpty(this.navParamsData) && this.navParams && !_.isEmpty(this.navParams.data)) this.navParamsData = this.navParams.data;
+
this.bitcore = this.bwcProvider.getBitcore();
this.isCordova = this.platformProvider.isCordova;
this.isOpenSelector = false;
- this.scannedKey = this.navParams.data.privateKey;
+ this.scannedKey = this.navParamsData.privateKey;
this.isPkEncrypted = this.scannedKey
? this.scannedKey.substring(0, 2) == '6P'
: null;
@@ -101,11 +111,11 @@ export class PaperWalletPage {
}
ionViewWillLeave() {
- this.navCtrl.swipeBackEnabled = true;
+ this.routerOutlet.swipeGesture = true;
}
ionViewWillEnter() {
- this.navCtrl.swipeBackEnabled = false;
+ this.routerOutlet.swipeGesture = false;
}
ionViewDidEnter() {
@@ -113,10 +123,10 @@ export class PaperWalletPage {
this.popupProvider
.ionicAlert(
'Error',
- this.translate.instant('No wallets available to receive funds')
+ this.translate.instant('No accounts available to receive funds')
)
.then(() => {
- this.navCtrl.pop();
+ this.location.back();
});
return;
}
@@ -135,7 +145,7 @@ export class PaperWalletPage {
};
this.popupProvider.ionicPrompt(null, message, opts).then(res => {
if (res === null) {
- this.navCtrl.popToRoot();
+ this.router.navigate(['']);
return;
}
this.passphrase = res;
@@ -224,7 +234,7 @@ export class PaperWalletPage {
this.popupProvider
.ionicAlert('Error', this.translate.instant('No funds found'))
.then(() => {
- this.navCtrl.pop();
+ this.location.back()
});
}
})
@@ -237,7 +247,7 @@ export class PaperWalletPage {
this.bwcErrorProvider.msg(err)
)
.then(() => {
- this.navCtrl.pop();
+ this.location.back()
});
});
}
@@ -307,9 +317,9 @@ export class PaperWalletPage {
this.onGoingProcessProvider.clear();
this.logger.debug(
'Success sweep. Destination address:' +
- data.destinationAddress +
- ' - transaction id: ' +
- data.txid
+ data.destinationAddress +
+ ' - transaction id: ' +
+ data.txid
);
this.openFinishModal();
})
@@ -347,19 +357,20 @@ export class PaperWalletPage {
});
}
- private openFinishModal(): void {
+ private async openFinishModal() {
let finishComment = this.translate.instant(
'Check the transaction on your wallet details'
);
let finishText = this.translate.instant('Sweep Completed');
- let modal = this.modalCtrl.create(
- FinishModalPage,
- { finishText, finishComment },
- { showBackdrop: true, enableBackdropDismiss: false }
- );
- modal.present();
- modal.onDidDismiss(() => {
- this.navCtrl.popToRoot();
+ let modal = await this.modalCtrl.create({
+ component: FinishModalPage,
+ componentProps: { finishText, finishComment },
+ showBackdrop: true,
+ backdropDismiss: false
+ });
+ await modal.present();
+ modal.onDidDismiss().then(() => {
+ this.router.navigate(['']);
});
}
}
diff --git a/src/pages/pin/pin-dots/pin-dots.component.ts b/src/app/pages/pin/pin-dots/pin-dots.component.ts
similarity index 90%
rename from src/pages/pin/pin-dots/pin-dots.component.ts
rename to src/app/pages/pin/pin-dots/pin-dots.component.ts
index c4b56516159..ea9f7220696 100644
--- a/src/pages/pin/pin-dots/pin-dots.component.ts
+++ b/src/app/pages/pin/pin-dots/pin-dots.component.ts
@@ -3,7 +3,8 @@ import {
Input,
QueryList,
SimpleChanges,
- ViewChildren
+ ViewChildren,
+ ViewEncapsulation
} from '@angular/core';
import { Animate } from './../../../directives/animate/animate';
@@ -17,7 +18,9 @@ import { Animate } from './../../../directives/animate/animate';
[ngClass]="{ filled: isFilled(i + 1) }"
animate
>
- `
+ `,
+ styleUrls: ['pin-dots.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class PinDots {
public dotArray = new Array(4);
diff --git a/src/app/pages/pin/pin-dots/pin-dots.scss b/src/app/pages/pin/pin-dots/pin-dots.scss
new file mode 100644
index 00000000000..75a03cd6a97
--- /dev/null
+++ b/src/app/pages/pin/pin-dots/pin-dots.scss
@@ -0,0 +1,22 @@
+pin-dots {
+ display: flex;
+ justify-content: space-between;
+ max-width: 145px;
+ margin: 0 auto auto auto;
+ width: 50%;
+ padding-top: 33px;
+ .circle {
+ --circle-diameter: 18px;
+ --transition-duration: 200ms;
+ border-radius: 50%;
+ transition: background-color var(--transition-duration) ease,
+ border var(--transition-duration) ease;
+ background-color: transparent;
+ border: 1px solid var(--color-primary);
+ height: var(--circle-diameter);
+ width: var(--circle-diameter);
+ }
+ .filled {
+ background-color: var(--color-primary);
+ }
+}
diff --git a/src/app/pages/pin/pin-modal/pin-modal.html b/src/app/pages/pin/pin-modal/pin-modal.html
new file mode 100644
index 00000000000..a880e67e8e4
--- /dev/null
+++ b/src/app/pages/pin/pin-modal/pin-modal.html
@@ -0,0 +1,20 @@
+
-
\ No newline at end of file
diff --git a/src/app/components/price-chart/price-chart.scss b/src/app/components/price-chart/price-chart.scss
new file mode 100644
index 00000000000..57d54963d1a
--- /dev/null
+++ b/src/app/components/price-chart/price-chart.scss
@@ -0,0 +1,30 @@
+.container {
+ ion-spinner {
+ z-index: 99;
+ position: fixed;
+ top: 25%;
+ left: 50%;
+ margin-top: -1.4rem;
+ margin-left: -1.4rem;
+
+ * {
+ stroke: var(--color-primary);
+ }
+ }
+}
+
+apx-chart {
+
+ .apexcharts-tooltip,
+ .apexcharts-xaxistooltip-bottom:before,
+ .apexcharts-xaxistooltip-bottom:after,
+ .apexcharts-xaxistooltip {
+ display: none !important;
+ }
+}
+
+::ng-deep apx-chart {
+ .apexcharts-tooltip {
+ box-shadow: none !important;
+ }
+}
\ No newline at end of file
diff --git a/src/components/price-chart/price-chart.ts b/src/app/components/price-chart/price-chart.ts
similarity index 86%
rename from src/components/price-chart/price-chart.ts
rename to src/app/components/price-chart/price-chart.ts
index 58a4a124c94..b0a68031e9b 100644
--- a/src/components/price-chart/price-chart.ts
+++ b/src/app/components/price-chart/price-chart.ts
@@ -2,7 +2,8 @@ import { Component, EventEmitter, Output, ViewChild } from '@angular/core';
import { ChartComponent } from '../chart-component/chart-component';
@Component({
selector: 'price-chart',
- templateUrl: 'price-chart.html'
+ templateUrl: 'price-chart.html',
+ styleUrls: ['price-chart.scss'],
})
export class PriceChart {
@ViewChild('chart') chart: ChartComponent;
@@ -24,9 +25,9 @@ export class PriceChart {
}
],
chart: {
- type: 'line',
+ type: 'area',
stacked: false,
- height: 350,
+ height: 475,
toolbar: {
show: false
},
@@ -56,11 +57,12 @@ export class PriceChart {
}
},
tooltip: {
+ theme: 'drak',
followCursor: true,
shared: false,
x: {
show: false
- }
+ },
},
grid: {
padding: {
@@ -82,6 +84,9 @@ export class PriceChart {
}
},
xaxis: {
+ tooltip: {
+ enabled: false
+ },
labels: {
show: false
},
@@ -107,14 +112,21 @@ export class PriceChart {
stroke: {
colors: [color],
curve: 'straight',
- width: 2
+ width: 1
},
theme: {
monochrome: {
enabled: true,
color
}
- }
+ },
+ fill : {
+ colors: [color],
+ gradient: {
+ gradientToColors: [color],
+ opacityTo: 0.2,
+ }
+ },
};
}
}
diff --git a/src/app/components/recipient/recipient.component.html b/src/app/components/recipient/recipient.component.html
new file mode 100644
index 00000000000..c6c7b1d59ca
--- /dev/null
+++ b/src/app/components/recipient/recipient.component.html
@@ -0,0 +1,73 @@
+
+ 
+
+{{'RECIPIENT' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+ {{'Transfer to' | translate}}
+
+
+ {{'Max' | translate}}
+
+ {{'Amount' | translate}}
+{{'Specific amount request' | translate}}
+ +{{recipient.altAmountStr}} {{alternativeUnit}}
+
+ {{'Send total selected amount' | translate}}
+
+
+
\ No newline at end of file
diff --git a/src/app/components/recipient/recipient.component.scss b/src/app/components/recipient/recipient.component.scss
new file mode 100644
index 00000000000..2877b2ca6f3
--- /dev/null
+++ b/src/app/components/recipient/recipient.component.scss
@@ -0,0 +1,169 @@
+recipient-component {
+
+ input[type=number]::-webkit-inner-spin-button,
+ input[type=number]::-webkit-outer-spin-button {
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+ margin: 0;
+ }
+
+ .recipient-header {
+ font-weight: 600;
+ color: rgba(0, 30, 46, 0.6);
+ display: flex;
+ justify-content: space-between;
+
+ .x-button {
+ cursor: pointer;
+ }
+ }
+
+ .recipient-content-wrapper {
+ background: #FAFAFB;
+ border-radius: 12px;
+ margin-bottom: 20px;
+
+ .recipient-content {
+ padding-left: 16px;
+ padding-top: 18px;
+ padding-bottom: 16px;
+ padding-right: 16px;
+
+ .title {
+ font-weight: 600;
+ font-size: 14px;
+ color: rgba(0, 30, 46, 1);
+ }
+
+ .transfer-to-header {
+ display: flex;
+ justify-content: space-between;
+ padding-bottom: 13px;
+ img {
+ cursor: pointer;
+ color: #00658D;
+ }
+ p {
+ margin: 0;
+ }
+ }
+
+ .search-address-wrapper,
+ .amount-wrapper {
+ --border-color: rgba(0, 30, 46, 0.38);
+ --border-width: 2px;
+ --border-style: solid;
+ --border-radius: 4px;
+ --background: transparent;
+ --highlight-color-focused: rgba(0, 30, 46, 0.38);
+ --highlight-color-valid: rgba(0, 30, 46, 0.38);
+ --highlight-color-invalid: rgba(0, 30, 46, 0.38);
+
+ ion-input {
+ --placeholder-color: rgba(0, 30, 46, 0.38);
+ --color: #001E2E;
+ font-size: 16px;
+ }
+
+ .scan-icon {
+ width: 20px;
+ height: 20px;
+ margin-right: 0px;
+ }
+
+ .erase-icon {
+ width: 14px;
+ cursor: pointer;
+ }
+
+ .transfer-to-input {
+ cursor: pointer;
+ }
+ }
+
+ .bold-text {
+ color: #00658D;
+ font-weight: 600;
+ font-size: 16px;
+
+ }
+
+ .amount-header {
+ padding: 38px 0 13px 0;
+ display: flex;
+ flex-flow: row;
+ justify-content: space-between;
+ p {
+ margin: 0;
+ }
+ }
+
+ .max-text {
+ cursor: pointer;
+ }
+
+ .unit-alt-text {
+ font-size: 12px;
+ color: rgba(0, 30, 46, 0.6);
+ margin-top: 5px;
+ margin-left: 18px;
+ margin-bottom: 0;
+ }
+ }
+ }
+ .say-thank-wrapper {
+ background: url('../../../assets/img/bg-donate-card.svg') no-repeat 100% !important;
+ padding-bottom: 2rem;
+ background-size: cover !important;
+ .title-account {
+ color: #E0E4E6;
+ }
+ }
+
+ .say-thanks {
+ padding-bottom: 1rem;
+ }
+
+ .say-thanks {
+ .title-thanks {
+ font-size: 22px;
+ line-height: 28px;
+ color: #EDEFF0;
+ }
+
+ .receiveLotus {
+ padding-top: .5rem;
+ font-size: 12px;
+ color: #73DAA5;
+ }
+
+ .messages {
+ padding-top: .5rem;
+ font-size: 12px;
+ color: #EDEFF0;
+ opacity: .6;
+ }
+
+}
+
+ .selected-amount {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+
+ ion-label {
+ flex: unset;
+ padding-right: 1rem;
+ }
+ }
+
+ .disabled {
+ color: var(--grey-text);
+ }
+
+ .item-title {
+ color: var(--grey-text);
+ font-size: 14px;
+ }
+}
\ No newline at end of file
diff --git a/src/app/components/recipient/recipient.component.spec.ts b/src/app/components/recipient/recipient.component.spec.ts
new file mode 100644
index 00000000000..38e20bfe94c
--- /dev/null
+++ b/src/app/components/recipient/recipient.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { RecipientComponent } from './recipient.component';
+
+describe('RecipientComponent', () => {
+ let component: RecipientComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'Appreciate!' | translate}}
+ {{receiveLotus}}
+
+
+
+
+ {{'Receiving account' | translate}}
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ {{wallet?.name}}
+
+ Auditable
+
+
+ Multisig {{
+ wallet?.credentials?.m }}-{{ wallet?.credentials?.n }}
+ Multisig {{
+ wallet?.m }}-{{ wallet?.n }}
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ******
+
+ ~ {{getAlternativeBalance()}} {{wallet?.cachedStatus.alternativeIsoCode}}
+
+
+ ******
+
+
+
+
+
+
+
+
+
+
+
+ {{(address | slice:-8)}}
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{token?.tokenInfo?.name}}
+
+ Auditable
+
+
+ Multisig {{
+ wallet?.credentials?.m }}-{{ wallet?.credentials?.n }}
+ Multisig {{
+ wallet?.m }}-{{ wallet?.n }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ******
+
+
+
+ ~ {{formatTxAmount(token.alternativeBalance)}} {{wallet?.cachedStatus.alternativeIsoCode}}
+
+
+ ******
+
+
+
+
+
+
+
+ {{(wallet?.etokenAddress | slice:-8)}}
+
+
+
+
+ {{ wallet?.name }}
+
+ {{wallet?.coin | uppercase}}
+
+ Multisig {{ wallet?.credentials?.m }}-{{ wallet?.credentials?.n }}
+ Multisig {{ wallet?.m }}-{{ wallet?.n }}
+
+
+
+
+
+
+ {{ 'waiting for copayers' | translate }}
+ {{'Needs Backup' | translate}}
+
+
+
+ {{ isShowBalance ? getBalance(wallet, wallet?.coin.toUpperCase()) : '******'}}
+
+ ~ {{ isShowBalance ? this.symbolCurrency+getAlternativeBalance(wallet, wallet?.coin.toUpperCase()) : '******'}}
+
+
+ ******
+
+
+
+
+
+ Address
+
+
+
+
+
+
+
+
+
+
+
+
+ eCash Address
+
+
+ Etoken Address
+
+
+
+
+
+
+ {{' Depositing any other crypto asset besides {coin} to this address may result in the total loss of your funds. AbcPay is not responsible for any funds loss due to the deposit of a different asset, wallet or network. ' | translate: {coin: wallet.coin.toUpperCase() } }}
+
+
+
+ {{' Depositing any other crypto asset besides {coin} to this address may result in the total loss of your funds. AbcPay is not responsible for any funds loss due to the deposit of a different asset, wallet or network. ' | translate: {coin: wallet.coin.toUpperCase() } }}
+
+
+
+
+ {{'Generate New Address' | translate}}
+
+
+
+ 
+
+
+
+ Something goes wrong...
+
+
+
+
+
+
+
+ {{ address }}
+
+
+ Loading address...
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+ {{ walletsByKey[0].walletGroupName }}
+
+
+
+
+
+
+
+
+
+
+ {{ coinbaseData.user.name }}'s Coinbase Account
+
+
+
+
+
+ {{ac.name}}
+
+
+
+
+
+
+ {{ac.balance.amount | number:'1.2-8'}}
+
+ {{ ac.nativeCurrencyStr }}
+
+
+ {{'No accounts available' | translate}}
+
+
+ {{ name }}
+
\ No newline at end of file
diff --git a/src/app/explore-container/explore-container.component.scss b/src/app/explore-container/explore-container.component.scss
new file mode 100644
index 00000000000..8993e7ca03b
--- /dev/null
+++ b/src/app/explore-container/explore-container.component.scss
@@ -0,0 +1,27 @@
+#container {
+ text-align: center;
+
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 50%;
+ transform: translateY(-50%);
+}
+
+#container strong {
+ font-size: 20px;
+ line-height: 26px;
+}
+
+#container p {
+ font-size: 16px;
+ line-height: 22px;
+
+ color: #8c8c8c;
+
+ margin: 0;
+}
+
+#container a {
+ text-decoration: none;
+}
\ No newline at end of file
diff --git a/src/app/explore-container/explore-container.component.spec.ts b/src/app/explore-container/explore-container.component.spec.ts
new file mode 100644
index 00000000000..77e2dd292e1
--- /dev/null
+++ b/src/app/explore-container/explore-container.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ExploreContainerComponent } from './explore-container.component';
+
+describe('ExploreContainerComponent', () => {
+ let component: ExploreContainerComponent;
+ let fixture: ComponentFixtureExplore UI Components
+
+ {{ titlePage| translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getWalletGroup(walletGroup[0]?.keyId).name }}
+
+
+
+
+
+
+ Read Only Accounts
+
+
+
+ Before retrieving your accounts addresses, it's recommended that you first write down your
+ recovery phrase and store it securely so that your accounts can be recovered in the case your device was lost
+ or stolen.
+
+ Backup now +
+ + Backup now +
+
+
+
+
+
+
+
+ {{walletsGroup.length}} Accounts
+
+
+
+
+
+ Don't see your Key?
+
+
+
+ Create New Key
+
+
+
+{{getWalletGroup(walletsGroup[0].keyId).name}}
+ Read Only Accounts
+
+
+ Legacy accounts created before 9/15 can't support additional wallets being added.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{isZeroState ? ('New Key' | translate) : ('Simple Account' | translate) }}
+ Quick and easy setup
+ Shared Account
+ Requires multiple devices (most secure)
+ Join Shared Account
+ Requires invitation to join
+ Import Account
+ Recover your account using your passphrase
+
+ {{titlePage | translate}}
+
+
+ {{'(Shared account)' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'Me'|translate}}
+ {{copayer.name}}
+
+
+
+
+
+
+
+ {{'Waiting'|translate}}
+
+
+
+
+
+
+
+
+ {{ 'Share this invitation' | translate }}
+
+
+
+
+
+Wallet incomplete and broken
+Delete it and create a new one
+
+ {{ 'Create {coinLabel} Account' | translate: {coinLabel: coin.toUpperCase()} }}
+
+
+
+
+
+
+
+ {{ 'Recovery Phrase' | translate }}
+
+
+ {{ 'File/Text' | translate }}
+
+
+
+
+
+
+
+ Import
+
+
+
+
+ {{'Join Shared Account' | translate}}
+
+
+
+
+
+
+
+
+ Tokens
+
+
+
+
+
+
+
+
+
+ {{ coin.toUpperCase() }}
+ {{ getCoinName(coin) }} +Only available for already created keys
+ Try "create new wallet" option instead
+ {{ token.name }} ({{ token.symbol }})
+
+
+
+
+
+
+
+
+
+
+
+ Tokens
+
+
+
+
+ {{ token.name }} ({{ token.symbol }})
+
+
+
+
+
+ {{ coin.toUpperCase() }}
+ {{ getCoinName(coin) }} +
+
+
+ {{isOnboardingFlow ? 'Continue' : 'Create' | translate}}
+
+
+ {{ 'Import existing account' | translate }}
+
+
+
+
+
+
+ {{i+1}}
+ {{word.word}}
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/backup/backup-component/backup-word/backup-word.component.scss b/src/app/pages/backup/backup-component/backup-word/backup-word.component.scss
new file mode 100644
index 00000000000..e839dc08997
--- /dev/null
+++ b/src/app/pages/backup/backup-component/backup-word/backup-word.component.scss
@@ -0,0 +1,43 @@
+.word-alignment {
+ width: 100%;
+ .notification-container {
+ display: flex;
+ margin-bottom: 36px;
+ padding: 12px 18px;
+ background: #ffddb6;
+ border-radius: 8px;
+ color: #482a00;
+ font-size: 14px;
+ .notification-content {
+ margin-left: 10px;
+ }
+ }
+ .word {
+ background: white;
+ color: black;
+ border-radius: 4px;
+ .mat-grid-tile-content {
+ justify-content: flex-start !important;
+ }
+
+ width: 100px;
+ .word-number {
+ padding: 8px;
+ font-size: 11px;
+ position: relative;
+ bottom: 2px;
+ color: rgba(0, 30, 46, 0.6);
+ }
+
+ .word-letter {
+ font-size: 14px;
+ font-weight: 600;
+ }
+ }
+ .blur {
+ filter: blur(3px);
+ }
+ .wrong {
+ background: red !important;
+ }
+}
diff --git a/src/app/pages/backup/backup-component/backup-word/backup-word.component.ts b/src/app/pages/backup/backup-component/backup-word/backup-word.component.ts
new file mode 100644
index 00000000000..15752faa897
--- /dev/null
+++ b/src/app/pages/backup/backup-component/backup-word/backup-word.component.ts
@@ -0,0 +1,17 @@
+import { Component, Input, NgZone, OnInit, ViewEncapsulation } from '@angular/core';
+import { BackupWordModel } from './backup-word.model';
+
+@Component({
+ selector: 'app-backup-word',
+ templateUrl: './backup-word.component.html',
+ styleUrls: ['./backup-word.component.scss'],
+ encapsulation: ViewEncapsulation.None,
+})
+export class BackupWordComponent implements OnInit {
+ @Input()
+ mnemonicWords: BackupWordModel[];
+ isShow = false;
+ constructor() { }
+
+ ngOnInit() { }
+}
diff --git a/src/app/pages/backup/backup-component/backup-word/backup-word.model.ts b/src/app/pages/backup/backup-component/backup-word/backup-word.model.ts
new file mode 100644
index 00000000000..001247d1101
--- /dev/null
+++ b/src/app/pages/backup/backup-component/backup-word/backup-word.model.ts
@@ -0,0 +1,11 @@
+export class BackupWordModel {
+ public word: string;
+ public isBlur: boolean;
+ public isCorrect: boolean;
+
+ constructor(data) {
+ this.word = data.word || "";
+ this.isBlur = data.isBlur || false;
+ this.isCorrect = data.isCorrect || false;
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/backup/backup-game/backup-game.html b/src/app/pages/backup/backup-game/backup-game.html
new file mode 100644
index 00000000000..cf6576f752c
--- /dev/null
+++ b/src/app/pages/backup/backup-game/backup-game.html
@@ -0,0 +1,21 @@
+
+
+
+
+ Verify your phrase
+ Let check your wrote down the phrase correctly. Please select each word in the numbered order.
+
+
+
+ Word #{{countWord+1 > 12 ? 12 : countWord+1}}
+
+
+
+ {{word}}
+
+
+
+
+
+
+
+
+
+ Your recovery phrase
+ Your recovery key is composed of 12 randomly selected words. Please carefully write down
+ each word in the order it appears.
+
+ 
+
+
+
+ Never share your recovery phrase with anyone, store it securely !
+
+
+
+
+
+ {{'Continue' | translate}}
+
+
+
+
+
+ Testnet
+
+
+
+
+
+
+ {{ feeProvider.getFeeOpts(coin)[fee.level] | translate }}
+ {{fee.feePerSatByte}} {{ feeUnit }}
+
+
+
+
+ Average confirmation time:
+
+ ...
+
+ {{ isERCToken ? fee.avgConfirmationTime : (fee.avgConfirmationTime | amDuration: 'minute') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'Enter custom fee in {feeUnit}' | translate: { feeUnit: feeUnit } }}:
+
+
+ {{'Apply' | translate}}
+
+
+
+ {{ 'Custom fee' | translate }}
+
+ Transactions without fee are not supported.
+
+
+ Your fee is lower than recommended.
+ You should not set a fee higher than {{maxFeeRecommended}} {{feeUnit}}.
+
+
+
+
+
+
+
+
+
+
+
+
+ {{wallet.name}} Token
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{amountTokenToSend}} {{token?.tokenInfo?.symbol | uppercase}}
+
+
+
+
+
+
+ Subtotal
+
+ {{amountTokenToSend}} {{token?.tokenInfo?.symbol | uppercase}}
+
+
+
+
+ Miner fee
+
+
+
+
+
+
+
+ ...
+
+
+ {{fee}} {{wallet.coin | uppercase}}
+
+
+
+ 0.00 USD
+
+ ·
+
+ 0.00%
+ of total amount
+
+
+
+
+
+ Sending from
+
+
+ Sending to
+
+
+ {{ sendToAddress.slice(-8) }}
+
+
+
+
+
+
+ {{buttonText}}
+
+
+
+
+
+
+
+ Write a Review
+
+
+
+
+ Share with friends
+
+
+
+
+ Request a Feature
+
+
+
+
+ Report an Issue
+
+
+
+
+
+
+
+
+
+ {{reaction}}
+
+
+ 
+ 
+ 
+
+
+
+
+ {{comment}}
+
+
+
+ 
+
+
+
+ {{'Tap to unlock App' | translate}}
+
+
+
+
+
+
+
+
+ 
+ {{ 'Home' | translate }}
+
+ 
+
+
+
+ {{ 'Home' | translate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+ Total cash value
+
+
+ {{ totalBalanceAlternative | number:'1.2-2'}} {{totalBalanceAlternativeIsoCode}}
+
+
+
+
+
+
+ +{{ totalBalanceChange | number: '1.2-2' }}%
+
+ (1D)
+
+
+
+
+ Exchange Rates
+ (1D)
+
+
+
+
+
+
+
+ {{ card.unitCode | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ {{ option.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{ description }}
+ {{ coin.toUpperCase() }}
+ {{ getCoinName(coin) }} +
+
diff --git a/src/app/pages/includes/create-new-wallet/create-new-wallet.scss b/src/app/pages/includes/create-new-wallet/create-new-wallet.scss
new file mode 100644
index 00000000000..160eda2fa3f
--- /dev/null
+++ b/src/app/pages/includes/create-new-wallet/create-new-wallet.scss
@@ -0,0 +1,43 @@
+create-new-wallet {
+ .create-new-wallet-container {
+ height: 80vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ .zero-state-image {
+ text-align: center;
+ img {
+ width: 55%;
+ }
+ }
+ .card-title {
+ font-weight: 600;
+ font-size: 22px;
+ line-height: 28px;
+ color: #001E2E;
+ text-align: center;
+ margin: 0.5rem;
+ margin-top: 2rem;
+ }
+ .card-body {
+ font-weight: 400;
+ font-size: 16px;
+ line-height: 24px;
+ text-align: center;
+ letter-spacing: 0.5px;
+ color: rgba(0, 30, 46, 0.6);
+ margin: 0.5rem;
+ }
+ .card-btn {
+ text-align: center;
+ margin-top: 2rem;
+ .button-standard {
+ width: 33%;
+ --border-radius: 100px;
+ font-weight: 600;
+ line-height: 22px;
+ letter-spacing: 0.1px;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/includes/create-new-wallet/create-new-wallet.ts b/src/app/pages/includes/create-new-wallet/create-new-wallet.ts
new file mode 100644
index 00000000000..f4d5ae04af6
--- /dev/null
+++ b/src/app/pages/includes/create-new-wallet/create-new-wallet.ts
@@ -0,0 +1,24 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+import { ThemeProvider } from 'src/app/providers';
+
+@Component({
+ selector: 'create-new-wallet',
+ templateUrl: 'create-new-wallet.html',
+ styleUrls:[ 'create-new-wallet.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class CreateNewWalletPage {
+ public currentTheme;
+
+ constructor(
+ private router: Router,
+ private themeProvider: ThemeProvider
+ ) {
+ this.currentTheme = this.themeProvider.currentAppTheme;
+ }
+
+ public goToAddWalletPage() {
+ this.router.navigate(['/select-currency'], {state: {isZeroState: true}})
+ }
+}
diff --git a/src/app/pages/includes/disclaimer-modal/disclaimer-modal.html b/src/app/pages/includes/disclaimer-modal/disclaimer-modal.html
new file mode 100644
index 00000000000..01b3f8243e5
--- /dev/null
+++ b/src/app/pages/includes/disclaimer-modal/disclaimer-modal.html
@@ -0,0 +1,41 @@
+
+ 
+
+
+ Create or import a account
+ Take control of your crypto
+
+ Get Started
+
+
+ Important
+
+
+
+
+
+
+
+
+
+
+
+
+ {{appName}} cannot recovery your fund for you if you lose your recovery key. The loss of it will lead to permanent asset loss.
+
+
+
+
+
+
+
+
+ Once the App is deleted, the account data will be all deleted.
+
+
+
+
+
+
+
+
+ Please backup the recovery phrase in the secure environment. Make sure there is no third party or camera around you during the back-up.
+
+
+ I understood
+
+
diff --git a/src/app/pages/includes/disclaimer-modal/disclaimer-modal.scss b/src/app/pages/includes/disclaimer-modal/disclaimer-modal.scss
new file mode 100644
index 00000000000..d3c64220f0a
--- /dev/null
+++ b/src/app/pages/includes/disclaimer-modal/disclaimer-modal.scss
@@ -0,0 +1,87 @@
+::ng-deep ion-modal {
+ &::part(content) {
+ height: 53%;
+ margin: auto 2rem;
+ border-radius: 28px;
+ }
+}
+disclaimer-modal {
+ padding: 24px 0;
+ background: linear-gradient(0deg, rgba(0, 101, 141, 0.11), rgba(0, 101, 141, 0.11)), #FAFAFB;
+ .title{
+ font-size: 24px;
+ padding: 0 24px;
+ padding-bottom: 16px;
+ line-height: 32px;
+ color: rgba(0, 30, 46, 1);
+ }
+ .checkbox-list {
+ padding: 30px 15px 15px 15px;
+ background: transparent;
+ &-terms {
+ padding: 0 15px;
+ }
+ .term-container {
+ border-radius: 11px;
+ background: transparent;
+ padding-right: 25px;
+ ion-item.custom-checkbox{
+ background: none;
+ justify-self: center;
+ align-self: start;
+ --background: transparent;
+ ion-checkbox {
+ align-self: flex-start;
+
+ }
+ ion-label {
+ letter-spacing: 0.25px;
+ }
+ }
+ ion-checkbox{
+ --border-radius: 50%;
+ --size : 22px;
+ --background-checked: rgba(0, 101, 141, 1);
+ --border-color-checked: rgba(0, 101, 141, 1);
+ --background: transparent;
+ --border-color: rgba(0, 30, 46, 0.6);
+ --border-style: solid;
+ --border-width: 2px;
+ --checkmark-color: #00344B !important;
+ margin-top: 6px;
+ }
+ .term {
+ justify-self: start;
+ text-align: start;
+ &-title {
+ align-self: center;
+ color: #000000;
+ font-size: 18px;
+ font-weight: 500;
+ letter-spacing: 0;
+ line-height: 25px;
+ }
+ &-note {
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 25px;
+ color: rgba(0, 30, 46, 0.6);
+ font-weight: normal;
+ margin-bottom: 16px;
+ }
+ }
+ }
+ }
+ .confirm-term{
+ font-weight: 600;
+ font-size: 16px;
+ color: rgba(28, 55, 69, 0.38);
+ text-align: right;
+ padding-right: 2rem;
+ padding-bottom: 1rem;
+ cursor: pointer;
+ }
+ .confirm-term-success{
+ color: rgba(0, 101, 141, 1);
+ }
+}
\ No newline at end of file
diff --git a/src/app/pages/includes/disclaimer-modal/disclaimer-modal.ts b/src/app/pages/includes/disclaimer-modal/disclaimer-modal.ts
new file mode 100644
index 00000000000..b656707cebd
--- /dev/null
+++ b/src/app/pages/includes/disclaimer-modal/disclaimer-modal.ts
@@ -0,0 +1,66 @@
+import { Component, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+import { ModalController, NavController, NavParams, Platform } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { AppProvider, EventManagerService } from 'src/app/providers';
+import { Coin, CurrencyProvider } from 'src/app/providers/currency/currency';
+import { ExternalLinkProvider } from 'src/app/providers/external-link/external-link';
+import { Logger } from 'src/app/providers/logger/logger';
+import { PersistenceProvider } from 'src/app/providers/persistence/persistence';
+
+// Providers
+
+@Component({
+ selector: 'disclaimer-modal',
+ templateUrl: 'disclaimer-modal.html',
+ styleUrls: ['./disclaimer-modal.scss'],
+ encapsulation: ViewEncapsulation.None
+})
+export class DisclaimerModal {
+ public accepted;
+ public appName: string;
+ navParamsData;
+
+ constructor(
+ private viewCtrl: ModalController,
+ public navCtrl: NavController,
+ private logger: Logger,
+ private persistenceProvider: PersistenceProvider,
+ private events: EventManagerService,
+ private appProvider: AppProvider,
+ ) {
+ this.appName = this.appProvider.info.nameCase;
+ this.accepted = {
+ first: false,
+ second: false,
+ third: false
+ };
+ }
+
+ ngOnInit() {
+ this.logger.info('Loaded: DisclaimerPage');
+ }
+
+ confirm() {
+ if(this.accepted.first && this.accepted.second && this.accepted.third){
+ this.persistenceProvider.setEmailLawCompliance('accepted');
+ this.persistenceProvider.setDisclaimerAccepted();
+ this.persistenceProvider.setOnboardingFlowFlag('enabled');
+ this.persistenceProvider.getCardFastTrackEnabled().then(context => {
+ if (context) {
+ this.persistenceProvider.setCardExperimentFlag('enabled');
+ setTimeout(() => {
+ this.events.publish('experimentUpdateStart');
+ setTimeout(() => {
+ this.events.publish('experimentUpdateComplete');
+ }, 300);
+ }, 400);
+ }
+ });
+ this.viewCtrl.dismiss({
+ isConfirm: true
+ });
+ }
+
+ }
+}
diff --git a/src/pages/includes/gravatar/gravatar.html b/src/app/pages/includes/gravatar/gravatar.html
similarity index 100%
rename from src/pages/includes/gravatar/gravatar.html
rename to src/app/pages/includes/gravatar/gravatar.html
diff --git a/src/pages/includes/gravatar/gravatar.scss b/src/app/pages/includes/gravatar/gravatar.scss
similarity index 80%
rename from src/pages/includes/gravatar/gravatar.scss
rename to src/app/pages/includes/gravatar/gravatar.scss
index a09f84487ca..59037a28f18 100644
--- a/src/pages/includes/gravatar/gravatar.scss
+++ b/src/app/pages/includes/gravatar/gravatar.scss
@@ -1,4 +1,4 @@
-gravatar {
+::ng-deep gravatar {
.gravatar {
display: grid;
grid-template-rows: 1fr;
@@ -11,12 +11,11 @@ gravatar {
grid-column: 2 / span 1;
grid-row: 2;
width: 20px;
- ion-icon.item-img.icon {
+ ion-icon {
margin: 0;
padding: 2px;
- img {
- width: 18px;
- }
+ width: 18px;
+ height: 18px;
&.rectangle {
border-radius: 12px;
}
diff --git a/src/pages/includes/gravatar/gravatar.ts b/src/app/pages/includes/gravatar/gravatar.ts
similarity index 83%
rename from src/pages/includes/gravatar/gravatar.ts
rename to src/app/pages/includes/gravatar/gravatar.ts
index c418b2ffd55..3b2b5617dd9 100644
--- a/src/pages/includes/gravatar/gravatar.ts
+++ b/src/app/pages/includes/gravatar/gravatar.ts
@@ -2,7 +2,8 @@ import { Component, Input } from '@angular/core';
@Component({
selector: 'gravatar',
- templateUrl: 'gravatar.html'
+ templateUrl: 'gravatar.html',
+ styleUrls: ['gravatar.scss']
})
export class GravatarPage {
@Input()
diff --git a/src/app/pages/includes/lotus-donation-card/lotus-donation-card.html b/src/app/pages/includes/lotus-donation-card/lotus-donation-card.html
new file mode 100644
index 00000000000..17cc1a020f0
--- /dev/null
+++ b/src/app/pages/includes/lotus-donation-card/lotus-donation-card.html
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/src/app/pages/includes/lotus-donation-card/lotus-donation-card.scss b/src/app/pages/includes/lotus-donation-card/lotus-donation-card.scss
new file mode 100644
index 00000000000..f9fb710a2e3
--- /dev/null
+++ b/src/app/pages/includes/lotus-donation-card/lotus-donation-card.scss
@@ -0,0 +1,141 @@
+.message {
+ &-background {
+ border-radius: 8px;
+ background-color: #f9f9fb;
+ background-image: url(../../../../assets/img/bg-donate-card.svg);
+ background-repeat: no-repeat;
+ background-size: cover;
+ margin: 1rem 1rem 2rem 1rem;
+ &.no-margin {
+ margin-top: 0;
+ }
+ .line-divider {
+ margin: 0px 15px;
+ }
+ }
+
+ &-header {
+ &.no-dismissible {
+ height: 30px;
+ }
+ .button[icon-only] {
+ font-size: 10px;
+ }
+ }
+ &-icon {
+ display: flex;
+ position: absolute;
+ right: 0;
+ top: -1rem;
+ img {
+ width: 18px;
+ height: 18px;
+ }
+ }
+
+ &-title {
+ text-align: left;
+ font-size: 16px;
+ width: 65%;
+ margin: 1rem 0 0 1rem;
+ font-weight: 600;
+ color: #EDEFF0;
+ }
+
+ &-body {
+ color: rgba(237, 239, 240, 0.6);;
+ font-weight: 400;
+ width: 78%;
+ text-align: left;
+ white-space: normal;
+ font-size: 12px;
+ padding: 1rem 1rem 20px 1rem;
+ letter-spacing: 0.4px;
+ line-height: 16px;
+ &-adv {
+ padding: 0px 15px 7px 0px;
+ }
+ a{
+ color: var(--color-primary);
+ }
+ }
+
+ &-button {
+ cursor: pointer;
+ padding-left: 15px;
+ font-size: 16px;
+ display: flex;
+ justify-content: left;
+ align-items: center;
+ color: #4f6ef7;
+ height: 45px;
+ }
+ &-img {
+ img {
+ border-radius: 50%;
+ width: 60px;
+ height: 60px;
+ }
+ img.card-img {
+ border-radius: 0;
+ width: 60px;
+ height: 60px;
+ }
+ }
+}
+
+.message-background--donate {
+ .message-icon {
+ img {
+ width: 100px;
+ height: 100px;
+ }
+ }
+}
+
+.message-header {
+ margin-bottom: -15px;
+}
+.message-content {
+ .title-container {
+ align-items: center;
+ position: relative;
+ display: flex;
+ }
+}
+.icon-svg {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ > img {
+ background-repeat: no-repeat;
+ background-clip: padding-box;
+ background-size: contain;
+ height: 44px;
+ margin-bottom: 5px;
+ }
+}
+
+.icons-row {
+ padding: 22px 0;
+}
+
+.opacity-low {
+ opacity: 0.42;
+}
+
+.donate-btn {
+ text-align: end;
+ ion-button {
+ --border-radius: 100px;
+ --background: var(--color-primary);
+ --color: #EDEFF0;
+ min-width: 110px;
+ height: 35px;
+ font-size: 14px;
+ font-weight: 600;
+ margin-bottom: 1rem;
+ margin-right: 1rem;
+ margin-top: 0;
+ }
+}
diff --git a/src/app/pages/includes/lotus-donation-card/lotus-donation-card.ts b/src/app/pages/includes/lotus-donation-card/lotus-donation-card.ts
new file mode 100644
index 00000000000..05e85d65f51
--- /dev/null
+++ b/src/app/pages/includes/lotus-donation-card/lotus-donation-card.ts
@@ -0,0 +1,33 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { AppProvider } from 'src/app/providers';
+import { ExternalLinkProvider } from 'src/app/providers/external-link/external-link';
+
+@Component({
+ selector: 'page-lotus-donation-card',
+ templateUrl: 'lotus-donation-card.html',
+ styleUrls: ['lotus-donation-card.scss']
+})
+export class LotusDonationCard {
+ currentTheme;
+
+ constructor(
+ private appProvider: AppProvider,
+ private externalLinkProvider: ExternalLinkProvider,
+ private router: Router
+ ) {
+ this.currentTheme = this.appProvider.themeProvider.currentAppTheme;
+ }
+
+ public donationLotus() {
+ this.router.navigateByUrl('/accounts-page', {
+ state: {
+ isDonation: true
+ }
+ });
+ }
+
+ public openLink(url) {
+ this.externalLinkProvider.open(url);
+ }
+}
diff --git a/src/app/pages/includes/multiple-outputs/multiple-outputs.html b/src/app/pages/includes/multiple-outputs/multiple-outputs.html
new file mode 100644
index 00000000000..66bb4d9aad3
--- /dev/null
+++ b/src/app/pages/includes/multiple-outputs/multiple-outputs.html
@@ -0,0 +1,52 @@
+
+
+
+
+ 
+
+
+
+
+ {{ 'Donate' | translate }}
+
+
+
+
+
+
+ {{ (output.addressToShow || output.toAddress || output.address).slice(-8) }}
+ {{ output.contactName }}
+
+
+ {{output.amountStr}}
+ ({{output.alternativeAmountStr}})
+
+
+
+
+
+
++ {{output.message}} +
+
+ Send to
+
+
+
+
+ {{ tx.customData?.toWalletName || ((tx.outputs[0].addressToShow ? ( tx.outputs[0].addressToShow === 'Unparsed address' ? tx.inputAddresses[0] : tx.outputs[0].addressToShow ) : tx.outputs[0].address).slice(-8))}}
+ {{ tx.outputs[0].contactName }}
+
+
+
+
+ {{tx.message}}
+ {{contactName}}
+ Sending
+
+
+
+
+
+
+
+ Created by
+ {{tx.creatorName}}
+
+
+
+ –
+ (possible double spend)
+ {{tx.amountStr}}
+
+
+
+
+
+
+
+
+
+
+
+ {{ newfeature.slideTitle || 'Recently added' }}
+
+
+ }})
+
+
+
+
+ {{ 'Try it' | translate }}
+
+
+ {{ 'Next' | translate }}
+
+
+ {{ 'Got it' | translate }}
+
+
\ No newline at end of file
diff --git a/src/app/pages/new-feature/new-feature.scss b/src/app/pages/new-feature/new-feature.scss
new file mode 100644
index 00000000000..d1f05c48ad6
--- /dev/null
+++ b/src/app/pages/new-feature/new-feature.scss
@@ -0,0 +1,138 @@
+:host {
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
+ Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+}
+
+.new-feature-slides {
+ width: 100%;
+ height: 100%;
+ .slide-zoom {
+ height: 100%;
+ }
+ .swiper-pagination-bullet {
+ background: grey;
+ opacity: 0.2;
+ }
+ .swiper-pagination-bullet-active {
+ background: #4f6ef7;
+ opacity: 1;
+ }
+
+ ::ng-deep.swiper-slide {
+ .supperior-container {
+ position: relative;
+ height: 64%;
+ background: linear-gradient(
+ 180deg,
+ var(--gradient1-light) 0%,
+ var(--gradient2-light) 100%
+ );
+ .page-title {
+ text-align: center;
+ width: 100%;
+ line-height: 30px;
+ font-size: 18px;
+ font-weight: 500;
+ color: #1a3b8b;
+ top: 2em;
+ padding: 2em 0 2em 0;
+ }
+ .img-container {
+ display: contents;
+ img {
+ display: block;
+ width: 80%;
+ bottom: 0;
+ margin: 0 auto;
+ transform: translateY(0);
+ @media screen and (min-width: 768px) {
+ transform: translateY(-20px);
+ max-width: 220px;
+ }
+ }
+ }
+ }
+
+ .slide-info {
+ background-color: #ffffff;
+ height: 100%;
+ box-shadow: 0 -3px 20px 0 rgba(0, 0, 0, 0.05);
+ position: relative;
+ .title {
+ text-align: center;
+ font-size: 18px;
+ color: #000000;
+ font-weight: 800;
+ line-height: 30px;
+ padding-top: 2em;
+ @media only screen and (min-width: 320px) and (max-width: 440px) and (max-height: 667px) {
+ font-size: 14px;
+ line-height: 20px;
+ }
+ }
+ .text {
+ text-align: center;
+ font-size: 16px;
+ color: #6d7386;
+ line-height: 25px;
+ width: 67%;
+ position: absolute;
+ left: 15%;
+ padding-top: 0.1em;
+ @media only screen and (min-width: 320px) and (max-width: 440px) and (max-height: 667px) {
+ font-size: 12px;
+ line-height: 15px;
+ }
+ }
+ }
+ }
+}
+::ng-deep.swiper-horizontal > .swiper-pagination-bullets, .swiper-pagination-bullets.swiper-pagination-horizontal {
+ bottom: 35px;
+}
+.next-slide-button {
+ z-index: 1;
+ position: absolute;
+ bottom: 2rem;
+ bottom: calc(1.5rem + env(safe-area-inset-bottom));
+ bottom: -webkit-calc(2rem + env(safe-area-inset-bottom));
+ right: 0;
+ color: #4f6ef7;
+ cursor: pointer;
+ text-transform: uppercase;
+}
+
+.try-it-button {
+ z-index: 1;
+ position: absolute;
+ bottom: 2rem;
+ bottom: calc(1.5rem + env(safe-area-inset-bottom));
+ bottom: -webkit-calc(2rem + env(safe-area-inset-bottom));
+ color: black;
+ background-color: var(--color-primary);
+ cursor: pointer;
+ text-transform: uppercase;
+ width: 25%;
+ left: 50%;
+ -ms-transform: translateX(-50%);
+ transform: translateX(-50%);
+}
+.img-fit {
+ background-color: linear-gradient(
+ 180deg,
+ var(--gradient1-light) 0%,
+ var(--gradient2-light) 100%
+ );
+}
+@media (orientation: portrait) {
+ .img-fit {
+ background-size: contain;
+ }
+}
+@media (orientation: landscape) {
+ .img-fit {
+ background-size: auto 100%;
+ }
+}
+
+
diff --git a/src/app/pages/new-feature/new-feature.ts b/src/app/pages/new-feature/new-feature.ts
new file mode 100644
index 00000000000..be11a266710
--- /dev/null
+++ b/src/app/pages/new-feature/new-feature.ts
@@ -0,0 +1,110 @@
+import { animate, style, transition, trigger } from '@angular/animations';
+import { Component, NgZone, OnInit, ViewChild } from '@angular/core';
+import { ModalController, NavParams } from '@ionic/angular';
+import { TryItType } from 'src/app/providers/new-feature-data/new-feature-data';
+import { ThemeProvider } from 'src/app/providers/theme/theme';
+import { Pagination, SwiperOptions } from 'swiper';
+import { SwiperComponent } from 'swiper/angular';
+import SwiperCore from 'swiper';
+
+SwiperCore.use([Pagination]);
+@Component({
+ selector: 'page-new-feature',
+ templateUrl: 'new-feature.html',
+ animations: [
+ trigger('fade', [
+ transition(':enter', [
+ style({
+ transform: 'translateX(3px)',
+ opacity: 0
+ }),
+ animate('200ms')
+ ]),
+ transition(':leave', [
+ animate(
+ '200ms',
+ style({
+ transform: 'translateX(3px)',
+ opacity: 0
+ })
+ )
+ ])
+ ])
+ ],
+ styleUrls: ['./new-feature.scss']
+})
+
+export class NewFeaturePage implements OnInit {
+ @ViewChild('swiper') swiper: SwiperComponent;
+ config: SwiperOptions = {
+ slidesPerView: 1,
+ pagination: true,
+ speed: 400,
+ resistanceRatio: 0
+ }
+ endSlide: boolean = false;
+ firstSlide: boolean = true;
+ tryit: any;
+ featureList: any = [];
+ isDarkMode: boolean;
+ constructor(
+ private viewCtrl: ModalController,
+ private navParams: NavParams,
+ private themeProvider: ThemeProvider,
+ private zone: NgZone
+ ) {
+
+
+ }
+ ngOnInit(): void {
+ this.zone.run(() => {
+ this.featureList = [...this.navParams.data.featureList.features];
+ this.endSlide = this.swiper.swiperRef.isEnd;
+ this.isDarkMode = this.themeProvider.isDarkModeEnabled();
+ })
+ }
+
+
+
+ getImage(imagePath: string): string {
+ if (this.isDarkMode) {
+ var pointIndex = imagePath.lastIndexOf('.');
+ var output = [
+ imagePath.slice(0, pointIndex),
+ '-dark',
+ imagePath.slice(pointIndex)
+ ].join('');
+ return output;
+ } else {
+ return imagePath;
+ }
+ }
+
+ setBGImgHeader(imagePath: string) {
+ return {
+ 'background-image': 'url(' + imagePath + ')',
+ 'background-repeat': 'no-repeat',
+ 'background-position': 'bottom',
+ height: '100%'
+ };
+ }
+
+ slideChanged() {
+ this.zone.run(() => {
+ this.endSlide = this.swiper.swiperRef.isEnd;
+ this.tryit = null;
+ if (
+ this.swiper.swiperRef.activeIndex &&
+ this.featureList[this.swiper.swiperRef.activeIndex]
+ ) {
+ this.tryit = this.featureList[this.swiper.swiperRef.activeIndex].tryit;
+ }
+ })
+ }
+
+ public close(data: TryItType): void {
+ typeof data === 'function'
+ ? data(this.viewCtrl)
+ : this.viewCtrl.dismiss({ data, done: this.endSlide });
+ }
+}
diff --git a/src/app/pages/onboarding/add-funds/add-funds.html b/src/app/pages/onboarding/add-funds/add-funds.html
new file mode 100644
index 00000000000..17f48a503d7
--- /dev/null
+++ b/src/app/pages/onboarding/add-funds/add-funds.html
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+ {{'Buy Crypto' | translate}}
+
+
+ {{'Buy crypto with a credit card.' | translate}}
+
+
+
+ 
+
+
+
+
+
+
+ {{'Restore from backup' | translate}}
+
+
+ {{'Add funds from an existing wallet.' | translate}}
+
+
+
+ {{"I’ll do this later" | translate}}
+
+
+
+
+Notifications by email
+
+ 
+
+
+
+
+ {{'Skip' | translate}}
+
+
+
+ Where would you like to receive email notifications about payments?
+ +
+
+ {{'Confirm' | translate}}
+
+
+ {{'Edit' | translate}}
+
+
+
+
+ Is this email address correct?
+{{ emailForm.value.email }}
+
+
+
+ 
+
+
+
+
+ Control your money without an account
+AbcPay allows you to privately store, manage, and use your crypto funds without having to trust a centralized bank or exchange
+
+
+
+ 
+
+
+
+
+ Leverage multi-factor security
+
+ Use multi-factor wallets to split payment authorization across up to 6 devices or trusted copayers for enhanced security.
+
+
+
+
+
+
+ 
+
+
+
+
+ {{'First, set unlock method' | translate}}
+{{'Adding an extra layer of security to keep your balance and transactions private.' | translate}}
+
+
+
+
+ {{'Unlock with biometric' | translate}}
+
+
+
+
+ {{'Unlock with passcode' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+ {{'Your funds are in your custody' | translate}}
+
+
+ {{'I understand that my funds are held and controlled securely on this device, not by a company.' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ Backup recovery phrase
+
+
+ You will now be shown a recovery phrase which is very important. If you write down and store it safely, you will always be able to recover your accounts.
+You can choose to back up your recovery phrase now or later in the account settings.
+ Funds found:
+
+ {{b.balance | satToUnit: b.coin}}
+
+
+
+ {{'Funds will be transferred to' | translate}}
+
+
+
+
+
+
+
+{{selectedWallet.name}} + {{selectedWallet.credentials.m}}-{{selectedWallet.credentials.n}} +
+ {{selectedWallet.cachedStatus.totalBalanceStr}} + [Balance Hidden] + {{error}} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ 
+
+
+ .
+
+ {{ button.value }}
+
+
+
+
+ .
+
+ {{ button.value }}
+ {{ button.letters }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ address }}
+
+
+
+
+ {{'Share this' | translate}}
+
+
+
+
+
+ Camera not supported
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+ Scan QR Codes
+ You can scan bitcoin addresses, payment requests, paper wallets, and more.
+
+
+
+
+ Enable the camera to get started.
+ Enable camera access in your device settings to get started.
+ Please connect a camera to get started.
+
+
+ {{'Allow camera access' | translate}}
+
+
+ {{'Open settings' | translate}}
+
+
+ {{'Retry camera' | translate}}
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'Cancel' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'ADDRESS BOOK' | translate}}
+
+
+
+
+
+
+ {{contact.name}}
+
+
+
+
+
+
+
+
+
+
+ {{ 'MY ACCOUNT' | translate}}
+
+
+
+
+ {{ walletsByKey[0].walletGroupName }}
+
+
+
+
+
+
+
+ Lotus Remaining : {{formatRemaining}}
+
+
+ Only few remaining...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ Mmm...
+
+
+ It appears that you do not have any money to donate.
+
+
+
+ You need a minimum of 20 XRP to donate funds.
+
+
+
+
+
+
+
+ {{expression | number:'1.0-6'}}
+ {{expression}}
+
+
+
+ {{ '0' }}
+
+
+ {{unit}}
+ {{token?.tokenInfo?.symbol}}
+
+ {{globalResult}} {{unit}}
+ {{globalResult}} {{token?.tokenInfo?.symbol}}
+ ≈
+ {{alternativeAmount || '0.00'}}
+ {{alternativeAmount || '0'}}
+ {{alternativeUnit}}
+
+
+
+
+
+
+
+
+
+ 
+
+
+ {{unit}}
+ {{receiveLotus}}
+
+
+
+ {{'Continue' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{wallet.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{receiveAmountLotus | number:'1.2-2'}} {{donationCoin |
+ uppercase}}
+
+
+
+
+ {{'Memo' | translate}}
+
+
+
+
+
+ A transaction using your delayed transaction inputs will be sent to your
+ own wallet with a higher miner fee to speed up the last confirmation
+ time.
+
+
+ +
+ In order to speed up the confirmation of your ETH transaction, the
+ original transaction will be replaced by a new one that uses a higher
+ miner fee.
+
+
+ +
+
+
+
+
+
+
+
+ {{totalAmountStr}}
+
+
+ {{totalAmount | satToFiat: tx.coin}}
+
+
+
+
+ Subtotal
+
+ {{amount}} {{tx.coin | uppercase}}
+ {{formatAmount(tx.coin,
+ tx.amount -
+ tx.txp[wallet.id].fee)}} {{tx.coin | uppercase}}
+
+
+
+
+ Miner fee
+ {{ merchantFeeLabel }}
+
+
+
+
+
+
+
+ {{tx.feeLevelName | uppercase}}
+
+ ...
+ ...
+
+ {{requiredFee | satToUnit: getChain(tx.coin)}}
+
+
+ {{requiredFee | satToFiat: getChain(tx.coin)}}
+
+
+ {{tx.txp[wallet.id].fee | satToUnit: getChain(tx.coin)}}
+
+
+ {{tx.txp[wallet.id].fee | satToFiat: getChain(tx.coin)}}
+
+ ·
+
+
+
+ Sending from
+
+ Select a account
+
+ Sending to
+
+
+
+
+
+ {{toAddressName || (tx.origToAddress.slice(-8))}}
+ {{tx.name}}
+
+
+
+
+
+
+ 
+ {{ fromCoinbase.accountName }}
+
+
+ {{ fromCoinbase.accountName }}
+
+ {{tx.origToAddress}}
+ {{tx.name}}
+ Lotus Donation
+
+
+ {{tx.name}}
+ {{tx.toAddress}}
+
+
+
+
+ {{'Multiple recipients ({recipientsCount})' | translate: {
+ recipientsCount: recipients?.length } }}
+
+
+
+
+
+
+ Send to
+
+
+ Amount
+
+
+
+
+
+
+ {{recipient.name || ((recipient.addressToShow ||
+ recipient.toAddress || recipient.address).slice(-8)
+ )}}
+
+
+
+
+ {{recipient.amountToShow}} {{coin | uppercase}}
+
+
+ Receiving account
+
+
+ {{nameReceiveLotusAddress}}
+
+
+ Lotus Receiving
+
+
+
+
+
+
+ {{buttonText}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'Recipient' | translate}} {{idx +1}}
+
+
+
+
+
+
+
+
+
+ {{item.recipient.name}}
+ {{item.recipient.name}}
+ {{item.toAddress}}
+
+
+
+
+
+
+ {{item.amountToShow}} {{wallet.coin | uppercase}}
+
+
+ {{item.altAmountStr}}
+
+
+
+ {{'Continue' | translate}}
+
+
+
+ {{ 'Select inputs' | translate }}
+
+
+
+{{ 'Total selected inputs: ' | translate}} {{totalAmount}} {{wallet.coin | uppercase}}
+ {{ 'Specified amount: ' | translate}} {{recipient.amountToShow}} {{wallet.coin | uppercase}}
+
+ {{'This amount must be at least:' | translate}} {{ recipient.amountToShow }} {{wallet.coin | uppercase}}
+
+
+
+
+ {{ 'Recipient' | translate}}
+
+
+
+
+
+
+
+
+ 
+
+
+ {{recipient.name}}
+ {{recipient.name}}
+ {{recipient.toAddress}}
+
+
+
+
+
+
+
+
+ {{ 'Total selected inputs' | translate}}
+
+
+
+
+
+
+
+ {{ 'Wallet Inputs' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{recipient.amountToShow}} {{wallet.coin | uppercase}}
+
+
+ {{recipient.altAmountStr}}
+
+ {{'Specify Amount' | translate}}
+
+ {{totalAmount}} {{wallet.coin | uppercase}}
+
+
+ {{'The sum of the selected amounts must be at least:' | translate}} {{ recipient.amountToShow }} {{wallet.coin | uppercase}}
+
+
+ {{'No available inputs.' | translate}}
+
+
+
+
+
+
+
+
+ {{input.amount}} {{wallet.coin | uppercase}}
+
+
+ {{input.address}}
+
+
+ {{titlePage | translate}}{{subTitle | translate}}
+
+
+
+
+
+
+
+
+
+
+
+ Available:
+ {{getBalance()}}
+
+
+
+
+
+
+ 
+
+
+ Choose the account inputs
+
+
+
+ Total selected:
+ {{totalAmount}} {{wallet.coin | uppercase}}
+
+ {{'No available inputs.' | translate}}
+
+
+
+
+
+
+
+
+ {{input.address.slice(-8)}}
+
+
+ {{input.amount}} {{wallet.coin | uppercase}}
+
+
+ {{titlePage | translate}}
+
+
+
+
+ Available:
+ {{getBalance()}}
+
+
+ Lotus Remaining:
+ {{formatRemaining}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+
+
+
+
+ Mmm...
+
+
+ It appears that you do not have any money to send.
+ It appears that you do not have any money to donate.
+
+
+
+ You need a minimum of 20 XRP to send funds.
+
+
+
+
+ {{search}}
+
+ {{'Add
+ more recipient' | translate}}
+ {{'Continue'
+ | translate}}
+
+
+
+
+
+
+ {{'Select recipient' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+ RECENT TRANSACTIONS
+
+
+
+
+
+
+
+ {{item.name[0] | uppercase}}
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ contacts[0].firstLetter | uppercase}}
+
+
+
+
+ {{contact.name}}
+
+
+ 
+
+
+ {{'No contact yet' | translate}}
+
+
+
+
+
+
+
+ {{ walletsByKey[0].walletGroupName }}
+
+
+
+
+ 
+
+
+ {{'No accounts' | translate}}
+
+
+
+ Version
+ v{{version}}
+
+
+ Commit Hash
+ #{{commitHash}}
+
+
+ Send Feedback
+
+
+ Session Log
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [{{l.level}}] {{l.msg}}
+
+
+
+
+
+
+
+
+
+
+ {{option.value.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+ {{'Add new contact' | translate}}
+
+
+
+ No contacts yet
+ Get started by adding your first one.
+
+
+
+ {{entry?.key | translate}}
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ address }}
+
+ {{'Address' | translate}}
+
+ {{ coin.toUpperCase() }}
+
+ {{'Coin' | translate}}
+
+ {{ network }}
+
+ {{'Network' | translate}}
+
+
+
+ {{'Send' | translate}} {{coin.toUpperCase()}}
+
+
+
+
+
+
+ {{'Delete contact' | translate}}
+
+
+
+
+
+
+ {{ 'Reset All Settings' | translate }}
+
+
+ {{ 'Use Unconfirmed Funds' | translate }}
+
+
+
+
+
+
+ Recover old accounts
+
+
+
+
+
+
+ If enabled, accounts will also try to spend unconfirmed funds. However, unconfirmed funds are not allowed for spending with merchants, AbcPay Card loads, or AbcPay in-app gift card purchases.
+
+
-
+
Mnemonic Recovery Warning
@@ -12,8 +12,8 @@