Merge pull request #7885 from cmgustavo/v4-44

[v4] Enable services by appConfig. Fix no-wallets view. Fix link to support

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",
+  "version": "4.0.2",
-  "androidVersion": "400001",
+  "androidVersion": "40000002",
   "_extraCSS": null,
   "_enabledExtensions": {
     "coinbase": true,
     "glidera": true,
     "debitcard": true,
-    "amazon": true
+    "amazon": true,
+    "mercadolibre": false,
+    "shapeshift": true
   }
 }

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",
+  "version": "4.0.2",
-  "androidVersion": "400001",
+  "androidVersion": "40000002",
   "_extraCSS": null,
   "_enabledExtensions": {
-    "coinbase": true,
+    "coinbase": false,
-    "glidera": true,
+    "glidera": false,
-    "amazon": true
+    "debitcard": false,
+    "amazon": false,
+    "mercadolibre": false,
+    "shapeshift": false
   }
 }

package.json

@@ -196,4 +196,4 @@
       "ios"
     ]
   }
-}
+}

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 { GlideraProvider } from '../providers/glidera/glidera';
-//import { CoinbaseProvider } from '../providers/coinbase/coinbase';
+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 glideraProvider: GlideraProvider,
-    //private coinbaseProvider: CoinbaseProvider,
+    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
+    // Mercado Libre
-    //this.bitPayCardProvider.register();
+    if (this.app.info._enabledExtensions.mercadolibre) this.mercadoLibreProvider.register();
-    //this.glideraProvider.setCredentials();
+
-    //this.glideraProvider.register();
+    // Amazon Gift Cards
-    //this.coinbaseProvider.setCredentials();
+    if (this.app.info._enabledExtensions.amazon) this.amazonProvider.register();
-    //this.coinbaseProvider.register();
+
-    //this.shapeshiftProvider.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();
   }
 }

src/pages/home/home.html

@@ -92,13 +92,10 @@
 
   </ion-list>
 
-  <div *ngIf="!wallets || !wallets[0]">
+  <div *ngIf="!wallets || !wallets[0]" class="no-wallets">
-    <ion-item-divider></ion-item-divider>
+    <button ion-button clear (click)="goToAddView()">
-    <ion-list (click)="goToAddView()">
+      <span translate>Create a new wallet</span>
-      <button ion-item detail-push>
+    </button>
-        <span translate>Create a new wallet</span>
-      </button>
-    </ion-list>
   </div>
 
   <ion-list *ngIf="walletsBtc && walletsBtc[0]">
@@ -269,4 +266,4 @@
       </button>
     </div>
   </ion-list>
-</ion-content>
+</ion-content>

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;
+  }
 }

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

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 {