Merge remote-tracking branch 'origin/feature/m-jordan' into feature/m

packages/metavinci/src/models/metaplex/redeemLimitedEditionBid.ts

@@ -1,4 +1,4 @@
-import { programIds, VAULT_SCHEMA } from '@oyster/common';
+import { getEdition, programIds, VAULT_SCHEMA } from '@oyster/common';
 import {
   PublicKey,
   SystemProgram,
@@ -11,7 +11,6 @@ import { serialize } from 'borsh';
 import {
   getAuctionKeys,
   getBidderKeys,
-  getEdition,
   getMetadata,
   getOriginalAuthority,
   RedeemLimitedEditionBidArgs,

packages/metavinci/src/models/metaplex/redeemOpenEditionBid.ts

@@ -1,4 +1,4 @@
-import { programIds, VAULT_SCHEMA } from '@oyster/common';
+import { getEdition, programIds, VAULT_SCHEMA } from '@oyster/common';
 import {
   PublicKey,
   SystemProgram,
@@ -11,7 +11,6 @@ import { serialize } from 'borsh';
 import {
   getAuctionKeys,
   getBidderKeys,
-  getEdition,
   getMetadata,
   RedeemOpenEditionBidArgs,
 } from '.';

packages/metavinci/src/views/artworks/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ArtCard } from '../../components/ArtCard';
 import { Row, Col } from 'antd';
-import Masonry from 'react-masonry-css'
+import Masonry from 'react-masonry-css';
 import { Link } from 'react-router-dom';
 import { useUserArts } from '../../hooks';
 
@@ -11,13 +11,22 @@ export const ArtworksView = () => {
     default: 4,
     1100: 3,
     700: 2,
-    500: 1
+    500: 1,
   };
 
   return (
     <div className="flexColumn" style={{ flex: 1 }}>
       <Col>
-        <Row style={{ marginBottom: 30, marginTop: 20, fontSize: 20, fontWeight: 600 }}>Owned</Row>
+        <Row
+          style={{
+            marginBottom: 30,
+            marginTop: 20,
+            fontSize: 20,
+            fontWeight: 600,
+          }}
+        >
+          Owned
+        </Row>
         <Row>
           <Masonry
             breakpointCols={breakpointColumnsObj}
@@ -25,15 +34,19 @@ export const ArtworksView = () => {
             columnClassName="my-masonry-grid_column"
           >
             {ownedMetadata.map(m => {
-              const id = m.pubkey.toBase58();
-              return <Link to={`/art/${id}`}>
-                <ArtCard key={id}
-                  image={m.info.extended?.image}
-                  category={m.info.extended?.category}
-                  name={m.info?.name}
-                  symbol={m.info.symbol}
-                  preview={false} />
+              const id = m.metadata.pubkey.toBase58();
+              return (
+                <Link to={`/art/${id}`}>
+                  <ArtCard
+                    key={id}
+                    image={m.metadata.info.extended?.image}
+                    category={m.metadata.info.extended?.category}
+                    name={m.metadata.info?.name}
+                    symbol={m.metadata.info.symbol}
+                    preview={false}
+                  />
                 </Link>
+              );
             })}
           </Masonry>
         </Row>