Skip to content
This repository was archived by the owner on Mar 21, 2026. It is now read-only.

Commit 25a8db1

Browse files
geraBarbonigeraBarboni
committed
build done
1 parent bd30477 commit 25a8db1

19 files changed

Lines changed: 239 additions & 2805 deletions

‎src/components/claim/ContractsTable.tsx‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,26 @@ const ContractsTable = () => {
4040
};
4141

4242
return (
43-
myContracts?.length > 0 && (
44-
<div className="flex flex-col gap-[20px]">
45-
<Text type="h4" text="The last contracts you claimed" />
46-
<table className="flex flex-col gap-[10px]">
47-
<tr className="flex">
48-
<th className="w-[200px] flex">
49-
<Text type="overline" text="name" />
50-
</th>
51-
<th className="w-[300px] flex">
52-
<Text type="overline" text="contract Address" />
53-
</th>
54-
</tr>
55-
{myContracts.map((c: any) => (
56-
<ContractRow key={c} contract={c} />
57-
))}
58-
</table>
59-
</div>
60-
)
43+
<>
44+
{myContracts?.length > 0 && (
45+
<div className="flex flex-col gap-[20px]">
46+
<Text type="h4" text="The last contracts you claimed" />
47+
<table className="flex flex-col gap-[10px]">
48+
<tr className="flex">
49+
<th className="w-[200px] flex">
50+
<Text type="overline" text="name" />
51+
</th>
52+
<th className="w-[300px] flex">
53+
<Text type="overline" text="contract Address" />
54+
</th>
55+
</tr>
56+
{myContracts.map((c: any) => (
57+
<ContractRow key={c} contract={c} />
58+
))}
59+
</table>
60+
</div>
61+
)}
62+
</>
6163
);
6264
};
6365

‎src/components/contracts/multiplerCell.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ const MultiplerCell = ({ contract, mult, beneficiaryMultipliersToArray }: multip
2626
beneficiaryMultipliersToArray !== undefined && findMultiplierValue();
2727
}, [beneficiaryMultipliersToArray]);
2828

29-
return baseMultiplier !== null ? (
30-
baseMultiplier?.validUntilBlock === null && <td className="w-[100px]">{multiplierValue / 100 || '-'}</td>
31-
) : (
32-
<Loader />
29+
return (
30+
<>
31+
{baseMultiplier !== null ? (
32+
baseMultiplier?.validUntilBlock === null && <td className="w-[100px]">{multiplierValue / 100 || '-'}</td>
33+
) : (
34+
<Loader />
35+
)}
36+
</>
3337
);
3438
};
3539

‎src/components/contracts/multiplierHeaderCell.tsx‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ const MultiplierHeaderCell = ({ contract, multiplierId }: multiplierHeaderCellPr
1212
//---------------------------------Connect to contract---------------------------------
1313
const { baseMultiplier } = useBaseMultiplier(contract, multiplierId);
1414

15-
return baseMultiplier !== null ? (
16-
baseMultiplier?.validUntilBlock === null && (
17-
<th className="w-[100px]">
18-
<Text type="overline" text={`${baseMultiplier?.name || `multiplier ${multiplierId}`}`} />
19-
</th>
20-
)
21-
) : (
22-
<Loader />
15+
return (
16+
<>
17+
{baseMultiplier !== null ? (
18+
baseMultiplier?.validUntilBlock === null && (
19+
<th className="w-[100px]">
20+
<Text type="overline" text={`${baseMultiplier?.name || `multiplier ${multiplierId}`}`} />
21+
</th>
22+
)
23+
) : (
24+
<Loader />
25+
)}
26+
</>
2327
);
2428
};
2529

‎src/components/edit/beneficiaries/AddBeneficiaryRow.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const AddBeneficiaryRow = ({ contract, multipliersIdList, contractAddress, show
4949
const multToArray = Object.values(newMultipliers);
5050
let sum = 0;
5151
for (let i = 0; i < multToArray.length; i++) {
52-
sum += parseInt(multToArray[i]);
52+
sum += parseInt(String(multToArray[i]));
5353
}
5454
const rawBasePaymentBN = new BN(rawBasePayment);
5555
const result = rawBasePaymentBN.mul(new BN(sum / 100));

‎src/components/edit/beneficiaries/beneficiaryRow.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ const BeneficiaryRow = ({
8484
const multToArray = Object.values(newMultipliers);
8585
let sum = 0;
8686
for (let i = 0; i < multToArray.length; i++) {
87-
multToArray[i] === '' ? (sum += parseInt(oldMultToArray[i]) / 100) : (sum += parseInt(multToArray[i]) / 100);
87+
multToArray[i] === ''
88+
? (sum += parseInt(String(oldMultToArray[i])) / 100)
89+
: (sum += parseInt(String(multToArray[i])) / 100);
8890
}
8991
const rawBasePaymentBN = new BN(rawBasePayment);
9092
const result = rawBasePaymentBN.mul(new BN(sum));

‎src/components/edit/beneficiaries/multiplierCell.tsx‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -31,61 +31,61 @@ const MultiplerCell = ({
3131
beneficiaryMultipliers !== undefined && findMultiplier();
3232
}, [beneficiaryMultipliers]);
3333

34-
if (baseMultiplier?.validUntilBlock === null && multiplier !== undefined && !showInput) {
35-
return <td className="w-[100px]">{multiplier.value == 0 ? <p>1</p> : <p>{multiplier.value / 100}</p>}</td>;
36-
}
34+
return (
35+
<>
36+
{baseMultiplier?.validUntilBlock === null && multiplier !== undefined && !showInput && (
37+
<td className="w-[100px]">{multiplier.value == 0 ? <p>1</p> : <p>{multiplier.value / 100}</p>}</td>
38+
)}
3739

38-
if (baseMultiplier?.validUntilBlock === null && multiplier === undefined && !showInput) {
39-
return (
40-
<td className="w-[100px]">
41-
<p>-</p>
42-
</td>
43-
);
44-
}
45-
if (baseMultiplier?.validUntilBlock === null && multiplier !== undefined && showInput) {
46-
return (
47-
<td className="w-[100px]">
48-
<input
49-
placeholder={multiplier.value == 0 ? 1 : parseInt(multiplier.value) / 100}
50-
id={mult}
51-
type="number"
52-
disabled={disabled}
53-
name={mult}
54-
max={999}
55-
maxLength={3}
56-
pattern="[0-9]{3}"
57-
onChange={onChange}
58-
className={
59-
disabled
60-
? 'bg-opwhite border-2 border-opgray rounded-[5px] py-1.5 px-1.5 w-full'
61-
: 'bg-opwhite border-2 border-oppurple rounded-[5px] py-1.5 px-1.5 w-full'
62-
}
63-
/>
64-
</td>
65-
);
66-
}
67-
if (baseMultiplier?.validUntilBlock === null && multiplier === undefined && showInput) {
68-
return (
69-
<td className="w-[100px]">
70-
<input
71-
placeholder="-"
72-
id={mult}
73-
type="number"
74-
disabled={disabled}
75-
name={mult}
76-
max={999}
77-
maxLength={3}
78-
pattern="[0-9]{3}"
79-
onChange={onChange}
80-
className={
81-
disabled
82-
? 'bg-opwhite border-2 border-opgray rounded-[5px] py-1.5 px-1.5 w-full'
83-
: 'bg-opwhite border-2 border-oppurple rounded-[5px] py-1.5 px-1.5 w-full'
84-
}
85-
/>
86-
</td>
87-
);
88-
}
40+
{baseMultiplier?.validUntilBlock === null && multiplier === undefined && !showInput && (
41+
<td className="w-[100px]">
42+
<p>-</p>
43+
</td>
44+
)}
45+
46+
{baseMultiplier?.validUntilBlock === null && multiplier !== undefined && showInput && (
47+
<td className="w-[100px]">
48+
<input
49+
placeholder={multiplier.value == 0 ? '1' : String(parseInt(multiplier.value) / 100)}
50+
id={mult}
51+
type="number"
52+
disabled={disabled}
53+
name={mult}
54+
max={999}
55+
maxLength={3}
56+
pattern="[0-9]{3}"
57+
onChange={onChange}
58+
className={
59+
disabled
60+
? 'bg-opwhite border-2 border-opgray rounded-[5px] py-1.5 px-1.5 w-full'
61+
: 'bg-opwhite border-2 border-oppurple rounded-[5px] py-1.5 px-1.5 w-full'
62+
}
63+
/>
64+
</td>
65+
)}
66+
67+
{baseMultiplier?.validUntilBlock === null && multiplier === undefined && showInput && (
68+
<td className="w-[100px]">
69+
<input
70+
placeholder="-"
71+
id={mult}
72+
type="number"
73+
disabled={disabled}
74+
name={mult}
75+
max={999}
76+
maxLength={3}
77+
pattern="[0-9]{3}"
78+
onChange={onChange}
79+
className={
80+
disabled
81+
? 'bg-opwhite border-2 border-opgray rounded-[5px] py-1.5 px-1.5 w-full'
82+
: 'bg-opwhite border-2 border-oppurple rounded-[5px] py-1.5 px-1.5 w-full'
83+
}
84+
/>
85+
</td>
86+
)}
87+
</>
88+
);
8989
};
9090

9191
export default MultiplerCell;

‎src/components/edit/multipliers/multiplierIntput.tsx‎

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,43 +21,47 @@ const MultiplierIntput = ({ _contract, _multiplier, _active }: ContractProps) =>
2121

2222
const block = useBlockHeader();
2323

24-
return _active === true
25-
? baseMultiplier?.validUntilBlock === null && (
26-
<div>
27-
<div className="flex gap-1">
28-
<div className="flex">
29-
{isDeactivating ? (
30-
<Button type="disabled outlined" text="" icon="loading" />
31-
) : (
32-
<Button type="text" text="" icon="delete" action={() => handleDeactivateMultiplier(_multiplier)} />
33-
)}
24+
return (
25+
<>
26+
{_active === true
27+
? baseMultiplier?.validUntilBlock === null && (
28+
<div>
29+
<div className="flex gap-1">
30+
<div className="flex">
31+
{isDeactivating ? (
32+
<Button type="disabled outlined" text="" icon="loading" />
33+
) : (
34+
<Button type="text" text="" icon="delete" action={() => handleDeactivateMultiplier(_multiplier)} />
35+
)}
36+
</div>
37+
<p className="my-auto">{baseMultiplier?.name}</p>
38+
</div>
3439
</div>
35-
<p className="my-auto">{baseMultiplier?.name}</p>
36-
</div>
37-
</div>
38-
)
39-
: baseMultiplier?.validUntilBlock !== null && (
40-
<div>
41-
<div className="flex gap-1">
42-
<div className="flex">
43-
{block?.blockNumber! > parseInt(baseMultiplier?.validUntilBlock.replace(/,/g, '')) ? (
44-
isDeleting ? (
45-
<Button type="disabled outlined" text="" icon="loading" />
46-
) : (
47-
<Button type="text" icon="delete" action={() => handleDeleteUnusedMultipliers(_multiplier)} />
48-
)
49-
) : (
50-
<Button
51-
type="disabled outlined"
52-
icon="delete"
53-
action={() => handleDeleteUnusedMultipliers(_multiplier)}
54-
/>
55-
)}
40+
)
41+
: baseMultiplier?.validUntilBlock !== null && (
42+
<div>
43+
<div className="flex gap-1">
44+
<div className="flex">
45+
{block?.blockNumber! > parseInt(baseMultiplier?.validUntilBlock.replace(/,/g, '')) ? (
46+
isDeleting ? (
47+
<Button type="disabled outlined" text="" icon="loading" />
48+
) : (
49+
<Button type="text" icon="delete" action={() => handleDeleteUnusedMultipliers(_multiplier)} />
50+
)
51+
) : (
52+
<Button
53+
type="disabled outlined"
54+
icon="delete"
55+
action={() => handleDeleteUnusedMultipliers(_multiplier)}
56+
/>
57+
)}
58+
</div>
59+
<p className="my-auto">{baseMultiplier?.name}</p>
60+
</div>
5661
</div>
57-
<p className="my-auto">{baseMultiplier?.name}</p>
58-
</div>
59-
</div>
60-
);
62+
)}
63+
</>
64+
);
6165
};
6266

6367
export default MultiplierIntput;

‎src/components/generals/MultiplierName.tsx‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@ import Loader from './Loader';
66
const MultiplierName = (multiplierId: any, _contract: any) => {
77
const { baseMultiplier } = useBaseMultiplier(multiplierId._contract, multiplierId.multiplierId);
88

9-
return baseMultiplier !== undefined ? (
10-
baseMultiplier.validUntilBlock === null && (
11-
<div className="capitalize">
12-
<Text type="" text={baseMultiplier.name || 'multiplier ' + multiplierId.multiplierId} />
13-
</div>
14-
)
15-
) : (
16-
<Loader />
9+
return (
10+
<>
11+
{baseMultiplier !== undefined ? (
12+
baseMultiplier.validUntilBlock === null && (
13+
<div className="capitalize">
14+
<Text type="" text={baseMultiplier.name || 'multiplier ' + multiplierId.multiplierId} />
15+
</div>
16+
)
17+
) : (
18+
<Loader />
19+
)}
20+
</>
1721
);
1822
};
1923

‎src/context/index.tsx‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
import React, { createContext, useState, useEffect } from 'react';
1+
import React, { createContext, useState, useEffect, useMemo } from 'react';
22
import { BN } from 'bn.js';
3-
import { useCall, useCallSubscription, useChainDecimals, useContract, useTokenSymbol, useWallet } from 'useink';
3+
import {
4+
useCall,
5+
useCallSubscription,
6+
useChainDecimals,
7+
useContract,
8+
useMetadata,
9+
useTokenSymbol,
10+
useWallet,
11+
} from 'useink';
412
import metadata from '@/contract/open_payroll.json';
513
import { pickDecoded } from 'useink/utils';
614

@@ -41,7 +49,7 @@ interface DappContextData {
4149
findContractCanClaimInLocalStorage: any;
4250
contractCanClaimFromLocalStorage: any;
4351
changeContractCanClaimNameInLocalStorage: any;
44-
codeHash: string;
52+
codeHash: string | undefined;
4553
ownerContracts: StorageContract[];
4654
}
4755

@@ -207,12 +215,13 @@ export const DappContextProvider: React.FC<React.PropsWithChildren<{}>> = ({ chi
207215
};
208216

209217
//--------------------------------------Const----------------------------------
210-
//TODO 👇
211-
const codeHash = '0x194e2a7260a9886c604a2533eb3a09126b71fc9411657b6a248a9f1e580c3b69';
218+
219+
const [codeHash, setCodeHash] = useState<string | undefined>(undefined);
212220

213221
useEffect(() => {
214222
getStoredContracts();
215223
getAllStoredContractsCanClaim();
224+
setCodeHash(metadata.source.hash);
216225
}, []);
217226

218227
useEffect(() => {

0 commit comments

Comments
 (0)