Merge branch 'master' into v0.22-dev

dashpay · Mar 2, 2022 · 9072d97 · 9072d97
2 parents 6983a40 + b80f9ff
commit 9072d97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/js-dash-sdk/docs/platform/identities/topUp.md b/packages/js-dash-sdk/docs/platform/identities/topUp.md
@@ -1,6 +1,8 @@
 **Usage**: `client.platform.identities.topUp(identity, amount)`    
 **Description**: This method will topup the provided identity's balance. 
 
+_The identity balance might slightly vary from the topped up amount because of the transaction fee estimation._
+
 Parameters: 
 
 | parameters        | type    | required         | Description                                                                             |  

diff --git a/packages/wallet-lib/src/types/Account/Account.d.ts b/packages/wallet-lib/src/types/Account/Account.d.ts
@@ -1,5 +1,6 @@
 import {
     Transaction,
+    TransactionHistory,
     AddressObj,
     AddressInfo,
     AddressType,
@@ -9,7 +10,7 @@ import {
     Strategy,
     Network,
     broadcastTransactionOpts,
-    Plugins, RawTransaction, TransactionsMap, WalletObj, StatusInfo, TransactionsHistory
+    Plugins, RawTransaction, TransactionsMap, WalletObj, StatusInfo
 } from "../types";
 import { KeyChain } from "../KeyChain/KeyChain";
 import { InstantLock } from "@dashevo/dashcore-lib";
@@ -62,7 +63,7 @@ export declare class Account {
     getPrivateKeys(addressList: [PublicAddress]): [PrivateKey];
     getTotalBalance(displayDuffs?: boolean): number;
     getTransaction(txid: transactionId): Transaction;
-    getTransactionHistory(): TransactionsHistory;
+    getTransactionHistory(): TransactionHistory;
     getTransactions(): [Transaction];
     getUTXOS(): [UnspentOutput];
     getUnconfirmedBalance(displayDuffs?: boolean): number;