From 1c18d266a4421d0e0c7a67f6bfba2874d92f1cb2 Mon Sep 17 00:00:00 2001 From: Todd Fleming Date: Tue, 22 Mar 2022 15:16:18 -0400 Subject: [PATCH 1/3] remove_expired_inductions is still borked --- contracts/eden/src/eden-micro-chain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/eden/src/eden-micro-chain.cpp b/contracts/eden/src/eden-micro-chain.cpp index 374a8ed6d..874dd7980 100644 --- a/contracts/eden/src/eden-micro-chain.cpp +++ b/contracts/eden/src/eden-micro-chain.cpp @@ -2130,7 +2130,7 @@ void clean_data(const subchain::eosio_block& block) if (!status.status.active) return; // skip if contract is not active - remove_expired_inductions(block.timestamp, status.status); + // remove_expired_inductions(block.timestamp, status.status); } bool dispatch(eosio::name action_name, const action_context& context, eosio::input_stream& s); From 021df22892f531a0c79d066ffb452f8a158e3e04 Mon Sep 17 00:00:00 2001 From: Todd Fleming Date: Tue, 22 Mar 2022 15:34:22 -0400 Subject: [PATCH 2/3] force cicd --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a33d7e596..51d4008e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -482,3 +482,4 @@ jobs: file: docker/eden-webapp.Dockerfile tags: ${{ steps.prep.outputs.tags }} context: . + From 3462b3120dffd2140f6bb61de7ec60b2f6a3b98c Mon Sep 17 00:00:00 2001 From: Brandon Fancher Date: Mon, 28 Mar 2022 18:04:04 -0400 Subject: [PATCH 3/3] Fixes induction preview image and video ceremony link. --- packages/webapp/src/inductions/utils.ts | 4 +++- packages/webapp/src/members/components/member-card.tsx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/webapp/src/inductions/utils.ts b/packages/webapp/src/inductions/utils.ts index e714ffc75..47ab99c55 100644 --- a/packages/webapp/src/inductions/utils.ts +++ b/packages/webapp/src/inductions/utils.ts @@ -23,7 +23,9 @@ export const convertPendingProfileToMember = ( name: profile.name, image: { cid: profile.img, - url: ipfsUrl(profile.img), + url: profile.img.startsWith("blob:") + ? profile.img + : ipfsUrl(profile.img), attributions: profile.attributions || "", }, bio: profile.bio, diff --git a/packages/webapp/src/members/components/member-card.tsx b/packages/webapp/src/members/components/member-card.tsx index c3e0b7dbc..da1230825 100644 --- a/packages/webapp/src/members/components/member-card.tsx +++ b/packages/webapp/src/members/components/member-card.tsx @@ -24,7 +24,7 @@ export const MemberCard = ({ member, showBalance }: Props) => { - {member.inductionVideo && ( + {member.inductionVideo.url && (