diff --git a/package.json b/package.json index a161c52..48f0b35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@skill-wallet/auth", - "version": "0.0.95-alpha", + "version": "0.0.103-alpha", "description": "Create a SkillWallet by authenticating your Metamask wallet through your browser window.", "author": "DiTo Labs ", "keywords": [ diff --git a/src/components/skillwallet-auth/roles-screen-new-user.tsx b/src/components/skillwallet-auth/roles-screen-new-user.tsx index 8363944..0035857 100644 --- a/src/components/skillwallet-auth/roles-screen-new-user.tsx +++ b/src/components/skillwallet-auth/roles-screen-new-user.tsx @@ -66,7 +66,8 @@ export class RolesScreenNewUser { } async assignMemberRoles() { - const isCoreMember = await isCoreTeamMember(this.community.partnersAgreementAddress, window.ethereum.selectedAddress); + console.log(this.community); + const isCoreMember = await isCoreTeamMember(this.community.address, window.ethereum.selectedAddress); const roles = this.community?.roles?.roles || []; const newUserRolesBaseId = 4; console.log('isCoreMember: -----', isCoreMember); diff --git a/src/index.html b/src/index.html index da8469c..ea3802f 100644 --- a/src/index.html +++ b/src/index.html @@ -16,7 +16,7 @@ { if (isActive) { const jsonUri = await contract.tokenURI(tokenId); const community = await contract.getActiveCommunity(tokenId); - const communityContract = new ethers.Contract( - community, - communityAbi, - signer, - ); - - - const ditoAddress = communityContract.distributedTownAddr(); - const ditoContract = new ethers.Contract( - ditoAddress, - diToAbi, - signer, - ); - - const isDiToNative = await ditoContract.isDiToNativeCommunity(community); - let isCoreTeam = false; - if (!isDiToNative) { - const partnersAgreementKey = await fetchKeyAndPAByCommunity(community); - const isCoreTeam = await isCoreTeamMember(partnersAgreementKey.partnersAgreementAddress, address); - console.log('is core team member?', isCoreTeam); - } + + console.log('hereeeee'); + const partnersAgreementKey = await fetchKeyAndPAByCommunity(community); + const isCoreTeam = await isCoreTeamMember(partnersAgreementKey.communityAddress, address); + console.log('is core team member?', isCoreTeam); let res = await fetch(jsonUri); const jsonMetadata = await res.json(); @@ -370,17 +352,17 @@ export const generateMembershipNFT = async (canvas, demoImg, logo, community, ro } }; -export const isCoreTeamMember = async (partnersAgreementAddress, user) => { +export const isCoreTeamMember = async (communityAddress, user) => { const provider = new ethers.providers.Web3Provider(window.ethereum); const signer = provider.getSigner(); - const partnersAgreementContract = new ethers.Contract( - partnersAgreementAddress, - JSON.stringify(partnersAgreementAbi), + const communityContract = new ethers.Contract( + communityAddress, + JSON.stringify(communityAbi), signer, ) - const isCoreTeamMember = await partnersAgreementContract.isCoreTeamMember(user); + const isCoreTeamMember = await communityContract.isCoreTeamMember(user); console.log('isCoreTeamMember', isCoreTeamMember); return isCoreTeamMember;