diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json index 173c08e1d..000c91764 100644 --- a/app-template/bitpay/appConfig.json +++ b/app-template/bitpay/appConfig.json @@ -23,13 +23,15 @@ "windowsAppId": "2d1002d7-ee34-4f60-bd29-0c871ba0c195", "pushSenderId": "1036948132229", "description": "Secure Bitcoin Wallet", - "version": "4.0.1", - "androidVersion": "400001", + "version": "4.0.2", + "androidVersion": "40000002", "_extraCSS": null, "_enabledExtensions": { "coinbase": true, "glidera": true, "debitcard": true, - "amazon": true + "amazon": true, + "mercadolibre": false, + "shapeshift": true } } diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json index 15bd6018b..9790a2f72 100644 --- a/app-template/copay/appConfig.json +++ b/app-template/copay/appConfig.json @@ -23,12 +23,15 @@ "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c", "pushSenderId": "1036948132229", "description": "A Secure Bitcoin Wallet", - "version": "4.0.1", - "androidVersion": "400001", + "version": "4.0.2", + "androidVersion": "40000002", "_extraCSS": null, "_enabledExtensions": { - "coinbase": true, - "glidera": true, - "amazon": true + "coinbase": false, + "glidera": false, + "debitcard": false, + "amazon": false, + "mercadolibre": false, + "shapeshift": false } } diff --git a/package.json b/package.json index 0cc31e302..68b12d650 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 875b8f752..299e17efe 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,12 +10,12 @@ import { AppProvider } from '../providers/app/app'; import { ProfileProvider } from '../providers/profile/profile'; import { ConfigProvider } from '../providers/config/config'; import { TouchIdProvider } from '../providers/touchid/touchid'; -//import { GlideraProvider } from '../providers/glidera/glidera'; -//import { CoinbaseProvider } from '../providers/coinbase/coinbase'; +import { GlideraProvider } from '../providers/glidera/glidera'; +import { CoinbaseProvider } from '../providers/coinbase/coinbase'; import { AmazonProvider } from '../providers/amazon/amazon'; //import { BitPayCardProvider } from '../providers/bitpay-card/bitpay-card'; import { MercadoLibreProvider } from '../providers/mercado-libre/mercado-libre'; -//import { ShapeshiftProvider } from '../providers/shapeshift/shapeshift'; +import { ShapeshiftProvider } from '../providers/shapeshift/shapeshift'; //pages import { TabsPage } from '../pages/tabs/tabs'; @@ -43,12 +43,12 @@ export class CopayApp { private profile: ProfileProvider, private configProvider: ConfigProvider, private modalCtrl: ModalController, - //private glideraProvider: GlideraProvider, - //private coinbaseProvider: CoinbaseProvider, + private glideraProvider: GlideraProvider, + private coinbaseProvider: CoinbaseProvider, private amazonProvider: AmazonProvider, //private bitPayCardProvider: BitPayCardProvider, private mercadoLibreProvider: MercadoLibreProvider, - //private shapeshiftProvider: ShapeshiftProvider + private shapeshiftProvider: ShapeshiftProvider ) { this.initializeApp(); } @@ -131,15 +131,29 @@ export class CopayApp { } private registerIntegrations(): void { - this.mercadoLibreProvider.register(); - this.amazonProvider.register(); - // Services disabled - //this.bitPayCardProvider.register(); - //this.glideraProvider.setCredentials(); - //this.glideraProvider.register(); - //this.coinbaseProvider.setCredentials(); - //this.coinbaseProvider.register(); - //this.shapeshiftProvider.register(); + // Mercado Libre + if (this.app.info._enabledExtensions.mercadolibre) this.mercadoLibreProvider.register(); + + // Amazon Gift Cards + if (this.app.info._enabledExtensions.amazon) this.amazonProvider.register(); + + // ShapeShift + if (this.app.info._enabledExtensions.shapeshift) this.shapeshiftProvider.register(); + + // Glidera + if (this.app.info._enabledExtensions.glidera) { + this.glideraProvider.setCredentials(); + this.glideraProvider.register(); + } + + // Coinbase + if (this.app.info._enabledExtensions.coinbase) { + this.coinbaseProvider.setCredentials(); + this.coinbaseProvider.register(); + } + + // Disabled: needs to be fixed + // if (this.app.info._enabledExtensions.debitcard) this.bitPayCardProvider.register(); } } diff --git a/src/pages/home/home.html b/src/pages/home/home.html index 415062ef3..184235af8 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -92,13 +92,10 @@ -
- - - - +
+
@@ -269,4 +266,4 @@
- \ No newline at end of file + diff --git a/src/pages/home/home.scss b/src/pages/home/home.scss index 97ec6eeed..6ac7ef1b8 100644 --- a/src/pages/home/home.scss +++ b/src/pages/home/home.scss @@ -52,4 +52,12 @@ page-home { .error { color: color($colors, danger); } + .no-wallets { + height: 100%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; + } } diff --git a/src/pages/settings/settings.ts b/src/pages/settings/settings.ts index d5fe4396c..a86a3dc30 100644 --- a/src/pages/settings/settings.ts +++ b/src/pages/settings/settings.ts @@ -126,7 +126,7 @@ export class SettingsPage { } public openHelpExternalLink(): void { - var url = this.appName == 'copay' ? 'https://github.com/bitpay/copay/issues' : 'https://help.bitpay.com/bitpay-app'; + var url = this.appName == 'Copay' ? 'https://github.com/bitpay/copay/issues' : 'https://help.bitpay.com/bitpay-app'; var optIn = true; var title = null; var message = 'Help and support information is available at the website.'; // TODO gettextCatalog diff --git a/src/pages/wallet-details/wallet-details.scss b/src/pages/wallet-details/wallet-details.scss index d036d2f80..7b9815a20 100644 --- a/src/pages/wallet-details/wallet-details.scss +++ b/src/pages/wallet-details/wallet-details.scss @@ -15,7 +15,7 @@ page-wallet-details { font-weight: 600; } .balance-alt-str { - font-size: 20px; + font-size: 18px; font-weight: 500; } .balance-hidden {