Merge pull request #300 from adrianvrj/dev

feat-291
undefinedorgcr · Dec 18, 2024 · 057c6aa · 057c6aa
2 parents 819a559 + fe01196
commit 057c6aa
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 67 deletions.
diff --git a/contracts/src/fund.cairo b/contracts/src/fund.cairo
@@ -4,6 +4,7 @@ use starknet::ContractAddress;
 pub trait IFund<TContractState> {
     fn get_id(self: @TContractState) -> u128;
     fn get_owner(self: @TContractState) -> ContractAddress;
+    fn is_owner(self: @TContractState, caller: ContractAddress) -> bool;
     fn set_name(ref self: TContractState, name: ByteArray);
     fn get_name(self: @TContractState) -> ByteArray;
     fn set_reason(ref self: TContractState, reason: ByteArray);
@@ -132,6 +133,9 @@ pub mod Fund {
         fn get_owner(self: @ContractState) -> ContractAddress {
             return self.owner.read();
         }
+        fn is_owner(self: @ContractState, caller: ContractAddress) -> bool {
+            return (self.owner.read() == caller);
+        }
         fn set_name(ref self: ContractState, name: ByteArray) {
             let caller = get_caller_address();
             let valid_address_1 = contract_address_const::<FundManagerConstants::VALID_ADDRESS_1>();

diff --git a/frontend/gostarkme-web/.env.example b/frontend/gostarkme-web/.env.example
diff --git a/frontend/gostarkme-web/components/modules/Fund/Fund.tsx b/frontend/gostarkme-web/components/modules/Fund/Fund.tsx
@@ -48,9 +48,7 @@ const Fund = () => {
       let evidenceLink = await fundContract.get_evidence_link();
       let contactHandle = await fundContract.get_contact_handle();
       // Fetch owner
-      const ownerDecimal = (await fundContract.get_owner()).toString();
-      const ownerHex = "0x"+BigInt(ownerDecimal).toString(16);
-      setIsOwner(ownerHex.toLowerCase() === wallet?.account?.address.toLowerCase());
+      setIsOwner(await fundContract.is_owner(wallet?.account.address));
       // USER VOTED?
       let voted = await fundContract.get_voter(wallet != undefined ? wallet?.account.address : "0x0000000000");