diff --git a/package.json b/package.json index dcd39ebfb..aaa5a6110 100644 --- a/package.json +++ b/package.json @@ -196,4 +196,4 @@ "ios" ] } -} +} \ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 6cfe907c0..5e537c7ed 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,7 +5,7 @@ import { SplashScreen } from '@ionic-native/splash-screen'; import { Subscription } from 'rxjs'; //providers -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../providers/logger/logger'; import { AppProvider } from '../providers/app/app'; import { ProfileProvider } from '../providers/profile/profile'; import { ConfigProvider } from '../providers/config/config'; @@ -26,7 +26,7 @@ import { DisclaimerPage } from '../pages/onboarding/disclaimer/disclaimer'; @Component({ templateUrl: 'app.html', - providers: [TouchIdProvider] + providers: [TouchIdProvider, Logger] }) export class CopayApp { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e1d7ab5b6..1aa1edffb 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -168,10 +168,10 @@ import { ExternalLinkProvider } from '../providers/external-link/external-link'; import { FeedbackProvider } from '../providers/feedback/feedback'; import { FeeProvider } from '../providers/fee/fee'; import { GlideraProvider } from '../providers/glidera/glidera'; -import { HistoricLogProvider } from '../providers/historic-log/historic-log'; import { HomeIntegrationsProvider } from '../providers/home-integrations/home-integrations'; import { IncomingDataProvider } from '../providers/incoming-data/incoming-data'; import { LanguageProvider } from '../providers/language/language'; +import { Logger } from '../providers/logger/logger'; import { NextStepsProvider } from '../providers/next-steps/next-steps'; import { MercadoLibreProvider } from '../providers/mercado-libre/mercado-libre'; import { NodeWebkitProvider } from '../providers/node-webkit/node-webkit'; @@ -325,9 +325,9 @@ let providers: any = [ HomeIntegrationsProvider, FeeProvider, GlideraProvider, - HistoricLogProvider, IncomingDataProvider, LanguageProvider, + Logger, MercadoLibreProvider, NextStepsProvider, NodeWebkitProvider, diff --git a/src/directives/copy-to-clipboard/copy-to-clipboard.ts b/src/directives/copy-to-clipboard/copy-to-clipboard.ts index f132b4c50..b6e881a58 100644 --- a/src/directives/copy-to-clipboard/copy-to-clipboard.ts +++ b/src/directives/copy-to-clipboard/copy-to-clipboard.ts @@ -3,7 +3,7 @@ import { Directive, Inject } from '@angular/core'; import { ToastController } from 'ionic-angular'; import { Clipboard } from '@ionic-native/clipboard'; import { PlatformProvider } from '../../providers/platform/platform'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; @Directive({ selector: '[copy-to-clipboard]', // Attribute selector diff --git a/src/directives/no-low-fee/no-low-fee.ts b/src/directives/no-low-fee/no-low-fee.ts index 4c8f3a7ce..59ab8c390 100644 --- a/src/directives/no-low-fee/no-low-fee.ts +++ b/src/directives/no-low-fee/no-low-fee.ts @@ -1,6 +1,6 @@ import { Directive, ElementRef } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; // Provider import { ConfigProvider } from '../../providers/config/config'; diff --git a/src/pages/add/add.ts b/src/pages/add/add.ts index 02d91b919..fa0bb46a9 100644 --- a/src/pages/add/add.ts +++ b/src/pages/add/add.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //pages import { CreateWalletPage } from "./create-wallet/create-wallet"; diff --git a/src/pages/add/copayers/copayers.ts b/src/pages/add/copayers/copayers.ts index 7a9249a68..73f599889 100644 --- a/src/pages/add/copayers/copayers.ts +++ b/src/pages/add/copayers/copayers.ts @@ -1,6 +1,5 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; // Pages import { HomePage } from '../../../pages/home/home'; @@ -14,6 +13,7 @@ import { PlatformProvider } from '../../../providers/platform/platform'; import { PopupProvider } from '../../../providers/popup/popup'; import { ProfileProvider } from '../../../providers/profile/profile'; import { WalletProvider } from '../../../providers/wallet/wallet'; +import { Logger } from '../../../providers/logger/logger'; @Component({ diff --git a/src/pages/add/create-wallet/create-wallet.ts b/src/pages/add/create-wallet/create-wallet.ts index 04a02bda9..e6bf91cd2 100644 --- a/src/pages/add/create-wallet/create-wallet.ts +++ b/src/pages/add/create-wallet/create-wallet.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; // Pages import { HomePage } from '../../../pages/home/home'; diff --git a/src/pages/add/import-wallet/import-wallet.ts b/src/pages/add/import-wallet/import-wallet.ts index bc06cf00e..bd42a00c6 100644 --- a/src/pages/add/import-wallet/import-wallet.ts +++ b/src/pages/add/import-wallet/import-wallet.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; // Pages import { HomePage } from '../../../pages/home/home'; diff --git a/src/pages/add/join-wallet/join-wallet.ts b/src/pages/add/join-wallet/join-wallet.ts index fd758c648..afdef1672 100644 --- a/src/pages/add/join-wallet/join-wallet.ts +++ b/src/pages/add/join-wallet/join-wallet.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; // Pages import { HomePage } from '../../../pages/home/home'; diff --git a/src/pages/backup/backup-game/backup-game.ts b/src/pages/backup/backup-game/backup-game.ts index 415e650fc..49c97317d 100644 --- a/src/pages/backup/backup-game/backup-game.ts +++ b/src/pages/backup/backup-game/backup-game.ts @@ -1,6 +1,6 @@ import { Component, ViewChild } from '@angular/core'; import { NavController, Slides, Navbar, AlertController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import * as _ from 'lodash'; //pahes diff --git a/src/pages/buy-and-sell/buy-and-sell.ts b/src/pages/buy-and-sell/buy-and-sell.ts index b13292701..6021537aa 100644 --- a/src/pages/buy-and-sell/buy-and-sell.ts +++ b/src/pages/buy-and-sell/buy-and-sell.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //pages import { GlideraPage } from '../integrations/glidera/glidera'; diff --git a/src/pages/feedback/feedback-complete/feedback-complete.ts b/src/pages/feedback/feedback-complete/feedback-complete.ts index 204c3c4a9..a772ac27b 100644 --- a/src/pages/feedback/feedback-complete/feedback-complete.ts +++ b/src/pages/feedback/feedback-complete/feedback-complete.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, ViewController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //native import { SocialSharing } from '@ionic-native/social-sharing'; diff --git a/src/pages/feedback/feedback/feedback.ts b/src/pages/feedback/feedback/feedback.ts index 87ec6b47e..4dfa2905a 100644 --- a/src/pages/feedback/feedback/feedback.ts +++ b/src/pages/feedback/feedback/feedback.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavParams, NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //providers import { PlatformProvider } from '../../../providers/platform/platform'; diff --git a/src/pages/home/activity/activity.ts b/src/pages/home/activity/activity.ts index 715e24dc4..d408c0321 100644 --- a/src/pages/home/activity/activity.ts +++ b/src/pages/home/activity/activity.ts @@ -1,5 +1,5 @@ import { Component } from "@angular/core"; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import { ModalController, NavController } from 'ionic-angular'; //providers diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 1b1c67fb9..7d3ee6ff3 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, Events, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; // Pages import { ActivityPage } from './activity/activity'; diff --git a/src/pages/home/proposals/proposals.ts b/src/pages/home/proposals/proposals.ts index 15fc06a34..f0302a62a 100644 --- a/src/pages/home/proposals/proposals.ts +++ b/src/pages/home/proposals/proposals.ts @@ -1,5 +1,5 @@ import { Component } from "@angular/core"; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //providers import { AddressBookProvider } from '../../../providers/address-book/address-book'; diff --git a/src/pages/includes/feedback-card/feedback-card.ts b/src/pages/includes/feedback-card/feedback-card.ts index fce961196..648bef3d5 100644 --- a/src/pages/includes/feedback-card/feedback-card.ts +++ b/src/pages/includes/feedback-card/feedback-card.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; import { NavController, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //providers import { AppProvider } from '../../../providers/app/app'; diff --git a/src/pages/includes/gravatar/gravatar.ts b/src/pages/includes/gravatar/gravatar.ts index 628209ab8..83b312529 100644 --- a/src/pages/includes/gravatar/gravatar.ts +++ b/src/pages/includes/gravatar/gravatar.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { Md5 } from 'ts-md5/dist/md5'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; @Component({ selector: 'gravatar', diff --git a/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.ts b/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.ts index f6335ef6d..026c9d3b0 100644 --- a/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.ts +++ b/src/pages/integrations/amazon/amazon-card-details/amazon-card-details.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavParams, ViewController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; // Provider @@ -83,7 +83,7 @@ export class AmazonCardDetailsPage { return; } if (!_.isEmpty(giftCard) && giftCard.status != 'PENDING') { - var newData:any = {}; + var newData: any = {}; _.merge(newData, dataFromStorage, giftCard); if (newData.status == 'expired') { diff --git a/src/pages/integrations/amazon/amazon-cards/amazon-cards.ts b/src/pages/integrations/amazon/amazon-cards/amazon-cards.ts index 98704b143..1163c7c60 100644 --- a/src/pages/integrations/amazon/amazon-cards/amazon-cards.ts +++ b/src/pages/integrations/amazon/amazon-cards/amazon-cards.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavParams, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; // Pages diff --git a/src/pages/integrations/amazon/amazon.ts b/src/pages/integrations/amazon/amazon.ts index 291349f55..16c1af7cd 100644 --- a/src/pages/integrations/amazon/amazon.ts +++ b/src/pages/integrations/amazon/amazon.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; // Pages import { AmountPage } from '../../send/amount/amount'; diff --git a/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts b/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts index 0fcf368c6..d50fc012a 100644 --- a/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts +++ b/src/pages/integrations/amazon/buy-amazon/buy-amazon.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, ModalController, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; import * as moment from 'moment'; diff --git a/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts b/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts index 3615d2c97..57f35a9bd 100644 --- a/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts +++ b/src/pages/integrations/coinbase/buy-coinbase/buy-coinbase.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; //providers diff --git a/src/pages/integrations/coinbase/coinbase.ts b/src/pages/integrations/coinbase/coinbase.ts index 2801f94b0..1a82c4b33 100644 --- a/src/pages/integrations/coinbase/coinbase.ts +++ b/src/pages/integrations/coinbase/coinbase.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, ModalController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; //providers diff --git a/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts b/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts index 19c5c207c..615ed9061 100644 --- a/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts +++ b/src/pages/integrations/coinbase/sell-coinbase/sell-coinbase.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; //pages diff --git a/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts b/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts index 32db6e470..5f942fa88 100644 --- a/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts +++ b/src/pages/integrations/glidera/buy-glidera/buy-glidera.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; //pages import { SuccessModalPage } from '../../../success/success'; diff --git a/src/pages/integrations/glidera/glidera.ts b/src/pages/integrations/glidera/glidera.ts index c724feae7..e710cf109 100644 --- a/src/pages/integrations/glidera/glidera.ts +++ b/src/pages/integrations/glidera/glidera.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import { NavController, NavParams, ModalController } from 'ionic-angular'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; diff --git a/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts b/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts index 0ac890b80..aefa09b85 100644 --- a/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts +++ b/src/pages/integrations/glidera/sell-glidera/sell-glidera.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; //pages diff --git a/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.ts b/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.ts index 5a15cb450..cbf11e13d 100644 --- a/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.ts +++ b/src/pages/integrations/mercado-libre/buy-mercado-libre/buy-mercado-libre.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, ModalController, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; import * as moment from 'moment'; diff --git a/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.ts b/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.ts index 2a9b26407..480c1cded 100644 --- a/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.ts +++ b/src/pages/integrations/mercado-libre/mercado-libre-card-details/mercado-libre-card-details.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavParams, ViewController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; // Provider import { MercadoLibreProvider } from '../../../../providers/mercado-libre/mercado-libre'; diff --git a/src/pages/integrations/mercado-libre/mercado-libre-cards/mercado-libre-cards.ts b/src/pages/integrations/mercado-libre/mercado-libre-cards/mercado-libre-cards.ts index 59f1595c1..5d64c03d9 100644 --- a/src/pages/integrations/mercado-libre/mercado-libre-cards/mercado-libre-cards.ts +++ b/src/pages/integrations/mercado-libre/mercado-libre-cards/mercado-libre-cards.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavParams, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; // Pages diff --git a/src/pages/integrations/mercado-libre/mercado-libre.ts b/src/pages/integrations/mercado-libre/mercado-libre.ts index c0c5ac6b2..4e8e5912b 100644 --- a/src/pages/integrations/mercado-libre/mercado-libre.ts +++ b/src/pages/integrations/mercado-libre/mercado-libre.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; // Pages import { AmountPage } from '../../send/amount/amount'; diff --git a/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts b/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts index 93e57985b..b032fa1f3 100644 --- a/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts +++ b/src/pages/integrations/shapeshift/shapeshift-confirm/shapeshift-confirm.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as moment from 'moment'; import * as _ from 'lodash'; diff --git a/src/pages/integrations/shapeshift/shapeshift-shift/shapeshift-shift.ts b/src/pages/integrations/shapeshift/shapeshift-shift/shapeshift-shift.ts index 94d69d7dd..a0e84e109 100644 --- a/src/pages/integrations/shapeshift/shapeshift-shift/shapeshift-shift.ts +++ b/src/pages/integrations/shapeshift/shapeshift-shift/shapeshift-shift.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; // Pages diff --git a/src/pages/integrations/shapeshift/shapeshift.ts b/src/pages/integrations/shapeshift/shapeshift.ts index 44b4865d8..1f9b92ecd 100644 --- a/src/pages/integrations/shapeshift/shapeshift.ts +++ b/src/pages/integrations/shapeshift/shapeshift.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { ModalController, NavController, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import * as _ from 'lodash'; // Pages diff --git a/src/pages/onboarding/backup-request/backup-request.ts b/src/pages/onboarding/backup-request/backup-request.ts index 6565d72bd..cf6f833bc 100644 --- a/src/pages/onboarding/backup-request/backup-request.ts +++ b/src/pages/onboarding/backup-request/backup-request.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { NavController, NavParams, AlertController} from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { NavController, NavParams, AlertController } from 'ionic-angular'; +import { Logger } from '../../../providers/logger/logger'; import { DisclaimerPage } from '../disclaimer/disclaimer'; import { BackupWarningPage } from '../../backup/backup-warning/backup-warning'; @@ -32,7 +32,7 @@ export class BackupRequestPage { } initBackupFlow() { - this.navCtrl.push(BackupWarningPage, {walletId: this.walletId, fromOnboarding: true}); + this.navCtrl.push(BackupWarningPage, { walletId: this.walletId, fromOnboarding: true }); } doBackupLater(confirmed: boolean) { @@ -42,18 +42,18 @@ export class BackupRequestPage { text: 'Go back', role: 'destructor' }, - { - text: !confirmed ? 'I understand' : 'Yes, skip', - handler: () => { - if (!confirmed) { - setTimeout(() => { - this.doBackupLater(true); - }, 300); - } else { - this.navCtrl.push(DisclaimerPage); - } + { + text: !confirmed ? 'I understand' : 'Yes, skip', + handler: () => { + if (!confirmed) { + setTimeout(() => { + this.doBackupLater(true); + }, 300); + } else { + this.navCtrl.push(DisclaimerPage); } - }] + } + }] let alert = this.alertCtrl.create(this.opts); alert.present(); } diff --git a/src/pages/onboarding/collect-email/collect-email.ts b/src/pages/onboarding/collect-email/collect-email.ts index fe9319428..0aa5a0201 100644 --- a/src/pages/onboarding/collect-email/collect-email.ts +++ b/src/pages/onboarding/collect-email/collect-email.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; //providers diff --git a/src/pages/onboarding/disclaimer/disclaimer.ts b/src/pages/onboarding/disclaimer/disclaimer.ts index e2c82cd7a..8d04b39bb 100644 --- a/src/pages/onboarding/disclaimer/disclaimer.ts +++ b/src/pages/onboarding/disclaimer/disclaimer.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import { TermsOfUsePage } from '../../settings/about/terms-of-use/terms-of-use'; import { TabsPage } from '../../tabs/tabs'; diff --git a/src/pages/onboarding/onboarding.ts b/src/pages/onboarding/onboarding.ts index 2e1ee9481..ee99e1018 100644 --- a/src/pages/onboarding/onboarding.ts +++ b/src/pages/onboarding/onboarding.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { TourPage } from './tour/tour'; import { ImportWalletPage } from '../add/import-wallet/import-wallet'; diff --git a/src/pages/onboarding/tour/tour.ts b/src/pages/onboarding/tour/tour.ts index e8b77dcb8..fa0890e81 100644 --- a/src/pages/onboarding/tour/tour.ts +++ b/src/pages/onboarding/tour/tour.ts @@ -1,6 +1,6 @@ import { Component, ViewChild } from '@angular/core'; import { NavController, LoadingController, Slides, Navbar } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //pages import { CollectEmailPage } from '../collect-email/collect-email'; diff --git a/src/pages/paper-wallet/paper-wallet.ts b/src/pages/paper-wallet/paper-wallet.ts index a7e9bcf51..9f68dd3e2 100644 --- a/src/pages/paper-wallet/paper-wallet.ts +++ b/src/pages/paper-wallet/paper-wallet.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from 'lodash'; //providers diff --git a/src/pages/pin/pin.ts b/src/pages/pin/pin.ts index ce4670108..6a649eef0 100644 --- a/src/pages/pin/pin.ts +++ b/src/pages/pin/pin.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { NavParams, ViewController, Platform } from 'ionic-angular'; import { ConfigProvider } from '../../providers/config/config'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; @Component({ selector: 'page-pin', diff --git a/src/pages/receive/custom-amount/custom-amount.ts b/src/pages/receive/custom-amount/custom-amount.ts index 10f1edddf..c1cb76a68 100644 --- a/src/pages/receive/custom-amount/custom-amount.ts +++ b/src/pages/receive/custom-amount/custom-amount.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; // Native import { SocialSharing } from '@ionic-native/social-sharing'; diff --git a/src/pages/receive/receive.ts b/src/pages/receive/receive.ts index f530b113d..8b750da87 100644 --- a/src/pages/receive/receive.ts +++ b/src/pages/receive/receive.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { NavController, Events, AlertController } from 'ionic-angular'; // Native diff --git a/src/pages/scan/scan.ts b/src/pages/scan/scan.ts index 719a88ef0..12b02d651 100644 --- a/src/pages/scan/scan.ts +++ b/src/pages/scan/scan.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, Events, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { PlatformProvider } from '../../providers/platform/platform'; diff --git a/src/pages/send/choose-fee-level/choose-fee-level.ts b/src/pages/send/choose-fee-level/choose-fee-level.ts index e39fd2960..f78292913 100644 --- a/src/pages/send/choose-fee-level/choose-fee-level.ts +++ b/src/pages/send/choose-fee-level/choose-fee-level.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { ViewController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import * as _ from 'lodash'; // Providers diff --git a/src/pages/send/confirm/confirm.ts b/src/pages/send/confirm/confirm.ts index bc1c2c9ec..a877b9d3c 100644 --- a/src/pages/send/confirm/confirm.ts +++ b/src/pages/send/confirm/confirm.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, ModalController, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import * as _ from 'lodash'; // Pages diff --git a/src/pages/send/send.ts b/src/pages/send/send.ts index 1b8a28ef9..9df62eff9 100644 --- a/src/pages/send/send.ts +++ b/src/pages/send/send.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { ProfileProvider } from '../../providers/profile/profile'; diff --git a/src/pages/settings/about/about.ts b/src/pages/settings/about/about.ts index 7435ef9c7..024f9f2f3 100644 --- a/src/pages/settings/about/about.ts +++ b/src/pages/settings/about/about.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //pages import { TermsOfUsePage } from './terms-of-use/terms-of-use'; diff --git a/src/pages/settings/about/session-log/session-log.ts b/src/pages/settings/about/session-log/session-log.ts index 5c16bea57..da2bc7f4c 100644 --- a/src/pages/settings/about/session-log/session-log.ts +++ b/src/pages/settings/about/session-log/session-log.ts @@ -1,12 +1,11 @@ import { Component } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; //native import { SocialSharing } from '@ionic-native/social-sharing'; //providers import { ConfigProvider } from '../../../../providers/config/config'; -import { HistoricLogProvider } from '../../../../providers/historic-log/historic-log'; +import { Logger } from '../../../../providers/logger/logger'; import * as _ from 'lodash'; @@ -27,12 +26,11 @@ export class SessionLogPage { constructor( private configProvider: ConfigProvider, - private historicLogProvider: HistoricLogProvider, private logger: Logger, private socialSharing: SocialSharing ) { this.config = this.configProvider.get(); - this.logLevels = this.historicLogProvider.getLevels(); + this.logLevels = this.logger.getLevels(); this.logOptions = _.keyBy(this.logLevels, 'level'); } @@ -41,20 +39,13 @@ export class SessionLogPage { } ionViewWillEnter() { - this.selectedLevel = _.has(this.config, 'log.filter') ? this.historicLogProvider.getLevel(this.config.log.filter) : this.historicLogProvider.getDefaultLevel(); + this.selectedLevel = _.has(this.config, 'log.filter') ? this.logger.getLevel(this.config.log.filter) : this.logger.getDefaultLevel(); this.setOptionSelected(this.selectedLevel.level); this.filterLogs(this.selectedLevel.weight); } private filterLogs(weight: number): void { - this.filteredLogs = this.historicLogProvider.get(weight); - //TODO get historic logs - this.filteredLogs = [ - { timestamp: "2017-12-11T14:01:36.228Z", level: 'warn', msg: 'Test warning warn' }, - { timestamp: "2017-12-11T14:01:36.228Z", level: 'debug', msg: 'Test warning debug' }, - { timestamp: "2017-12-11T14:01:36.228Z", level: 'info', msg: 'Test warning info' }, - { timestamp: "2017-12-11T14:01:36.228Z", level: 'error', msg: 'Test warning error' }, - ]; + this.filteredLogs = this.logger.get(weight); } public setOptionSelected(level: string): void { @@ -73,13 +64,12 @@ export class SessionLogPage { } }; this.configProvider.set(opts); - this.logger.debug(); } public prepareLogs(): any { let log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n'; log += '\n\n'; - log += this.historicLogProvider.get().map((v) => { + log += this.logger.get().map((v) => { return '[' + v.timestamp + '][' + v.level + ']' + v.msg; }).join('\n'); diff --git a/src/pages/settings/about/terms-of-use/terms-of-use.ts b/src/pages/settings/about/terms-of-use/terms-of-use.ts index 7d4b3916d..88602c2da 100644 --- a/src/pages/settings/about/terms-of-use/terms-of-use.ts +++ b/src/pages/settings/about/terms-of-use/terms-of-use.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; @Component({ selector: 'page-terms-of-use', diff --git a/src/pages/settings/addressbook/add/add.ts b/src/pages/settings/addressbook/add/add.ts index 05518145a..c6dbf68de 100644 --- a/src/pages/settings/addressbook/add/add.ts +++ b/src/pages/settings/addressbook/add/add.ts @@ -4,7 +4,7 @@ import { NavController, NavParams, AlertController } from 'ionic-angular'; import { BwcProvider } from '../../../../providers/bwc/bwc'; import { AddressBookProvider } from '../../../../providers/address-book/address-book'; import { AddressValidator } from '../../../../validators/address'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; @Component({ selector: 'page-addressbook-add', diff --git a/src/pages/settings/addressbook/addressbook.ts b/src/pages/settings/addressbook/addressbook.ts index f82201d9a..045af65a2 100644 --- a/src/pages/settings/addressbook/addressbook.ts +++ b/src/pages/settings/addressbook/addressbook.ts @@ -3,7 +3,7 @@ import { NavController, NavParams, AlertController } from 'ionic-angular'; import { AddressbookAddPage } from './add/add'; import { AddressbookViewPage } from './view/view'; import { AddressBookProvider } from '../../../providers/address-book/address-book'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import * as _ from 'lodash'; @Component({ diff --git a/src/pages/settings/advanced/advanced.ts b/src/pages/settings/advanced/advanced.ts index 3891bdfef..8caa59a8d 100644 --- a/src/pages/settings/advanced/advanced.ts +++ b/src/pages/settings/advanced/advanced.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //providers import { ConfigProvider } from '../../../providers/config/config'; diff --git a/src/pages/settings/alt-currency/alt-currency.ts b/src/pages/settings/alt-currency/alt-currency.ts index 015185722..128f24e15 100644 --- a/src/pages/settings/alt-currency/alt-currency.ts +++ b/src/pages/settings/alt-currency/alt-currency.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; // Providers import { ConfigProvider } from '../../../providers/config/config'; diff --git a/src/pages/settings/bitcoin-cash/bitcoin-cash.ts b/src/pages/settings/bitcoin-cash/bitcoin-cash.ts index f6c2dda64..b8cb8b988 100644 --- a/src/pages/settings/bitcoin-cash/bitcoin-cash.ts +++ b/src/pages/settings/bitcoin-cash/bitcoin-cash.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; import { NavController } from 'ionic-angular'; -import { Logger } from "@nsalaun/ng-logger"; +import { Logger } from "../../../providers/logger/logger"; import * as lodash from 'lodash'; // Pages diff --git a/src/pages/settings/fee-policy/fee-policy.ts b/src/pages/settings/fee-policy/fee-policy.ts index 9a70336c0..91fe53bd2 100644 --- a/src/pages/settings/fee-policy/fee-policy.ts +++ b/src/pages/settings/fee-policy/fee-policy.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import * as _ from 'lodash'; // Providers diff --git a/src/pages/settings/notifications/notifications.ts b/src/pages/settings/notifications/notifications.ts index 176806813..7773cedd8 100644 --- a/src/pages/settings/notifications/notifications.ts +++ b/src/pages/settings/notifications/notifications.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //providers import { ConfigProvider } from '../../../providers/config/config'; diff --git a/src/pages/settings/settings.ts b/src/pages/settings/settings.ts index b4ac4909b..d5fe4396c 100644 --- a/src/pages/settings/settings.ts +++ b/src/pages/settings/settings.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { AppProvider } from '../../providers/app/app'; diff --git a/src/pages/settings/wallet-settings/wallet-color/wallet-color.ts b/src/pages/settings/wallet-settings/wallet-color/wallet-color.ts index 13bdc81d4..4f9e54b15 100644 --- a/src/pages/settings/wallet-settings/wallet-color/wallet-color.ts +++ b/src/pages/settings/wallet-settings/wallet-color/wallet-color.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; //providers import { ProfileProvider } from '../../../../providers/profile/profile'; diff --git a/src/pages/settings/wallet-settings/wallet-name/wallet-name.ts b/src/pages/settings/wallet-settings/wallet-name/wallet-name.ts index 253df40eb..51b93f932 100644 --- a/src/pages/settings/wallet-settings/wallet-name/wallet-name.ts +++ b/src/pages/settings/wallet-settings/wallet-name/wallet-name.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events } from 'ionic-angular'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; //providers import { ProfileProvider } from '../../../../providers/profile/profile'; diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/all-addresses/all-addresses.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/all-addresses/all-addresses.ts index 902396917..9ed2cd15f 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/all-addresses/all-addresses.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/all-addresses/all-addresses.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavParams, ViewController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../../../providers/logger/logger'; //native import { SocialSharing } from '@ionic-native/social-sharing'; diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/wallet-addresses.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/wallet-addresses.ts index e70d0230b..1cb453b77 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/wallet-addresses.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-addresses/wallet-addresses.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, ModalController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../../providers/logger/logger'; //providers import { ProfileProvider } from '../../../../../providers/profile/profile'; diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-delete/wallet-delete.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-delete/wallet-delete.ts index 029f20ab7..efbe3c165 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-delete/wallet-delete.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-delete/wallet-delete.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../../providers/logger/logger'; //providers import { ProfileProvider } from '../../../../../providers/profile/profile'; diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-export/wallet-export.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-export/wallet-export.ts index d8a90f421..ac94e20c6 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-export/wallet-export.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-export/wallet-export.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, ToastController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../../providers/logger/logger'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; //native diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-extended-private-key/wallet-extended-private-key.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-extended-private-key/wallet-extended-private-key.ts index ca26c5877..7f73ea6a5 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-extended-private-key/wallet-extended-private-key.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-extended-private-key/wallet-extended-private-key.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../../../providers/logger/logger'; //providers import { ProfileProvider } from '../../../../../../providers/profile/profile'; diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.ts index cd95af458..7385263a5 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../../providers/logger/logger'; //providers import { ProfileProvider } from '../../../../../providers/profile/profile'; diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-service-url/wallet-service-url.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-service-url/wallet-service-url.ts index 415866b5b..09444fef6 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-service-url/wallet-service-url.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-service-url/wallet-service-url.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../../providers/logger/logger'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; //providers diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-settings-advanced.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-settings-advanced.ts index 9db61fa53..7c9dfba60 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-settings-advanced.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-settings-advanced.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../providers/logger/logger'; //providers import { ProfileProvider } from '../../../../providers/profile/profile'; diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-transaction-history/wallet-transaction-history.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-transaction-history/wallet-transaction-history.ts index fba5386c2..39c74fc46 100644 --- a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-transaction-history/wallet-transaction-history.ts +++ b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-transaction-history/wallet-transaction-history.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../../../providers/logger/logger'; import * as _ from 'lodash'; import * as papa from 'papaparse'; diff --git a/src/pages/settings/wallet-settings/wallet-settings.ts b/src/pages/settings/wallet-settings/wallet-settings.ts index a7ec12235..390ca172a 100644 --- a/src/pages/settings/wallet-settings/wallet-settings.ts +++ b/src/pages/settings/wallet-settings/wallet-settings.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; //providers import { ProfileProvider } from '../../../providers/profile/profile'; diff --git a/src/pages/tx-details/tx-details.ts b/src/pages/tx-details/tx-details.ts index 5f1931424..f349c6cbf 100644 --- a/src/pages/tx-details/tx-details.ts +++ b/src/pages/tx-details/tx-details.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; import { NavController, NavParams, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from "lodash"; // Providers diff --git a/src/pages/wallet-details/wallet-details.ts b/src/pages/wallet-details/wallet-details.ts index aeea2a1e7..4a625e379 100644 --- a/src/pages/wallet-details/wallet-details.ts +++ b/src/pages/wallet-details/wallet-details.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NavController, NavParams, Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { WalletProvider } from '../../providers/wallet/wallet'; diff --git a/src/providers/address-book/address-book.ts b/src/providers/address-book/address-book.ts index 1137828bb..32f178e3e 100644 --- a/src/providers/address-book/address-book.ts +++ b/src/providers/address-book/address-book.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { BwcProvider } from '../bwc/bwc'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { PersistenceProvider } from '../../providers/persistence/persistence'; import * as _ from 'lodash'; diff --git a/src/providers/amazon/amazon.ts b/src/providers/amazon/amazon.ts index fdd9752e4..4767a8f08 100644 --- a/src/providers/amazon/amazon.ts +++ b/src/providers/amazon/amazon.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from 'lodash'; //providers diff --git a/src/providers/app-identity/app-identity.ts b/src/providers/app-identity/app-identity.ts index 04e54edea..8b765de43 100644 --- a/src/providers/app-identity/app-identity.ts +++ b/src/providers/app-identity/app-identity.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { PersistenceProvider } from '../persistence/persistence'; diff --git a/src/providers/backup/backup.ts b/src/providers/backup/backup.ts index 547bb701e..cda92b3ee 100644 --- a/src/providers/backup/backup.ts +++ b/src/providers/backup/backup.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; // Providers import { AppProvider } from '../../providers/app/app'; diff --git a/src/providers/bitpay-card/bitpay-card.ts b/src/providers/bitpay-card/bitpay-card.ts index bf8a3e11b..373c7b08e 100644 --- a/src/providers/bitpay-card/bitpay-card.ts +++ b/src/providers/bitpay-card/bitpay-card.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { BitPayProvider } from '../bitpay/bitpay'; diff --git a/src/providers/bitpay/bitpay.ts b/src/providers/bitpay/bitpay.ts index bc1b02e43..619678bef 100644 --- a/src/providers/bitpay/bitpay.ts +++ b/src/providers/bitpay/bitpay.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { AppIdentityProvider } from '../app-identity/app-identity'; diff --git a/src/providers/buy-and-sell/buy-and-sell.ts b/src/providers/buy-and-sell/buy-and-sell.ts index 2f71c9e60..8c013868e 100644 --- a/src/providers/buy-and-sell/buy-and-sell.ts +++ b/src/providers/buy-and-sell/buy-and-sell.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { NextStepsProvider } from '../next-steps/next-steps'; diff --git a/src/providers/bwc/bwc.ts b/src/providers/bwc/bwc.ts index c1fe2682e..d878cadcd 100644 --- a/src/providers/bwc/bwc.ts +++ b/src/providers/bwc/bwc.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as BWC from 'bitcore-wallet-client'; diff --git a/src/providers/coinbase/coinbase.ts b/src/providers/coinbase/coinbase.ts index 523d96b6f..f20e08630 100644 --- a/src/providers/coinbase/coinbase.ts +++ b/src/providers/coinbase/coinbase.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { HttpClient } from '@angular/common/http'; import { Events } from 'ionic-angular'; diff --git a/src/providers/config/config.ts b/src/providers/config/config.ts index 5b8e45eaa..38f8295a3 100644 --- a/src/providers/config/config.ts +++ b/src/providers/config/config.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { PersistenceProvider } from '../persistence/persistence'; import * as _ from "lodash"; diff --git a/src/providers/email-notifications/email-notifications.ts b/src/providers/email-notifications/email-notifications.ts index 166001a12..94cad275b 100644 --- a/src/providers/email-notifications/email-notifications.ts +++ b/src/providers/email-notifications/email-notifications.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { ConfigProvider } from '../config/config'; diff --git a/src/providers/external-link/external-link.ts b/src/providers/external-link/external-link.ts index 875d1a876..635c6a5dd 100644 --- a/src/providers/external-link/external-link.ts +++ b/src/providers/external-link/external-link.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { PopupProvider } from '../popup/popup'; diff --git a/src/providers/fee/fee.ts b/src/providers/fee/fee.ts index bbb434904..b1f2877d3 100644 --- a/src/providers/fee/fee.ts +++ b/src/providers/fee/fee.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { ConfigProvider } from '../../providers/config/config'; diff --git a/src/providers/feedback/feedback.ts b/src/providers/feedback/feedback.ts index 047cd0039..75dca7ecf 100644 --- a/src/providers/feedback/feedback.ts +++ b/src/providers/feedback/feedback.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; @Injectable() export class FeedbackProvider { diff --git a/src/providers/filter/filter.ts b/src/providers/filter/filter.ts index 984e2bdfd..57b326d12 100644 --- a/src/providers/filter/filter.ts +++ b/src/providers/filter/filter.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { DecimalPipe } from '@angular/common'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; @Injectable() export class FilterProvider { diff --git a/src/providers/glidera/glidera.ts b/src/providers/glidera/glidera.ts index c958dfd4d..c9d019bb5 100644 --- a/src/providers/glidera/glidera.ts +++ b/src/providers/glidera/glidera.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { HttpClient, HttpHeaders } from '@angular/common/http'; //providers diff --git a/src/providers/historic-log/historic-log.ts b/src/providers/historic-log/historic-log.ts deleted file mode 100644 index 1b27ff40d..000000000 --- a/src/providers/historic-log/historic-log.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; - -import * as _ from 'lodash'; - -@Injectable() -export class HistoricLogProvider { - - public levels: any; - public weight: any; - public logs: any; - - constructor( - private logger: Logger - ) { - this.logger.info('HistoricLogProvider initialized.'); - this.levels = [ - { level: 'error', weight: 0, label: 'Error' }, - { level: 'warn', weight: 1, label: 'Warning' }, - { level: 'info', weight: 2, label: 'Info', default: true }, - { level: 'debug', weight: 3, label: 'Debug' } - ]; - - // Create an array of level weights for performant filtering. - this.weight = {}; - for (let i = 0; i < this.levels.length; i++) { - this.weight[this.levels[i].level] = this.levels[i].weight; - } - } - public getLevels(): void { - return this.levels; - }; - - public getLevel(level): any { - return _.find(this.levels, (l) => { - return l.level == level; - }); - }; - - public getDefaultLevel(): any { - return _.find(this.levels, (l) => { - return l.default; - }); - }; - - public add(level, msg): any { - this.logs.push({ - timestamp: new Date().toISOString(), - level: level, - msg: msg, - }); - }; - - public get(filterWeight?: number): any { - let filteredLogs = this.logs; - if (filterWeight != undefined) { - filteredLogs = _.filter(this.logs, (l) => { - return this.weight[l.level] <= filterWeight; - }); - } - return filteredLogs; - }; -} - diff --git a/src/providers/home-integrations/home-integrations.ts b/src/providers/home-integrations/home-integrations.ts index dbe1e2a34..2c4c2c79e 100644 --- a/src/providers/home-integrations/home-integrations.ts +++ b/src/providers/home-integrations/home-integrations.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from 'lodash'; diff --git a/src/providers/incoming-data/incoming-data.ts b/src/providers/incoming-data/incoming-data.ts index 6bf6e8827..8140b347b 100644 --- a/src/providers/incoming-data/incoming-data.ts +++ b/src/providers/incoming-data/incoming-data.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Events, NavController, App } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { BwcProvider } from '../bwc/bwc'; diff --git a/src/providers/language/language.ts b/src/providers/language/language.ts index d90648475..de8e277b9 100644 --- a/src/providers/language/language.ts +++ b/src/providers/language/language.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { TranslateService } from '@ngx-translate/core'; import { ConfigProvider } from '../config/config'; diff --git a/src/providers/logger/logger.ts b/src/providers/logger/logger.ts new file mode 100644 index 000000000..8e1ef0457 --- /dev/null +++ b/src/providers/logger/logger.ts @@ -0,0 +1,123 @@ +import { Injectable } from '@angular/core'; +import { Logger as Log } from '../../providers/logger/logger'; + +//providers +import { PlatformProvider } from '../../providers/platform/platform'; + +import * as _ from 'lodash'; + +@Injectable() +export class Logger { + + public levels: any; + public weight: any; + public logs: Array; + + constructor( + private logger: Log, + private platformProvider: PlatformProvider + ) { + this.logger.info('Logger initialized.'); + this.logs = []; + this.levels = [ + { level: 'error', weight: 0, label: 'Error' }, + { level: 'warn', weight: 1, label: 'Warning' }, + { level: 'info', weight: 2, label: 'Info', default: true }, + { level: 'debug', weight: 3, label: 'Debug' } + ]; + + // Create an array of level weights for performant filtering. + this.weight = {}; + for (let i = 0; i < this.levels.length; i++) { + this.weight[this.levels[i].level] = this.levels[i].weight; + } + } + + + public error(message?: any, optionalParams?: any): void { + this.logger.error(message, optionalParams); + let args = this.processingArgs(arguments); + this.add('error', args); + } + + public debug(message?: any, optionalParams?: any): void { + this.logger.debug(message, optionalParams); + let args = this.processingArgs(arguments); + this.add('debug', args); + } + + public info(message?: any, optionalParams?: any): void { + this.logger.info(message, optionalParams); + let args = this.processingArgs(arguments); + this.add('info', args); + } + + public warn(message?: any, optionalParams?: any): void { + this.logger.warn(message, optionalParams); + let args = this.processingArgs(arguments); + this.add('warn', args); + } + + public getLevels(): void { + return this.levels; + }; + + public getLevel(level): any { + return _.find(this.levels, (l) => { + return l.level == level; + }); + }; + + public getDefaultLevel(): any { + return _.find(this.levels, (l) => { + return l.default; + }); + }; + + public add(level, msg): any { + msg = msg.replace('/xpriv.*/', 'xpriv[Hidden]'); + this.logs.push({ + timestamp: new Date().toISOString(), + level: level, + msg: msg, + }); + }; + + public get(filterWeight?: number): any { + let filteredLogs = this.logs; + if (filterWeight != undefined) { + filteredLogs = _.filter(this.logs, (l) => { + return this.weight[l.level] <= filterWeight; + }); + } + return filteredLogs; + }; + + public processingArgs(argsValues: any) { + var args = Array.prototype.slice.call(argsValues); + args = args.map((v) => { + try { + if (typeof v == 'undefined') v = 'undefined'; + if (!v) v = 'null'; + if (typeof v == 'object') { + if (v.message) + v = v.message; + else + v = JSON.stringify(v); + } + // Trim output in mobile + if (this.platformProvider.isCordova) { + v = v.toString(); + if (v.length > 3000) { + v = v.substr(0, 2997) + '...'; + } + } + } catch (e) { + console.log('Error at log decorator:', e); + v = 'undefined'; + } + return v; + }); + return args.join(' '); + } +} diff --git a/src/providers/mercado-libre/mercado-libre.ts b/src/providers/mercado-libre/mercado-libre.ts index b863c2f29..f8d1970fa 100644 --- a/src/providers/mercado-libre/mercado-libre.ts +++ b/src/providers/mercado-libre/mercado-libre.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { HttpClient } from '@angular/common/http'; //providers diff --git a/src/providers/next-steps/next-steps.ts b/src/providers/next-steps/next-steps.ts index 0110a89ef..737d5b554 100644 --- a/src/providers/next-steps/next-steps.ts +++ b/src/providers/next-steps/next-steps.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from 'lodash'; diff --git a/src/providers/node-webkit/node-webkit.ts b/src/providers/node-webkit/node-webkit.ts index f4cb21717..41e387dd0 100644 --- a/src/providers/node-webkit/node-webkit.ts +++ b/src/providers/node-webkit/node-webkit.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; @Injectable() export class NodeWebkitProvider { diff --git a/src/providers/on-going-process/on-going-process.ts b/src/providers/on-going-process/on-going-process.ts index be16ebe18..616de40b2 100644 --- a/src/providers/on-going-process/on-going-process.ts +++ b/src/providers/on-going-process/on-going-process.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { LoadingController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; @Injectable() export class OnGoingProcessProvider { diff --git a/src/providers/paypro/paypro.ts b/src/providers/paypro/paypro.ts index 7c48248dc..17e7fdd6c 100644 --- a/src/providers/paypro/paypro.ts +++ b/src/providers/paypro/paypro.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { ProfileProvider } from '../profile/profile'; diff --git a/src/providers/persistence/persistence.spec.ts b/src/providers/persistence/persistence.spec.ts index fdc9fe971..2a2242c1c 100644 --- a/src/providers/persistence/persistence.spec.ts +++ b/src/providers/persistence/persistence.spec.ts @@ -1,7 +1,7 @@ import { TestBed, inject } from '@angular/core/testing'; import { Logger, Level as LoggerLevel } from '@nsalaun/ng-logger'; import { Platform } from 'ionic-angular'; -import {} from 'jasmine'; +import { } from 'jasmine'; import { PersistenceProvider } from './persistence'; import { IStorage, ISTORAGE } from './storage/istorage'; diff --git a/src/providers/persistence/persistence.ts b/src/providers/persistence/persistence.ts index 14c71241c..60f7cffaf 100644 --- a/src/providers/persistence/persistence.ts +++ b/src/providers/persistence/persistence.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { File } from '@ionic-native/file'; import * as _ from 'lodash'; diff --git a/src/providers/persistence/storage/file-storage.ts b/src/providers/persistence/storage/file-storage.ts index c0145d9dd..6fe332a98 100644 --- a/src/providers/persistence/storage/file-storage.ts +++ b/src/providers/persistence/storage/file-storage.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../../providers/logger/logger'; import * as _ from 'lodash'; import { File, DirectoryEntry } from '@ionic-native/file'; import { IStorage, KeyAlreadyExistsError } from './istorage'; diff --git a/src/providers/platform/platform.ts b/src/providers/platform/platform.ts index deb6496c5..830234149 100644 --- a/src/providers/platform/platform.ts +++ b/src/providers/platform/platform.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Platform } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; @Injectable() export class PlatformProvider { diff --git a/src/providers/popup/popup.ts b/src/providers/popup/popup.ts index e83e0023c..3bf949fcb 100644 --- a/src/providers/popup/popup.ts +++ b/src/providers/popup/popup.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { AlertController } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; @Injectable() export class PopupProvider { diff --git a/src/providers/profile/profile.spec.ts b/src/providers/profile/profile.spec.ts index f0a62beac..f27cef2a9 100644 --- a/src/providers/profile/profile.spec.ts +++ b/src/providers/profile/profile.spec.ts @@ -1,6 +1,6 @@ import { TestBed, inject, async } from '@angular/core/testing'; import { HttpClient } from '@angular/common/http'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { WalletProvider } from '../wallet/wallet'; import { ProfileProvider } from './profile'; import { PersistenceProvider } from '../persistence/persistence'; diff --git a/src/providers/profile/profile.ts b/src/providers/profile/profile.ts index 86fb5d99a..b67ee39c8 100644 --- a/src/providers/profile/profile.ts +++ b/src/providers/profile/profile.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from 'lodash'; //providers diff --git a/src/providers/push-notifications/push-notifications.ts b/src/providers/push-notifications/push-notifications.ts index 45d530d77..cf082715d 100644 --- a/src/providers/push-notifications/push-notifications.ts +++ b/src/providers/push-notifications/push-notifications.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { NavController, App } from 'ionic-angular'; import { FCM } from '@ionic-native/fcm'; diff --git a/src/providers/rate/rate.ts b/src/providers/rate/rate.ts index cb08d81d7..d76a4739e 100644 --- a/src/providers/rate/rate.ts +++ b/src/providers/rate/rate.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from 'lodash'; @Injectable() diff --git a/src/providers/scan/scan.ts b/src/providers/scan/scan.ts index 6c46b97b1..acc3a63f0 100644 --- a/src/providers/scan/scan.ts +++ b/src/providers/scan/scan.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { QRScanner } from '@ionic-native/qr-scanner'; import { PlatformProvider } from '../platform/platform'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { Events } from 'ionic-angular'; @Injectable() diff --git a/src/providers/shapeshift/shapeshift.ts b/src/providers/shapeshift/shapeshift.ts index 9ef392d3b..f38766b3f 100644 --- a/src/providers/shapeshift/shapeshift.ts +++ b/src/providers/shapeshift/shapeshift.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from 'lodash'; //providers diff --git a/src/providers/touchid/touchid.ts b/src/providers/touchid/touchid.ts index b78f934c8..e4ea0e1a1 100644 --- a/src/providers/touchid/touchid.ts +++ b/src/providers/touchid/touchid.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { PlatformProvider } from '../platform/platform'; import { ConfigProvider } from '../config/config'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import { TouchID } from '@ionic-native/touch-id'; import { AndroidFingerprintAuth } from '@ionic-native/android-fingerprint-auth'; diff --git a/src/providers/tx-confirm-notification/tx-confirm-notification.ts b/src/providers/tx-confirm-notification/tx-confirm-notification.ts index 508e97a12..e55f01613 100644 --- a/src/providers/tx-confirm-notification/tx-confirm-notification.ts +++ b/src/providers/tx-confirm-notification/tx-confirm-notification.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; //providers import { PersistenceProvider } from '../persistence/persistence'; diff --git a/src/providers/tx-format/tx-format.ts b/src/providers/tx-format/tx-format.ts index 13bd2656c..ba938ff61 100644 --- a/src/providers/tx-format/tx-format.ts +++ b/src/providers/tx-format/tx-format.ts @@ -3,7 +3,7 @@ import { BwcProvider } from '../bwc/bwc'; import { RateProvider } from '../rate/rate'; import { ConfigProvider } from '../config/config'; import { FilterProvider } from '../filter/filter'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as _ from "lodash"; diff --git a/src/providers/wallet/wallet.ts b/src/providers/wallet/wallet.ts index 5f71a603d..5626e95a4 100644 --- a/src/providers/wallet/wallet.ts +++ b/src/providers/wallet/wallet.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Events } from 'ionic-angular'; -import { Logger } from '@nsalaun/ng-logger'; +import { Logger } from '../../providers/logger/logger'; import * as lodash from 'lodash'; // Providers