Merge pull request #171 from xch-dev/multicat-offer-fix

Fix multiple CATs in imported offer

crates/sage-database/src/offers.rs

@@ -136,7 +136,7 @@ async fn insert_offer_xch(conn: impl SqliteExecutor<'_>, row: OfferXchRow) -> Re
 
     sqlx::query!(
         "
-        INSERT OR IGNORE INTO `offer_xch` (
+        INSERT INTO `offer_xch` (
             `offer_id`, `requested`, `amount`, `royalty`
         )
         VALUES (?, ?, ?, ?)
@@ -159,7 +159,7 @@ async fn insert_offer_nft(conn: impl SqliteExecutor<'_>, row: OfferNftRow) -> Re
 
     sqlx::query!(
         "
-        INSERT OR IGNORE INTO `offer_nfts` (
+        INSERT INTO `offer_nfts` (
             `offer_id`, `requested`, `launcher_id`,
             `royalty_puzzle_hash`, `royalty_ten_thousandths`,
             `name`, `thumbnail`, `thumbnail_mime_type`
@@ -191,7 +191,7 @@ async fn insert_offer_cat(conn: impl SqliteExecutor<'_>, row: OfferCatRow) -> Re
 
     sqlx::query!(
         "
-        INSERT OR IGNORE INTO `offer_cats` (
+        INSERT INTO `offer_cats` (
             `offer_id`, `requested`, `asset_id`,
             `amount`, `royalty`, `name`, `ticker`, `icon`
         )

migrations/0003_offer_fix.sql

@@ -0,0 +1,37 @@
+CREATE TABLE `offer_nfts_2` (
+    `offer_id` BLOB NOT NULL,
+    `requested` BOOLEAN NOT NULL,
+    `launcher_id` BLOB NOT NULL,
+    `royalty_puzzle_hash` BLOB NOT NULL,
+    `royalty_ten_thousandths` INTEGER NOT NULL,
+    `name` TEXT,
+    `thumbnail` BLOB,
+    `thumbnail_mime_type` TEXT,
+    PRIMARY KEY (`offer_id`, `launcher_id`, `requested`),
+    FOREIGN KEY (`offer_id`) REFERENCES `offers`(`offer_id`) ON DELETE CASCADE
+);
+
+CREATE TABLE `offer_cats_2` (
+    `offer_id` BLOB NOT NULL,
+    `requested` BOOLEAN NOT NULL,
+    `asset_id` BLOB NOT NULL,
+    `amount` BLOB NOT NULL,
+    `royalty` BLOB NOT NULL,
+    `name` TEXT,
+    `ticker` TEXT,
+    `icon` TEXT,
+    PRIMARY KEY (`offer_id`, `asset_id`, `requested`),
+    FOREIGN KEY (`offer_id`) REFERENCES `offers`(`offer_id`) ON DELETE CASCADE
+);
+
+INSERT INTO `offer_nfts_2` SELECT * FROM `offer_nfts`;
+INSERT INTO `offer_cats_2` SELECT * FROM `offer_cats`;
+
+DROP TABLE `offer_nfts`;
+DROP TABLE `offer_cats`;
+
+ALTER TABLE `offer_nfts_2` RENAME TO `offer_nfts`;
+ALTER TABLE `offer_cats_2` RENAME TO `offer_cats`;
+
+CREATE INDEX `nft_offer_id` ON `offer_nfts` (`offer_id`);
+CREATE INDEX `cat_offer_id` ON `offer_cats` (`offer_id`);

src/components/OfferCard.tsx

@@ -130,7 +130,7 @@ function Assets({ assets }: AssetsProps) {
             </div>
             <div className='text-sm font-medium whitespace-nowrap'>
               {toDecimal(BigNumber(cat.amount).plus(cat.royalty).toString(), 3)}{' '}
-              {cat.name}
+              {cat.name ?? cat.ticker ?? 'Unknown'}
             </div>
           </div>
 

src/pages/MakeOffer.tsx

@@ -380,6 +380,10 @@ function AssetSelector({
               size='icon'
               className='border-l-0 rounded-l-none flex-shrink-0 flex-grow-0'
               onClick={() => {
+                setAssets({
+                  ...assets,
+                  xch: '0',
+                });
                 setIncludeAmount(false);
               }}
             >

src/pages/Offers.tsx

@@ -295,7 +295,7 @@ function AssetPreview({ label, assets }: AssetPreviewProps) {
 
           <div className='text-sm text-muted-foreground truncate'>
             {toDecimal(BigNumber(cat.amount).plus(cat.royalty).toString(), 3)}{' '}
-            {cat.name ?? cat.ticker}
+            {cat.name ?? cat.ticker ?? 'Unknown'}
           </div>
         </div>
       ))}
@@ -307,7 +307,7 @@ function AssetPreview({ label, assets }: AssetPreviewProps) {
           />
 
           <div className='text-sm text-muted-foreground truncate'>
-            {nft.name}
+            {nft.name ?? 'Unknown'}
           </div>
         </div>
       ))}