src/app/modules/plus/plan/payment-plan.component.scss

@@ -131,4 +131,8 @@
  }
  }
  }
+ .minds-error {
+ width: 100%;
+ text-align: center;
+ }
 }

src/app/modules/plus/plan/payment-plan.component.spec.ts

@@ -39,21 +39,13 @@ let overlayModal = new function () {
  });
 };
 
-describe('WirePaymentsCreatorComponent', () => {
+fdescribe('WirePaymentsCreatorComponent', () => {
 
  let comp: PaymentPlanComponent;
  let fixture: ComponentFixture<PaymentPlanComponent>;
 
- function getMonthlyButton(): DebugElement {
- return fixture.debugElement.query(By.css('.m-plus-plan__plans > div:nth-child(1) > button'));
- }
-
- function getYearlyButton(): DebugElement {
- return fixture.debugElement.query(By.css('.m-plus-plan__plans > div:nth-child(2) > button'));
- }
-
- function getLifeButton(): DebugElement {
- return fixture.debugElement.query(By.css('.m-plus-plan__plans > div:nth-child(3) > button'));
+ function getButton(): DebugElement {
+ return fixture.debugElement.query(By.css('.m-plus-plan__period-buy-button__blue'));
  }
 
  beforeEach(async(() => {
@@ -96,6 +88,7 @@ describe('WirePaymentsCreatorComponent', () => {
  window.Minds.blockchain = {
  plus_address: 'oxtn'
  }
+ // comp.receiver = window.Minds.blockchain.plus_address;
  comp = fixture.componentInstance; // LoginForm test instance
 
  fixture.detectChanges();
@@ -113,55 +106,50 @@ describe('WirePaymentsCreatorComponent', () => {
  jasmine.clock().uninstall();
  });
 
- it('should have a buy monthly button', () => {
- const monthlyButton = getMonthlyButton();
- expect(monthlyButton).not.toBeNull();
+ it('should have a purchase button', () => {
+ const button = getButton();
+ expect(button).not.toBeNull();
  });
 
  it('should create the payment object for monthly', () => {
- const monthlyButton = getMonthlyButton();
- spyOn(comp, 'createPayment').and.stub(); 
- monthlyButton.nativeElement.click();
- expect(comp.createPayment).toHaveBeenCalledWith('month');
- });
-
- it('should set the amount correctly for monthly', () => {
- const result = comp.createPayment('month');
- expect(result.amount).toBe(20);
+ const button = getButton();
+ spyOn(comp, 'submit').and.stub(); 
+ button.nativeElement.click();
+ expect(comp.submit).toHaveBeenCalledWith('month');
  });
 
- it('should have a buy yearly button', () => {
- const yearlyButton = getYearlyButton();
- expect(yearlyButton).not.toBeNull();
+ it('should set the amount correctly for monthly offchain', () => {
+ comp.createWire('offchain month');
+ expect(comp.wire.amount).toBe(20);
  });
 
  it('should create the payment object for yearly', () => {
- const yearlyButton = getYearlyButton();
- spyOn(comp, 'createPayment').and.stub(); 
- yearlyButton.nativeElement.click();
- expect(comp.createPayment).toHaveBeenCalledWith('year');
+ const button = getButton();
+ spyOn(comp, 'submit').and.stub(); 
+ button.nativeElement.click();
+ expect(comp.submit).toHaveBeenCalledWith('year');
  });
 
  it('should set the amount correctly for yearly', () => {
- const result = comp.createPayment('year');
- expect(result.amount).toBe(180);
+ comp.createWire('offchain month');
+ expect(comp.wire.amount).toBe(200);
  });
 
  it('should have a buy life button', () => {
- const lifeButton = getLifeButton();
- expect(lifeButton).not.toBeNull();
+ const button = getButton();
+ expect(button).not.toBeNull();
  });
 
  it('should create the payment object for life', () => {
- const lifeButton = getLifeButton();
- spyOn(comp, 'createPayment').and.stub(); 
- lifeButton.nativeElement.click();
- expect(comp.createPayment).toHaveBeenCalledWith('lifetime')
+ const button = getButton();
+ spyOn(comp, 'submit').and.stub(); 
+ button.nativeElement.click();
+ expect(comp.submit).toHaveBeenCalledWith('lifetime')
  });
  
  it('should set the amount correctly for lifetime', () => {
- const result = comp.createPayment('lifetime');
- expect(result.amount).toBe(500);
+ comp.createWire('offchain lifetime');
+ expect(comp.wire.amount).toBe(500);
  });
 
 });

src/app/modules/plus/plan/payment-plan.component.ts

@@ -80,8 +80,6 @@ export class PaymentPlanComponent {
  this.setDefaults();
  }
 
- @Input() receiver;
-
  constructor(
  public session: Session,
  private cd: ChangeDetectorRef,
@@ -207,7 +205,6 @@ export class PaymentPlanComponent {
 
  this.wire.recurring = false;
  this.wire.guid = this.minds.blockchain.plus_guid;
- this.wire.payload = '';
  }
 
  async submit() {
@@ -302,9 +299,9 @@ export class PaymentPlanComponent {
  balance = this.balances.offchain / Math.pow(10, 18);
 
  if (this.wire.amount > wireCap) {
- throw new VisibleWireError(`You cannot spend more than ${wireCap} tokens today.`)
+ throw new VisibleWireError(`You cannot spend more than ${wireCap} tokens today.`);
  } else if (this.wire.amount > balance) {
- throw new VisibleWireError(`You cannot spend more than ${balance} tokens.`)
+ throw new VisibleWireError(`You cannot spend more than ${balance} tokens.`);
  }
  break;
  }
@@ -353,7 +350,7 @@ export class PaymentPlanComponent {
  * Sets the onchain specific wire payment nonce
  */
  setOnchainNoncePayload(address: string) {
- return this.setNoncePayload({ receiver: this.receiver, address })
+ return this.setNoncePayload({ receiver: this.blockchain.plus_address, address })
  }
 
  /**