bump version to v1.1.1

serderovsh · serderovsh · commit 4c8990d2e74c · 2019-01-19T14:01:09.000+03:00
diff --git a/main.ts b/main.ts
@@ -48,7 +48,7 @@ function createWindow() {
 
     if (isDevMode) {
         require('electron-reload')(__dirname, {
-            electron: require(`${__dirname}/node_modules/electron`)
+            electron: require(`${__dirname}/node_modules/electron`),
         });
         win.loadURL('http://localhost:4200');
     } else {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,8 @@
         "build:mac-release": "npm run build:prod && npx electron-builder build --mac",
         "test": "npm run postinstall:web && ng test",
         "e2e": "npm run postinstall:web && ng e2e",
-        "fix:tslint": "tslint --fix --project . && tslint --fix '{test,electron,src}/**/*.ts'",
+        "tslint-check": "tslint-config-prettier-check ./tslint.json",
+        "fix:tslint": "tslint --fix --project . && tslint --fix '{src}/**/*.ts'",
         "fix:prettier": "prettier --write '{*,**/*}.{js,ts,md,json,scss}'",
         "extract": "ngx-translate-extract -i ./src -o ./src/assets/i18n/{ru,en}.json",
         "env:prod": "rm -f src/environments/index.ts && cp src/environments/prod.ts src/environments/index.ts \n\n# Environment set to: prod\n\n",
@@ -143,6 +144,7 @@
         "ts-node": "~7.0.1",
         "tslint": "~5.12.0",
         "tslint-config-prettier": "^1.17.0",
+        "tslint-plugin-prettier": "^2.0.1",
         "typescript": "~3.2.2",
         "wait-on": "^3.2.0"
     },
diff --git a/src/pipes/keys/keys.ts b/src/pipes/keys/keys.ts
@@ -16,7 +16,7 @@ export class KeysPipe implements PipeTransform {
      *  Simple: *ngFor="let item of giftCards | keys"
      *	With an object with objects: *ngFor="let item of (itemsObject | keys : 'date') | orderBy : ['-order']"
      */
-    transform(value, orderBy?: string) {
+    transform(value: any[], orderBy?: string) {
         const keys = [];
         for (const key in value) {
             keys.push({
@@ -28,4 +28,3 @@ export class KeysPipe implements PipeTransform {
         return keys;
     }
 }
-
diff --git a/src/pipes/order-by/order-by.ts b/src/pipes/order-by/order-by.ts
@@ -44,8 +44,8 @@ export class OrderByPipe implements PipeTransform {
             !Array.isArray(config) ||
             (Array.isArray(config) && config.length == 1)
         ) {
-            let propertyToCheck: string = !Array.isArray(config) ? config : config[0];
-            let desc = propertyToCheck.substr(0, 1) == '-';
+            const propertyToCheck: string = !Array.isArray(config) ? config : config[0];
+            const desc = propertyToCheck.substr(0, 1) == '-';
 
             // Basic array
             if (
@@ -55,7 +55,7 @@ export class OrderByPipe implements PipeTransform {
             ) {
                 return !desc ? input.sort() : input.sort().reverse();
             } else {
-                let property: string =
+                const property: string =
                     propertyToCheck.substr(0, 1) == '+' ||
                     propertyToCheck.substr(0, 1) == '-'
                         ? propertyToCheck.substr(1)
@@ -71,13 +71,13 @@ export class OrderByPipe implements PipeTransform {
             // Loop over property of the array in order and sort
             return input.sort((a, b) => {
                 for (let i = 0; i < config.length; i++) {
-                    let desc = config[i].substr(0, 1) == '-';
-                    let property =
+                    const desc = config[i].substr(0, 1) == '-';
+                    const property =
                         config[i].substr(0, 1) == '+' || config[i].substr(0, 1) == '-'
                             ? config[i].substr(1)
                             : config[i];
 
-                    let comparison = !desc
+                    const comparison = !desc
                         ? OrderByPipe._orderByComparator(a[property], b[property])
                         : -OrderByPipe._orderByComparator(a[property], b[property]);
 
diff --git a/src/polyfills.ts b/src/polyfills.ts
@@ -18,8 +18,10 @@
  * BROWSER POLYFILLS
  */
 
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-import 'core-js/es6/array';
+/**
+ * IE9, IE10 and IE11 requires all of the following polyfills.
+ */
+// import 'core-js/es6/array';
 import 'core-js/es6/date';
 import 'core-js/es6/function';
 import 'core-js/es6/map';
@@ -38,7 +40,7 @@ import 'core-js/es6/weak-map';
  * If the application will be indexed by Google Search, the following is required.
  * Googlebot uses a renderer based on Chrome 41.
  * https://developers.google.com/search/docs/guides/rendering
- **/
+ */
 import 'core-js/es6/array';
 
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
@@ -51,7 +53,7 @@ import 'core-js/es6/reflect';
  * Web Animations `@angular/platform-browser/animations`
  * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
  * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- **/
+ */
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
 /**
@@ -79,4 +81,3 @@ import 'zone.js/dist/zone';  // Included with Angular CLI.
  * APPLICATION IMPORTS
  */
 import 'core-js/es7/reflect';
-import 'zone.js/dist/zone';
diff --git a/src/providers/address/address.ts b/src/providers/address/address.ts
@@ -6,14 +6,17 @@
  */
 
 import {Injectable} from '@angular/core';
+
 // Providers
-import {Logger} from '@providers/logger/logger';
-import {TronProvider} from '@providers/tron/tron';
-import {ec} from 'elliptic';
+import { Logger } from '@providers/logger/logger';
+import { TronProvider } from '@providers/tron/tron';
+
+import { ec } from 'elliptic';
+import { keccak256 } from 'js-sha3'
 
 // ec plugin
 const secp256k1: any = new ec('secp256k1');
-const keccak256 = require('js-sha3').keccak256;
+
 
 // declare buffer
 declare const Buffer;
diff --git a/src/providers/config/storage/file-storage.ts b/src/providers/config/storage/file-storage.ts
@@ -24,7 +24,7 @@ export class FileStorage {
      *
      *  @param dir - local directory project
      *  @param storeName - file name
-     * */
+     */
     constructor(
         public dir: string,
         @Inject('storeName') storeName: string
@@ -57,7 +57,7 @@ export class FileStorage {
      *  Set an item.
      *
      *  @return void
-     * */
+     */
     set(key: any, value?: any ): void {
         if (typeof(key) == 'object') {
             return this.store.set(key);
diff --git a/src/providers/external-link/external-link.ts b/src/providers/external-link/external-link.ts
@@ -28,9 +28,9 @@ export class ExternalLinkProvider {
     public open(url: string): void {
         const old = (window as any).handleOpenURL;
 
-        (window as any).handleOpenURL = url => {
+        (window as any).handleOpenURL = (u: any) => {
             // Ignore external URLs
-            this.logger.debug('Skip: ' + url);
+            this.logger.debug('Skip: ' + u);
         };
 
         this.electronProvider.openExternalLink(url);
diff --git a/src/providers/index.ts b/src/providers/index.ts
@@ -18,7 +18,6 @@ export { FilterProvider } from '@providers/filter/filter';
 export { LanguageProvider } from '@providers/language/language';
 export { Logger } from '@providers/logger/logger';
 export { RateProvider } from '@providers/rate/rate';
-export { ReplaceParametersProvider } from '@providers/replace-parameters/replace-parameters';
 export { TimeProvider } from '@providers/time/time';
 export { TronProvider } from '@providers/tron/tron';
 export { WalletProvider } from '@providers/wallet/wallet';
diff --git a/src/providers/providers.module.ts b/src/providers/providers.module.ts
@@ -23,7 +23,6 @@ import {
     LanguageProvider,
     Logger,
     RateProvider,
-    ReplaceParametersProvider,
     TimeProvider,
     TronProvider,
     VoteProvider,
@@ -48,7 +47,6 @@ import {
         LanguageProvider,
         Logger,
         RateProvider,
-        ReplaceParametersProvider,
         TimeProvider,
         TronProvider,
         WalletProvider,
diff --git a/src/providers/rate/rate.ts b/src/providers/rate/rate.ts
@@ -115,7 +115,7 @@ export class RateProvider {
                 .then(dataTRX => {
                     this.rates = dataTRX;
                     _.each(dataTRX, (rate, code) => {
-                        this.alternatives.map((maps) => {
+                        this.alternatives.map(maps => {
                             if (maps.isoCode === code) {
                                 maps.rate = rate;
                             }
diff --git a/src/providers/replace-parameters/replace-parameters.ts b/src/providers/replace-parameters/replace-parameters.ts
diff --git a/src/providers/tron/tron.ts b/src/providers/tron/tron.ts
@@ -88,7 +88,7 @@ export class TronProvider {
             fullNode: 'https://api.trongrid.io',
             solidityNode: 'https://api.trongrid.io',
             eventServer: 'https://api.trongrid.io'
-        } as TronNodesInterface,
+        },
 
         /**
          * Test Network
@@ -102,7 +102,7 @@ export class TronProvider {
             fullNode: 'https://api.shasta.trongrid.io',
             solidityNode: 'https://api.shasta.trongrid.io',
             eventServer: 'https://api.shasta.trongrid.io'
-        } as TronNodesInterface,
+        },
     };
 
     /**
@@ -415,7 +415,7 @@ export class TronProvider {
      * @param {any} callback - Callback result
      * @return {Promise} - If successful that "result: true"
      */
-    async broadcastTxProposal(transaction: any, options: Object = {}, callback?: any): Promise<any> {
+    async broadcastTxProposal(transaction: any, options: object = {}, callback?: any): Promise<any> {
         try {
             return await this.client.trx.sendRawTransaction(transaction, options, callback);
         } catch (e) {
diff --git a/src/providers/wallet/wallet.ts b/src/providers/wallet/wallet.ts
@@ -513,7 +513,7 @@ export class WalletProvider {
                 balanceHidden: false,
                 color: 'theme-wallet-thunderbird',
                 ...wallet
-            } as WalletOptions;
+            } as any;
             allWallets.push(newWallet);
             // Updating data in the repository
             this.encryptWallet(allWallets, this.password);
@@ -1143,7 +1143,7 @@ export class WalletProvider {
      *
      * @param {string} phrase - Phrase 12 worlds
      * @return boolean
-     * */
+     */
     isValidMnemonic(phrase: string): boolean {
         if (!phrase) { return false; }
         if (phrase.trim().split(/\s+/g).length < 12) {
diff --git a/src/utils/bytes.ts b/src/utils/bytes.ts
@@ -80,6 +80,17 @@ export const hexToByteArray = (hex: string): Uint8Array => {
     return res;
 };
 
+/**
+ * isHex
+ *
+ * @param {string} str - string to be tested
+ * @returns {boolean}
+ */
+export const isHex = (str: string): boolean => {
+    const plain = str.replace('0x', '');
+    return /[0-9a-f]*$/i.test(plain);
+};
+
 /**
  * hexToIntArray
  *
@@ -128,14 +139,3 @@ export const isEqual = (a: string, b: string): boolean => {
 
     return result === 0;
 };
-
-/**
- * isHex
- *
- * @param {string} str - string to be tested
- * @returns {boolean}
- */
-export const isHex = (str: string): boolean => {
-    const plain = str.replace('0x', '');
-    return /[0-9a-f]*$/i.test(plain);
-};
diff --git a/tslint.json b/tslint.json

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export class KeysPipe implements PipeTransform {`
`16`	`16`	`* Simple: *ngFor="let item of giftCards \| keys"`
`17`	`17`	`* With an object with objects: *ngFor="let item of (itemsObject \| keys : 'date') \| orderBy : ['-order']"`
`18`	`18`	`*/`
`19`		`- transform(value, orderBy?: string) {`
	`19`	`+ transform(value: any[], orderBy?: string) {`
`20`	`20`	`const keys = [];`
`21`	`21`	`for (const key in value) {`
`22`	`22`	`keys.push({`
`@@ -28,4 +28,3 @@ export class KeysPipe implements PipeTransform {`
`28`	`28`	`return keys;`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`-`