Merge pull request #692 from adshares/develop

Change billing history description for reserved amount (#691)
adshares · Sep 20, 2019 · 4c808de · 4c808de
2 parents 94ae269 + 418aedc
commit 4c808de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.2.1] - 2019-09-20
 ### Added
 - Billing history filtering
-- Nwsletter subscribe option
+- Newsletter subscribe option
 ### Changed
 - Internal classifier rejects banners only
 

diff --git a/src/app/models/enum/billing-history.enum.ts b/src/app/models/enum/billing-history.enum.ts
@@ -2,7 +2,7 @@ export enum billingHistoryItemStatusEnum {
   ACCEPTED,
   PENDING,
   REJECTED,
-  BLOCKED,
+  RESERVED,
   PROCESSING,
   UNCONFIRMED,
   CANCELED,

diff --git a/...ling/billing-history/billing-history-withdrawal/billing-history-withdrawal.component.html b/...ling/billing-history/billing-history-withdrawal/billing-history-withdrawal.component.html
@@ -8,9 +8,16 @@
         text-center"
       attr.data-status="{{ status }}"
     >
+      <span *ngIf="billingHistoryItem.status === statusEnum.RESERVED"
+         matTooltipClass="dwmth-mat-tooltip"
+         matTooltip="The amount reserved for the ongoing campaign. After every hour the status is changed to “processing”."
+         matTooltipPosition="above"
+         class="billing-table-row__tooltip-placeholder"
+      >
+      </span>
       <span *ngIf="billingHistoryItem.status === statusEnum.UNCONFIRMED"
          matTooltipClass="dwmth-mat-tooltip"
-         matTooltip="Confirm withdrawal by visiting link from an e-mail"
+         matTooltip="Confirm withdrawal by visiting link from an e-mail."
          matTooltipPosition="above"
          class="billing-table-row__tooltip-placeholder"
       >