Merge pull request #10736 from JohnathanWhite/feat/dynamic-card-network

making card use a dynamic network
bitpay · Mar 19, 2020 · 16d7d34 · 16d7d34
2 parents 8b3ee86 + b883dad
commit 16d7d34
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -246,8 +246,9 @@ export class CopayApp {
     if (experiment === 'enabled') {
       this.NETWORK = 'testnet';
     }
-    this.bitpayProvider.init(experiment);
-    this.bitpayIdProvider.init(experiment);
+    this.bitpayProvider.setNetwork(this.NETWORK);
+    this.bitpayIdProvider.setNetwork(this.NETWORK);
+    this.iabCardProvider.setNetwork(this.NETWORK);
 
     this.registerIntegrations();
     this.incomingDataRedirEvent();

diff --git a/src/providers/bitpay-id/bitpay-id.ts b/src/providers/bitpay-id/bitpay-id.ts
@@ -35,8 +35,8 @@ export class BitPayIdProvider {
     }
   }
 
-  public init(status: string) {
-    this.NETWORK = status === 'enabled' ? 'testnet' : 'livenet';
+  public setNetwork(network: string) {
+    this.NETWORK = network;
     this.BITPAY_API_URL =
       this.NETWORK == 'livenet'
         ? 'https://bitpay.com'

diff --git a/src/providers/bitpay/bitpay.ts b/src/providers/bitpay/bitpay.ts
@@ -19,8 +19,8 @@ export class BitPayProvider {
     this.logger.debug('BitPayProvider initialized');
   }
 
-  public init(status: string) {
-    this.NETWORK = status === 'enabled' ? 'testnet' : 'livenet';
+  public setNetwork(network: string) {
+    this.NETWORK = network;
     this.BITPAY_API_URL =
       this.NETWORK == 'livenet'
         ? 'https://bitpay.com'

diff --git a/src/providers/in-app-browser/card.ts b/src/providers/in-app-browser/card.ts
@@ -25,8 +25,8 @@ import { SimplexProvider } from '../simplex/simplex';
 @Injectable()
 export class IABCardProvider {
   private cardIAB_Ref: InAppBrowserRef;
-  private NETWORK = Network.testnet;
-  private BITPAY_API_URL = 'https://test.bitpay.com';
+  private NETWORK: string;
+  private BITPAY_API_URL: string;
 
   private _isHidden = true;
   private _pausedState = false;
@@ -50,6 +50,15 @@ export class IABCardProvider {
     private onGoingProcess: OnGoingProcessProvider
   ) {}
 
+  public setNetwork(network: string) {
+    this.NETWORK = network;
+    this.BITPAY_API_URL =
+      this.NETWORK == 'livenet'
+        ? 'https://bitpay.com'
+        : 'https://test.bitpay.com';
+    this.logger.log(`card provider initialized with ${this.NETWORK}`);
+  }
+
   async getCards() {
     const json = {
       method: 'getDebitCards'