- {!(chequebookAddress?.chequebookaddress && chequebookBalance?.totalBalance > 0) && (
+ {!(chequebookAddress?.chequebookaddress && chequebookBalance?.totalBalance.toBigNumber.isGreaterThan(0)) && (
Your chequebook is either not deployed or funded. Join{' '}
diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts
index 9aba9fd..88ef93f 100644
--- a/src/react-app-env.d.ts
+++ b/src/react-app-env.d.ts
@@ -21,17 +21,3 @@ interface StatusEthereumConnectionHook extends StatusHookCommon {
interface StatusTopologyHook extends StatusHookCommon {
topology: Topology | null
}
-
-interface StatusChequebookHook extends StatusHookCommon {
- chequebookBalance: ChequebookBalanceResponse | null
- chequebookAddress: ChequebookAddressResponse | null
-}
-
-interface Accounting {
- peer: string
- uncashedAmount: number
- balance: number
- received: number
- sent: number
- total: number
-}
diff --git a/src/utils/index.test.ts b/src/utils/index.test.ts
index bf9dc45..859b6d1 100644
--- a/src/utils/index.test.ts
+++ b/src/utils/index.test.ts
@@ -1,21 +1,7 @@
import BigNumber from 'bignumber.js'
-import { fromBZZbaseUnit, isInteger, makeBigNumber } from './index'
+import { isInteger, makeBigNumber } from './index'
describe('utils', () => {
- describe('fromBZZbaseUnit', () => {
- const values = [
- { bzz: 0, baseUnits: 0 },
- { bzz: 0.1, baseUnits: 1e15 },
- { bzz: 0.9, baseUnits: 9e15 },
- ]
-
- values.forEach(({ bzz, baseUnits }) => {
- test(`converting ${bzz} => ${baseUnits}`, () => {
- expect(fromBZZbaseUnit(baseUnits)).toBe(bzz)
- })
- })
- })
-
describe('isInteger', () => {
const correctValues = [
BigInt(0),
@@ -52,8 +38,11 @@ describe('utils', () => {
new BigNumber('1'),
new BigNumber('0'),
new BigNumber('-1'),
+ 0,
+ 1,
+ -1,
]
- const wrongValues = [new Function(), 0, 1]
+ const wrongValues = [new Function()]
correctValues.forEach(v => {
test(`testing ${v}`, () => {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 5ea2dca..618cfd4 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,22 +1,5 @@
import { BigNumber } from 'bignumber.js'
-/**
- * @deprecated Should be removed in favour of Token class
- */
-const BZZ_BASE_UNIT = 1e16
-
-/**
- * Convert from base units of BZZ token to BZZ
- * @deprecated This should only be used for displaying values, it's unsafe and should be replaced with Token class
- *
- * @param amount Amount in base units of BZZ token
- *
- * @returns amount in BZZ
- */
-export const fromBZZbaseUnit = (amount: number): number => {
- return amount / BZZ_BASE_UNIT
-}
-
/**
* Test if value is an integer
*
@@ -37,12 +20,15 @@ export function isInteger(value: unknown): value is BigNumber | bigint {
*
* @returns BigNumber - but it may still be NaN or Infinite
*/
-export function makeBigNumber(value: BigNumber | bigint | string): BigNumber | never {
+export function makeBigNumber(value: BigNumber | BigInt | number | string): BigNumber | never {
if (BigNumber.isBigNumber(value)) return value
if (typeof value === 'string') return new BigNumber(value)
if (typeof value === 'bigint') return new BigNumber(value.toString())
- throw new TypeError('Not a BigNumber or BigNumber convertible value')
+ // FIXME: bee-js still returns some values as numbers and even outside of SAFE INTEGER bounds
+ if (typeof value === 'number' /* && Number.isSafeInteger(value)*/) return new BigNumber(value)
+
+ throw new TypeError(`Not a BigNumber or BigNumber convertible value. Type: ${typeof value} value: ${value}`)
}