Merge pull request #681 from gofractally/main

EdenOS Releases 0.3.1
gofractally · Mar 29, 2022 · 5e54b83 · 5e54b83
2 parents 1660922 + 3462b31
commit 5e54b83
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git 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: .
+
diff --git 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);

diff --git 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
@@ -24,7 +24,7 @@ export const MemberCard = ({ member, showBalance }: Props) => {
             </Container>
             <Container>
                 <MemberBio bio={member.profile.bio} />
-                {member.inductionVideo && (
+                {member.inductionVideo.url && (
                     <SocialButton
                         handle="Induction Ceremony"
                         icon={FaVideo}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -482,3 +482,4 @@ jobs:
		file: docker/eden-webapp.Dockerfile
		tags: ${{ steps.prep.outputs.tags }}
		context: .