diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index dff52c0..053c3dc 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,11 +1,15 @@
 {
+  "permissions": {
+    "allow": [
+      "mcp__supabase__apply_migration",
+      "mcp__supabase__list_tables",
+      "mcp__supabase__execute_sql",
+      "Bash(npm run build:*)",
+      "mcp__supabase__get_advisors"
+    ]
+  },
   "enableAllProjectMcpServers": true,
   "enabledMcpjsonServers": [
     "supabase"
-  ],
-  "permissions": {
-    "allow": [
-      "mcp__supabase__apply_migration"
-    ]
-  }
+  ]
 }
diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index bb5975d..da47ea6 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-ca84f546'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.ufhads5pjvs"
+    "revision": "0.tucc18p1f38"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/src/components/Community.tsx b/src/components/Community.tsx
index 9155986..4a954a0 100644
--- a/src/components/Community.tsx
+++ b/src/components/Community.tsx
@@ -794,8 +794,10 @@ export default function Community() {
             ) : (
               <div className="space-y-3">
                 {(tradesSubTab === 'pending' ? pendingTrades : tradeHistory).map((trade) => {
-                  const isSender = trade.sender_id === user?.id;
-                  const otherUser = isSender ? trade.receiver : trade.sender;
+                  const isUser1 = trade.user1_id === user?.id;
+                  const myUserId = user?.id || '';
+                  const otherUserId = isUser1 ? trade.user2_id : trade.user1_id;
+                  const otherUser = isUser1 ? trade.user2 : trade.user1;
                   const statusColors: Record<string, string> = {
                     accepted: 'text-green-400',
                     declined: 'text-red-400',
@@ -819,7 +821,7 @@ export default function Community() {
                         <div className="flex items-center gap-2 min-w-0">
                           <ArrowLeftRight size={16} className="text-blue-400 flex-shrink-0" />
                           <span className="text-sm truncate">
-                            {isSender ? 'To' : 'From'}: <strong>{otherUser?.username}</strong>
+                            With: <strong>{otherUser?.username}</strong>
                           </span>
                         </div>
                         <span className={`text-xs capitalize ${statusColors[trade.status]}`}>
@@ -829,18 +831,18 @@ export default function Community() {
 
                       {/* Items */}
                       <div className="grid grid-cols-2 gap-2 text-sm">
-                        {renderTradeItems(trade.items, trade.sender_id, isSender ? 'Give' : 'Receive')}
-                        {renderTradeItems(trade.items, trade.receiver_id, isSender ? 'Get' : 'Send')}
+                        {renderTradeItems(trade.items, myUserId, 'You Give')}
+                        {renderTradeItems(trade.items, otherUserId, 'You Get')}
                       </div>
 
                       {canViewDetails && (
                         <p className="text-xs text-blue-400 text-center pt-1">
-                          {isSender ? 'Tap to view/edit' : 'Tap to view details'}
+                          Tap to view details
                         </p>
                       )}
 
-                      {/* Actions - Only show quick actions for sender (cancel) */}
-                      {tradesSubTab === 'pending' && isSender && (
+                      {/* Actions - Allow any user to cancel pending trade */}
+                      {tradesSubTab === 'pending' && (
                         <div className="flex gap-2 pt-2 border-t border-gray-700" onClick={(e) => e.stopPropagation()}>
                           <button
                             onClick={() => handleCancelTrade(trade.id)}
diff --git a/src/components/TradeCreator.tsx b/src/components/TradeCreator.tsx
index a5effc9..fcc18ab 100644
--- a/src/components/TradeCreator.tsx
+++ b/src/components/TradeCreator.tsx
@@ -375,12 +375,12 @@ export default function TradeCreator({
 
     setSubmitting(true);
     try {
-      const senderCards = Array.from(myOfferedCards.values()).map((item) => ({
+      const myCards = Array.from(myOfferedCards.values()).map((item) => ({
         cardId: item.card.id,
         quantity: item.quantity,
       }));
 
-      const receiverCards = Array.from(wantedCards.values()).map((item) => ({
+      const theirCards = Array.from(wantedCards.values()).map((item) => ({
         cardId: item.card.id,
         quantity: item.quantity,
       }));
@@ -391,18 +391,18 @@ export default function TradeCreator({
           tradeId: existingTradeId,
           editorId: user.id,
           message: message || undefined,
-          senderCards,
-          receiverCards,
+          myCards,
+          theirCards,
         });
         toast.success('Trade updated!');
       } else {
         // Create new trade
         await createTrade({
-          senderId: user.id,
-          receiverId,
+          user1Id: user.id,
+          user2Id: receiverId,
           message: message || undefined,
-          senderCards,
-          receiverCards,
+          user1Cards: myCards,
+          user2Cards: theirCards,
         });
         toast.success('Trade offer sent!');
       }
diff --git a/src/components/TradeDetail.tsx b/src/components/TradeDetail.tsx
index e8fc27b..56a75ce 100644
--- a/src/components/TradeDetail.tsx
+++ b/src/components/TradeDetail.tsx
@@ -50,9 +50,11 @@ export default function TradeDetail({
   const [showEditMode, setShowEditMode] = useState(false);
   const [editReceiverCollection, setEditReceiverCollection] = useState<CollectionItem[]>([]);
 
-  const isSender = trade.sender_id === user?.id;
-  const isReceiver = trade.receiver_id === user?.id;
-  const otherUser = isSender ? trade.receiver : trade.sender;
+  const isUser1 = trade.user1_id === user?.id;
+  const isUser2 = trade.user2_id === user?.id;
+  const otherUser = isUser1 ? trade.user2 : trade.user1;
+  const myUserId = user?.id || '';
+  const otherUserId = isUser1 ? trade.user2_id : trade.user1_id;
 
   useEffect(() => {
     loadTradeCards();
@@ -73,22 +75,22 @@ export default function TradeDetail({
       const cardMap = new Map<string, Card>();
       cards.forEach(card => cardMap.set(card.id, card));
 
-      const senderItems: TradeCardItem[] = [];
-      const receiverItems: TradeCardItem[] = [];
+      const myItems: TradeCardItem[] = [];
+      const theirItems: TradeCardItem[] = [];
 
       trade.items?.forEach(item => {
         const card = cardMap.get(item.card_id);
         if (!card) return;
 
-        if (item.owner_id === trade.sender_id) {
-          senderItems.push({ card, quantity: item.quantity });
+        if (item.owner_id === myUserId) {
+          myItems.push({ card, quantity: item.quantity });
         } else {
-          receiverItems.push({ card, quantity: item.quantity });
+          theirItems.push({ card, quantity: item.quantity });
         }
       });
 
-      setSenderCards(senderItems);
-      setReceiverCards(receiverItems);
+      setSenderCards(myItems);
+      setReceiverCards(theirItems);
     } catch (error) {
       console.error('Error loading trade cards:', error);
       toast.error('Failed to load trade details');
@@ -133,7 +135,6 @@ export default function TradeDetail({
   const handleEdit = async () => {
     try {
       // Load the other user's collection for editing
-      const otherUserId = isSender ? trade.receiver_id : trade.sender_id;
       const collectionMap = await getUserCollection(otherUserId);
       const cardIds = Array.from(collectionMap.keys());
       const cards = await getCardsByIds(cardIds);
@@ -152,8 +153,8 @@ export default function TradeDetail({
 
   const handleCounterOffer = async () => {
     try {
-      // For counter-offer, load sender's collection and swap the cards
-      const collectionMap = await getUserCollection(trade.sender_id);
+      // For counter-offer, load the other user's collection
+      const collectionMap = await getUserCollection(otherUserId);
       const cardIds = Array.from(collectionMap.keys());
       const cards = await getCardsByIds(cardIds);
       const collection = cards.map((card) => ({
@@ -169,13 +170,11 @@ export default function TradeDetail({
     }
   };
 
-  const senderPrice = calculateTotalPrice(senderCards);
-  const receiverPrice = calculateTotalPrice(receiverCards);
-
-  const yourCards = isSender ? senderCards : receiverCards;
-  const theirCards = isSender ? receiverCards : senderCards;
-  const yourPrice = isSender ? senderPrice : receiverPrice;
-  const theirPrice = isSender ? receiverPrice : senderPrice;
+  // senderCards = myCards, receiverCards = theirCards (already calculated correctly)
+  const yourCards = senderCards;
+  const theirCards = receiverCards;
+  const yourPrice = calculateTotalPrice(yourCards);
+  const theirPrice = calculateTotalPrice(theirCards);
 
   // For edit mode, determine initial cards based on mode
   // Include quantity in the card object so TradeCreator can preserve it
@@ -190,7 +189,7 @@ export default function TradeDetail({
   if (showEditMode) {
     return (
       <TradeCreator
-        receiverId={isSender ? trade.receiver_id : trade.sender_id}
+        receiverId={otherUserId}
         receiverUsername={otherUser?.username || 'User'}
         receiverCollection={editReceiverCollection}
         onClose={() => {
@@ -221,7 +220,7 @@ export default function TradeDetail({
             <div>
               <h2 className="text-lg font-bold">Trade Details {trade.version > 1 && `(v${trade.version})`}</h2>
               <p className="text-sm text-gray-400">
-                {isSender ? 'To' : 'From'}: {otherUser?.username}
+                With: {otherUser?.username}
               </p>
             </div>
           </div>
@@ -246,7 +245,7 @@ export default function TradeDetail({
                 <div className="space-y-3">
                   <div className="flex items-center justify-between">
                     <h3 className="font-semibold text-green-400">
-                      {isSender ? 'You Give' : 'You Receive'}
+                      You Give
                     </h3>
                     <div className="flex items-center gap-1 text-green-400 text-sm">
                       <DollarSign size={14} />
@@ -285,7 +284,7 @@ export default function TradeDetail({
                 <div className="space-y-3">
                   <div className="flex items-center justify-between">
                     <h3 className="font-semibold text-blue-400">
-                      {isSender ? 'You Receive' : 'They Give'}
+                      You Receive
                     </h3>
                     <div className="flex items-center gap-1 text-blue-400 text-sm">
                       <DollarSign size={14} />
@@ -330,13 +329,13 @@ export default function TradeDetail({
               )}
 
               {/* Price Difference */}
-              {!loading && (senderPrice > 0 || receiverPrice > 0) && (
+              {!loading && (yourPrice > 0 || theirPrice > 0) && (
                 <div className="p-3 bg-gray-800 rounded-lg">
                   <div className="flex items-center justify-between text-sm">
                     <span className="text-gray-400">Value Difference:</span>
-                    <span className={Math.abs(senderPrice - receiverPrice) > 5 ? 'text-yellow-400' : 'text-gray-300'}>
-                      ${Math.abs(senderPrice - receiverPrice).toFixed(2)}
-                      {senderPrice > receiverPrice ? ' in sender favor' : senderPrice < receiverPrice ? ' in receiver favor' : ' (balanced)'}
+                    <span className={Math.abs(yourPrice - theirPrice) > 5 ? 'text-yellow-400' : 'text-gray-300'}>
+                      ${Math.abs(yourPrice - theirPrice).toFixed(2)}
+                      {yourPrice > theirPrice ? ' in your favor' : yourPrice < theirPrice ? ' in their favor' : ' (balanced)'}
                     </span>
                   </div>
                 </div>
@@ -422,9 +421,10 @@ export default function TradeDetail({
                 Waiting for {otherUser?.username} to respond...
               </p>
             ) : (
-              /* No editor yet (version 1) - original flow */
+              /* No editor yet (initial trade) */
               <>
-                {isSender ? (
+                {isUser1 ? (
+                  /* User1 (initiator) can edit their initial offer */
                   <button
                     onClick={handleEdit}
                     disabled={processing}
@@ -434,6 +434,7 @@ export default function TradeDetail({
                     Edit Trade Offer
                   </button>
                 ) : (
+                  /* User2 (partner) can accept/decline/counter */
                   <>
                     <div className="flex gap-2">
                       <button
diff --git a/src/lib/Entities.ts b/src/lib/Entities.ts
index c351d55..b0ed02e 100644
--- a/src/lib/Entities.ts
+++ b/src/lib/Entities.ts
@@ -205,42 +205,55 @@ export type Database = {
             trades: {
                 Row: {
                     id: string
-                    sender_id: string
-                    receiver_id: string
+                    user1_id: string
+                    user2_id: string
                     status: 'pending' | 'accepted' | 'declined' | 'cancelled'
                     message: string | null
                     created_at: string | null
                     updated_at: string | null
+                    version: number
+                    editor_id: string | null
                 }
                 Insert: {
                     id?: string
-                    sender_id: string
-                    receiver_id: string
+                    user1_id: string
+                    user2_id: string
                     status?: 'pending' | 'accepted' | 'declined' | 'cancelled'
                     message?: string | null
                     created_at?: string | null
                     updated_at?: string | null
+                    version?: number
+                    editor_id?: string | null
                 }
                 Update: {
                     id?: string
-                    sender_id?: string
-                    receiver_id?: string
+                    user1_id?: string
+                    user2_id?: string
                     status?: 'pending' | 'accepted' | 'declined' | 'cancelled'
                     message?: string | null
                     created_at?: string | null
                     updated_at?: string | null
+                    version?: number
+                    editor_id?: string | null
                 }
                 Relationships: [
                     {
-                        foreignKeyName: "trades_sender_id_fkey"
-                        columns: ["sender_id"]
+                        foreignKeyName: "trades_user1_id_fkey"
+                        columns: ["user1_id"]
                         isOneToOne: false
                         referencedRelation: "profiles"
                         referencedColumns: ["id"]
                     },
                     {
-                        foreignKeyName: "trades_receiver_id_fkey"
-                        columns: ["receiver_id"]
+                        foreignKeyName: "trades_user2_id_fkey"
+                        columns: ["user2_id"]
+                        isOneToOne: false
+                        referencedRelation: "profiles"
+                        referencedColumns: ["id"]
+                    },
+                    {
+                        foreignKeyName: "trades_editor_id_fkey"
+                        columns: ["editor_id"]
                         isOneToOne: false
                         referencedRelation: "profiles"
                         referencedColumns: ["id"]
diff --git a/src/services/tradesService.ts b/src/services/tradesService.ts
index 375ed18..d4d31f5 100644
--- a/src/services/tradesService.ts
+++ b/src/services/tradesService.ts
@@ -10,16 +10,16 @@ export interface TradeItem {
 
 export interface Trade {
   id: string;
-  sender_id: string;
-  receiver_id: string;
+  user1_id: string;
+  user2_id: string;
   status: 'pending' | 'accepted' | 'declined' | 'cancelled';
   message: string | null;
   created_at: string | null;
   updated_at: string | null;
   version: number;
   editor_id: string | null;
-  sender?: { username: string | null };
-  receiver?: { username: string | null };
+  user1?: { username: string | null };
+  user2?: { username: string | null };
   items?: TradeItem[];
 }
 
@@ -43,19 +43,19 @@ export interface TradeHistoryItem {
 }
 
 export interface CreateTradeParams {
-  senderId: string;
-  receiverId: string;
+  user1Id: string;
+  user2Id: string;
   message?: string;
-  senderCards: { cardId: string; quantity: number }[];
-  receiverCards: { cardId: string; quantity: number }[];
+  user1Cards: { cardId: string; quantity: number }[];
+  user2Cards: { cardId: string; quantity: number }[];
 }
 
 export interface UpdateTradeParams {
   tradeId: string;
   editorId: string;
   message?: string;
-  senderCards: { cardId: string; quantity: number }[];
-  receiverCards: { cardId: string; quantity: number }[];
+  myCards: { cardId: string; quantity: number }[];
+  theirCards: { cardId: string; quantity: number }[];
 }
 
 // Get all trades for a user
@@ -64,11 +64,11 @@ export async function getTrades(userId: string): Promise<Trade[]> {
     .from('trades')
     .select(`
       *,
-      sender:profiles!trades_sender_id_fkey(username),
-      receiver:profiles!trades_receiver_id_fkey(username),
+      user1:profiles!trades_user1_id_fkey(username),
+      user2:profiles!trades_user2_id_fkey(username),
       items:trade_items(*)
     `)
-    .or(`sender_id.eq.${userId},receiver_id.eq.${userId}`)
+    .or(`user1_id.eq.${userId},user2_id.eq.${userId}`)
     .order('created_at', { ascending: false });
 
   if (error) throw error;
@@ -81,12 +81,12 @@ export async function getPendingTrades(userId: string): Promise<Trade[]> {
     .from('trades')
     .select(`
       *,
-      sender:profiles!trades_sender_id_fkey(username),
-      receiver:profiles!trades_receiver_id_fkey(username),
+      user1:profiles!trades_user1_id_fkey(username),
+      user2:profiles!trades_user2_id_fkey(username),
       items:trade_items(*)
     `)
     .eq('status', 'pending')
-    .or(`sender_id.eq.${userId},receiver_id.eq.${userId}`)
+    .or(`user1_id.eq.${userId},user2_id.eq.${userId}`)
     .order('created_at', { ascending: false });
 
   if (error) throw error;
@@ -99,8 +99,8 @@ export async function getTradeById(tradeId: string): Promise<Trade | null> {
     .from('trades')
     .select(`
       *,
-      sender:profiles!trades_sender_id_fkey(username),
-      receiver:profiles!trades_receiver_id_fkey(username),
+      user1:profiles!trades_user1_id_fkey(username),
+      user2:profiles!trades_user2_id_fkey(username),
       items:trade_items(*)
     `)
     .eq('id', tradeId)
@@ -112,39 +112,40 @@ export async function getTradeById(tradeId: string): Promise<Trade | null> {
 
 // Create a new trade with items
 export async function createTrade(params: CreateTradeParams): Promise<Trade> {
-  const { senderId, receiverId, message, senderCards, receiverCards } = params;
+  const { user1Id, user2Id, message, user1Cards, user2Cards } = params;
 
   // Create the trade
   const { data: trade, error: tradeError } = await supabase
     .from('trades')
     .insert({
-      sender_id: senderId,
-      receiver_id: receiverId,
+      user1_id: user1Id,
+      user2_id: user2Id,
       message,
       status: 'pending',
+      // editor_id starts as null - gets set when someone edits the trade
     })
     .select()
     .single();
 
   if (tradeError) throw tradeError;
 
-  // Add sender's cards
-  const senderItems = senderCards.map((card) => ({
+  // Add user1's cards
+  const user1Items = user1Cards.map((card) => ({
     trade_id: trade.id,
-    owner_id: senderId,
+    owner_id: user1Id,
     card_id: card.cardId,
     quantity: card.quantity,
   }));
 
-  // Add receiver's cards (what sender wants)
-  const receiverItems = receiverCards.map((card) => ({
+  // Add user2's cards
+  const user2Items = user2Cards.map((card) => ({
     trade_id: trade.id,
-    owner_id: receiverId,
+    owner_id: user2Id,
     card_id: card.cardId,
     quantity: card.quantity,
   }));
 
-  const allItems = [...senderItems, ...receiverItems];
+  const allItems = [...user1Items, ...user2Items];
 
   if (allItems.length > 0) {
     const { error: itemsError } = await supabase
@@ -199,11 +200,11 @@ export async function getTradeHistory(userId: string): Promise<Trade[]> {
     .from('trades')
     .select(`
       *,
-      sender:profiles!trades_sender_id_fkey(username),
-      receiver:profiles!trades_receiver_id_fkey(username),
+      user1:profiles!trades_user1_id_fkey(username),
+      user2:profiles!trades_user2_id_fkey(username),
       items:trade_items(*)
     `)
-    .or(`sender_id.eq.${userId},receiver_id.eq.${userId}`)
+    .or(`user1_id.eq.${userId},user2_id.eq.${userId}`)
     .in('status', ['accepted', 'declined', 'cancelled'])
     .order('updated_at', { ascending: false })
     .limit(50);
@@ -214,12 +215,12 @@ export async function getTradeHistory(userId: string): Promise<Trade[]> {
 
 // Update an existing trade (for edits and counter-offers)
 export async function updateTrade(params: UpdateTradeParams): Promise<Trade> {
-  const { tradeId, editorId, message, senderCards, receiverCards } = params;
+  const { tradeId, editorId, message, myCards, theirCards } = params;
 
   // Get current trade info
   const { data: currentTrade, error: tradeError } = await supabase
     .from('trades')
-    .select('version, sender_id, receiver_id')
+    .select('version, user1_id, user2_id')
     .eq('id', tradeId)
     .single();
 
@@ -227,6 +228,11 @@ export async function updateTrade(params: UpdateTradeParams): Promise<Trade> {
 
   const newVersion = (currentTrade.version || 1) + 1;
 
+  // Determine the other user's ID
+  const otherUserId = currentTrade.user1_id === editorId
+    ? currentTrade.user2_id
+    : currentTrade.user1_id;
+
   // Save current state to history before updating
   const { data: historyEntry, error: historyError } = await supabase
     .from('trade_history')
@@ -276,22 +282,22 @@ export async function updateTrade(params: UpdateTradeParams): Promise<Trade> {
   // Delete existing items
   await supabase.from('trade_items').delete().eq('trade_id', tradeId);
 
-  // Add new items
-  const senderItems = senderCards.map((card) => ({
+  // Add new items (myCards belong to editor, theirCards belong to other user)
+  const myItems = myCards.map((card) => ({
     trade_id: tradeId,
-    owner_id: currentTrade.sender_id,
+    owner_id: editorId,
     card_id: card.cardId,
     quantity: card.quantity,
   }));
 
-  const receiverItems = receiverCards.map((card) => ({
+  const theirItems = theirCards.map((card) => ({
     trade_id: tradeId,
-    owner_id: currentTrade.receiver_id,
+    owner_id: otherUserId,
     card_id: card.cardId,
     quantity: card.quantity,
   }));
 
-  const allItems = [...senderItems, ...receiverItems];
+  const allItems = [...myItems, ...theirItems];
 
   if (allItems.length > 0) {
     const { error: itemsError } = await supabase