mirror of https://github.com/BTCPrivate/copay.git
Upgrade app.module. Remove deprecated libs
This commit is contained in:
parent
cbdc5bf649
commit
da51e6ffab
|
@ -1,6 +1,6 @@
|
|||
import { BrowserModule } from '@angular/platform-browser';
|
||||
import { ErrorHandler, NgModule, APP_INITIALIZER } from '@angular/core';
|
||||
import { HttpModule, Http } from '@angular/http';
|
||||
import { HttpClient, HttpClientModule } from '@angular/common/http';
|
||||
import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
|
||||
|
||||
/* Native modules */
|
||||
|
@ -94,7 +94,7 @@ import { TxConfirmNotificationProvider } from '../providers/tx-confirm-notificat
|
|||
import { TxFormatProvider } from '../providers/tx-format/tx-format';
|
||||
import { WalletProvider } from '../providers/wallet/wallet';
|
||||
|
||||
export function createTranslateLoader(http: Http) {
|
||||
export function createTranslateLoader(http: HttpClient) {
|
||||
return new TranslatePoHttpLoader(http, 'assets/i18n', '.po');
|
||||
}
|
||||
|
||||
|
@ -206,7 +206,7 @@ export function providersComponents() {
|
|||
tabsPlacement: 'bottom'
|
||||
}),
|
||||
BrowserModule,
|
||||
HttpModule,
|
||||
HttpClientModule,
|
||||
NgLoggerModule.forRoot(Level.LOG),
|
||||
MomentModule,
|
||||
QRCodeModule,
|
||||
|
@ -214,7 +214,7 @@ export function providersComponents() {
|
|||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useFactory: createTranslateLoader,
|
||||
deps: [Http]
|
||||
deps: [HttpClient]
|
||||
}
|
||||
}),
|
||||
],
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { Http, Response } from '@angular/http';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { Logger } from '@nsalaun/ng-logger';
|
||||
import 'rxjs/add/operator/map';
|
||||
|
||||
import { LanguageProvider } from '../../providers/language/language';
|
||||
import { ConfigProvider } from '../../providers/config/config';
|
||||
|
@ -41,11 +40,11 @@ interface App {
|
|||
|
||||
@Injectable()
|
||||
export class AppProvider {
|
||||
public info: App;
|
||||
public info: any;
|
||||
private jsonPath: string = 'assets/appConfig.json';
|
||||
|
||||
constructor(
|
||||
public http: Http,
|
||||
public http: HttpClient,
|
||||
private logger: Logger,
|
||||
private language: LanguageProvider,
|
||||
private config: ConfigProvider,
|
||||
|
@ -71,7 +70,6 @@ export class AppProvider {
|
|||
}
|
||||
|
||||
private getInfo() {
|
||||
return this.http.get(this.jsonPath)
|
||||
.map((res: Response) => res.json());
|
||||
return this.http.get(this.jsonPath);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { Http } from '@angular/http';
|
||||
import 'rxjs/add/operator/map';
|
||||
import * as _ from "lodash";
|
||||
|
||||
@Injectable()
|
||||
|
@ -8,7 +6,7 @@ export class Filter {
|
|||
|
||||
public formats: any;
|
||||
|
||||
constructor(public http: Http) {
|
||||
constructor() {
|
||||
console.log('Hello Filter Provider');
|
||||
this.formats = {
|
||||
CURRENCY_SYM: "$",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { TestBed, inject, async } from '@angular/core/testing';
|
||||
import { Http } from '@angular/http';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { Logger } from '@nsalaun/ng-logger';
|
||||
import { WalletProvider } from '../wallet/wallet';
|
||||
import { ProfileProvider } from './profile';
|
||||
|
@ -36,7 +36,7 @@ describe('Profile Provider', () => {
|
|||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
ProfileProvider,
|
||||
{ provide: Http },
|
||||
{ provide: HttpClient },
|
||||
{ provide: Logger },
|
||||
{ provide: WalletProvider },
|
||||
{ provide: PersistenceProvider, useClass: PersistenceProviderMock },
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { Http } from '@angular/http';
|
||||
import 'rxjs/add/operator/map';
|
||||
import 'rxjs/add/operator/toPromise';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import * as _ from 'lodash';
|
||||
|
||||
@Injectable()
|
||||
|
@ -17,7 +15,7 @@ export class RateProvider {
|
|||
private rateServiceUrl = 'https://bitpay.com/api/rates';
|
||||
private bchRateServiceUrl = 'https://api.kraken.com/0/public/Ticker?pair=BCHUSD,BCHEUR';
|
||||
|
||||
constructor(public http: Http) {
|
||||
constructor(public http: HttpClient) {
|
||||
console.log('Hello RateProvider Provider');
|
||||
this._rates = {};
|
||||
this._alternatives = [];
|
||||
|
@ -65,17 +63,19 @@ export class RateProvider {
|
|||
}
|
||||
|
||||
getBTC(): Promise<any> {
|
||||
return this.http.get(this.rateServiceUrl)
|
||||
.map((response) => response.json())
|
||||
.toPromise()
|
||||
.catch((error) => console.log("Error", error));
|
||||
return new Promise((resolve, reject) => {
|
||||
this.http.get(this.rateServiceUrl).subscribe((data) => {
|
||||
resolve(data);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
getBCH(): Promise<any> {
|
||||
return this.http.get(this.bchRateServiceUrl)
|
||||
.map((response) => response.json())
|
||||
.toPromise()
|
||||
.catch((error) => console.log("Error", error));
|
||||
return new Promise((resolve, reject) => {
|
||||
this.http.get(this.bchRateServiceUrl).subscribe((data) => {
|
||||
resolve(data);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
getRate(code, chain?) {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { TestBed, inject, async } from '@angular/core/testing';
|
||||
import { Http } from '@angular/http';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { AppProvider } from '../../providers/app/app';
|
||||
import { ReleaseProvider } from './release';
|
||||
|
||||
|
@ -17,9 +17,9 @@ describe('Release Provider', () => {
|
|||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
ReleaseProvider,
|
||||
{ provide: Http },
|
||||
{ provide: AppProvider, useClass: AppProviderMock },
|
||||
ReleaseProvider,
|
||||
{ provide: HttpClient },
|
||||
{ provide: AppProvider, useClass: AppProviderMock },
|
||||
]
|
||||
});
|
||||
});
|
||||
|
@ -34,7 +34,7 @@ describe('Release Provider', () => {
|
|||
it('should get successfully the current app version', () => {
|
||||
// Should return the AppProviderMock object
|
||||
const appVersion = service.getCurrentAppVersion();
|
||||
|
||||
|
||||
expect(appVersion).toBeDefined();
|
||||
expect(appVersion).toEqual(currentAppVersion);
|
||||
});
|
||||
|
@ -49,20 +49,20 @@ describe('Release Provider', () => {
|
|||
expect(version).toEqual(latestAppVersion);
|
||||
});
|
||||
}));
|
||||
|
||||
|
||||
it('should check unsuccessfully the current app version format', () => {
|
||||
const result = service.checkForUpdates(latestAppVersion, 'V..3.3.3');
|
||||
|
||||
|
||||
expect(result.updateAvailable).toBeNull;
|
||||
expect(result.availabeVersion).toBeNull;
|
||||
expect(result.error).toBeDefined();
|
||||
expect(result.error).toMatch('Cannot');
|
||||
expect(result.error).toMatch('version tag');
|
||||
});
|
||||
|
||||
|
||||
it('should check unsuccessfully the latest app version format', () => {
|
||||
const result = service.checkForUpdates('V..3.3.3', currentAppVersion);
|
||||
|
||||
|
||||
expect(result.updateAvailable).toBeNull;
|
||||
expect(result.availabeVersion).toBeNull;
|
||||
expect(result.error).toBeDefined();
|
||||
|
@ -77,10 +77,10 @@ describe('Release Provider', () => {
|
|||
expect(result.updateAvailable).toBeNull;
|
||||
expect(result.availabeVersion).toBeNull;
|
||||
});
|
||||
|
||||
|
||||
it('should be a new version available', () => {
|
||||
const result = service.checkForUpdates(latestAppVersion, currentAppVersion);
|
||||
|
||||
|
||||
expect(result.error).toBeNull;
|
||||
expect(result.updateAvailable).toBeTruthy;
|
||||
expect(result.availabeVersion).toEqual(latestAppVersion);
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { Http } from '@angular/http';
|
||||
import 'rxjs/add/operator/map';
|
||||
import 'rxjs/add/operator/toPromise';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { AppProvider } from '../../providers/app/app';
|
||||
|
||||
@Injectable()
|
||||
|
@ -9,20 +7,21 @@ export class ReleaseProvider {
|
|||
private LATEST_RELEASE_URL: string;
|
||||
private appVersion: string;
|
||||
|
||||
constructor(public http: Http, private app: AppProvider) {
|
||||
constructor(public http: HttpClient, private app: AppProvider) {
|
||||
this.LATEST_RELEASE_URL = 'https://api.github.com/repos/bitpay/copay/releases/latest';
|
||||
this.appVersion = this.app.info.version;
|
||||
}
|
||||
|
||||
|
||||
getCurrentAppVersion() {
|
||||
return this.appVersion;
|
||||
}
|
||||
|
||||
getLatestAppVersion(): Promise<any> {
|
||||
return this.http.get(this.LATEST_RELEASE_URL)
|
||||
.map((response) => response.json().tag_name)
|
||||
.toPromise()
|
||||
.catch((error) => (error));
|
||||
return new Promise((resolve, reject) => {
|
||||
this.http.get(this.LATEST_RELEASE_URL).subscribe((data) => {
|
||||
resolve(data['tag_name']);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
checkForUpdates(latestVersion: string, currentVersion?: string) {
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { QRScanner, QRScannerStatus } from '@ionic-native/qr-scanner';
|
||||
import { PlatformProvider } from '../platform/platform';
|
||||
import 'rxjs/add/operator/map';
|
||||
|
||||
@Injectable()
|
||||
export class ScanProvider {
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { Http } from '@angular/http';
|
||||
import 'rxjs/add/operator/map';
|
||||
import { BwcProvider } from '../bwc/bwc';
|
||||
import { RateProvider } from '../rate/rate';
|
||||
import { ConfigProvider } from '../config/config';
|
||||
|
@ -14,7 +12,6 @@ export class TxFormatProvider {
|
|||
public pendingTxProposalsCountForUs: number
|
||||
|
||||
constructor(
|
||||
public http: Http,
|
||||
private bwc: BwcProvider,
|
||||
private rate: RateProvider,
|
||||
private config: ConfigProvider,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { TestBed, async } from '@angular/core/testing';
|
||||
import { HttpModule } from '@angular/http';
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { ConfigProvider } from '../config/config';
|
||||
import { WalletProvider } from './wallet';
|
||||
import { Logger, Level as LoggerLevel } from '@nsalaun/ng-logger';
|
||||
|
@ -37,7 +37,7 @@ describe('Provider: Wallet Provider', () => {
|
|||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [HttpModule],
|
||||
imports: [HttpClientModule],
|
||||
providers: [
|
||||
WalletProvider,
|
||||
{ provide: ConfigProvider },
|
||||
|
@ -114,4 +114,4 @@ describe('Provider: Wallet Provider', () => {
|
|||
})
|
||||
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue