From 103ec8188a39a3c9d4273fecd55cb6451d4827f1 Mon Sep 17 00:00:00 2001
From: Patrick Wieth <patrick.wieth@googlemail.com>
Date: Sun, 1 Jun 2025 14:25:23 +0200
Subject: [PATCH 1/5] encounters for params work now, are loaded etc., this is
 dependend on an updated chain

---
 .env.development                             |  8 ++--
 src/components/elements/GalleryComponent.vue | 43 ++++++++++----------
 src/views/EncounterCreatorPage.vue           | 39 ++++++++++++++----
 src/views/UserView/UserView.vue              |  1 -
 4 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/.env.development b/.env.development
index 1cdd733f..23babb66 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
-VITE_APP_CHAIN_ID="carddevnet-12"
+VITE_APP_CHAIN_ID="carddevnet-13"
 
-VITE_API_COSMOS="http://lxgr.xyz:1317"
-VITE_WS_TENDERMINT="http://lxgr.xyz:26657"
-VITE_APP_FAUCET="http://lxgr.xyz:4500/claimTokens"
+VITE_API_COSMOS="http://localhost:1317"
+VITE_WS_TENDERMINT="http://localhost:26657"
+VITE_APP_FAUCET="http://localhost:4500/claimTokens"
diff --git a/src/components/elements/GalleryComponent.vue b/src/components/elements/GalleryComponent.vue
index 5330de49..9abb74f4 100644
--- a/src/components/elements/GalleryComponent.vue
+++ b/src/components/elements/GalleryComponent.vue
@@ -1,29 +1,30 @@
 <template>
-  <div
-    id="galleryWrapper"
-    class="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 min-[1800px]:grid-cols-5 gap-12 mt-6"
-  >
+  <div>
     <div
-      v-for="card in state.cards"
-      :key="card.id"
-      class="transition duration-500 hover:scale-110 hover:duration-300"
-      :class="shadowClass(card)"
-      @click="emit('cardClicked', card)"
+      id="galleryWrapper"
+      class="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 min-[1800px]:grid-cols-5 gap-12 mt-6"
     >
-      <div>
-        <CardComponent :model="card" />
+      <div
+        v-for="card in state.cards"
+        :key="card.id"
+        class="transition duration-500 hover:scale-110 hover:duration-300"
+        :class="shadowClass(card)"
+        @click="emit('cardClicked', card)"
+      >
+        <div>
+          <CardComponent :model="card" />
+        </div>
       </div>
     </div>
-  </div>
-
-  <div class="mt-12 flex flex-row justify-center items-center">
-    <BaseCCButton
-      :type="Color.RED"
-      @click="load()"
-      :class="{ invisible: !loadButtonVisible }"
-    >
-      Reckless Card Loading
-    </BaseCCButton>
+    <div class="mt-12 flex flex-row justify-center items-center">
+      <BaseCCButton
+        :type="Color.RED"
+        @click="load()"
+        :class="{ invisible: !loadButtonVisible }"
+      >
+        Reckless Card Loading
+      </BaseCCButton>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/EncounterCreatorPage.vue b/src/views/EncounterCreatorPage.vue
index 8b37a850..752492e9 100644
--- a/src/views/EncounterCreatorPage.vue
+++ b/src/views/EncounterCreatorPage.vue
@@ -100,6 +100,27 @@
         v-model="encounterName"
         placeholder="Encounter Title"
       />
+      <div class="flex flex-row items-center justify-between">
+        <div>
+        <Dropdown
+          v-model="encounterType"
+          class="my-auto"
+          :type="Color.RED"
+          :options="['Constructed', 'DraftRun', 'Campaign']"
+        />
+        </div>
+        <div v-if="encounterType == 'DraftRun' || encounterType == 'Campaign'"
+          class="flex flex-row items-center">
+          <p class="m-1">Level:</p>
+          <CCInput
+            
+            class="w-10"
+            v-model="encounterLevel"
+            placeholder="Level"
+          />
+        </div>
+      </div>
+      
       <!-- image upload -->
       <div class="mb-5">
         <div v-if="cropImage == ''">
@@ -182,7 +203,6 @@
 
       <div class="h-[100vh] bg-[#552026]"></div>
     </div>
-
   </div>
 </template>
 
@@ -254,7 +274,9 @@ const { queryQEncounter, queryQEncounterWithImage, queryQEncounters, queryQEncou
 
 const drawList = ref([]);
 let cropImage = ref('');
-let encounterName = "";
+let encounterName = ref('');
+let encounterType = ref('Constructed');
+let encounterLevel = ref(0);
 let filtersVisible = ref(true);
 let dragFrom = -1;
 let hqSelected = ref(false);
@@ -362,7 +384,11 @@ onMounted(() => {
   queryQEncounterWithImage(route.query.id)
     .then((res) => {
       cropImage.value = res.encounter.image;
-      encounterName = res.encounter.encounter.name
+      encounterName = res.encounter.encounter.name;
+      
+      let parameters = res.encounter.encounter.parameters;
+      encounterType = ref(R.find(x => x.key == "type")(parameters).value ?? "Constructed");
+      encounterLevel = ref(R.find(x => x.key == "level")(parameters).value ?? "0");
 
       res.encounter.encounter.Drawlist.forEach(entry => {
         loadCard(entry).then(res => {
@@ -485,12 +511,9 @@ const publish = () => {
   // unfold drawlist
   let cards = R.flatten( R.map(x => R.repeat(x.id, x.count), drawList.value) )
 
-  // this crashes:
-  //let parameters:Map<string,string> = new Map();
-  //parameters.set("yes", "like");
-  let parameters = {};
+  let parameters = {type: encounterType, level: encounterLevel}
 
-  encounterCreate(encounterName, cards, parameters, cropImage.value, (res) =>{
+  encounterCreate(encounterName, cards, parameters, cropImage.value, (res) => {
     console.log("success", res)
   },
   (err) => {
diff --git a/src/views/UserView/UserView.vue b/src/views/UserView/UserView.vue
index a9e8fe73..2ecd0de7 100644
--- a/src/views/UserView/UserView.vue
+++ b/src/views/UserView/UserView.vue
@@ -366,7 +366,6 @@ const getEncounters = () => {
   .then((res) => {
     state.ownEncounters = R.map(y => ({id: y.Id, name: y.name}), R.filter(x => x.owner == state.addr, res.encounters))
   })
-  console.log("ownEncounters", state.ownEncounters)
 }
 
 const register = () => registerForCouncil(getUser, console.log);

From e96c78fc498ae12432d98329d53493ceaad13270 Mon Sep 17 00:00:00 2001
From: Patrick Wieth <patrick.wieth@googlemail.com>
Date: Wed, 30 Jul 2025 13:38:07 +0200
Subject: [PATCH 2/5] fix development env and add encounter draw mode

---
 .env                               |  2 +-
 .env.development                   |  8 ++++----
 src/views/EncounterCreatorPage.vue | 31 +++++++++++++++++++-----------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.env b/.env
index e61291c6..9b32d2c4 100644
--- a/.env
+++ b/.env
@@ -9,7 +9,7 @@ VITE_APP_FAUCET="https://cardchain.crowdcontrol.network/faucet/claimTokens"
 
 VITE_APP_FAUCET_SITEKEY="ea68532a-a9e6-4f99-9361-db90a3071b72"
 VITE_APP_ADDRESS_PREFIX=cc
-VITE_APP_CHAIN_ID="cardtestnet-13"
+VITE_APP_CHAIN_ID="cardtestnet-14"
 VITE_APP_CHAIN_NAME="Cardchain"
 VITE_APP_CARDIMG_MAXKB=500
 VITE_APP_CARDIMG_SIZE_X=840
diff --git a/.env.development b/.env.development
index 23babb66..a25e067c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
-VITE_APP_CHAIN_ID="carddevnet-13"
+VITE_APP_CHAIN_ID="carddevnet-14"
 
-VITE_API_COSMOS="http://localhost:1317"
-VITE_WS_TENDERMINT="http://localhost:26657"
-VITE_APP_FAUCET="http://localhost:4500/claimTokens"
+VITE_API_COSMOS="http://lxgr.xyz:1317"
+VITE_WS_TENDERMINT="http://lxgr.xyz:26657"
+VITE_APP_FAUCET="http://lxgr.xyz:4500/claimTokens"
diff --git a/src/views/EncounterCreatorPage.vue b/src/views/EncounterCreatorPage.vue
index 752492e9..22516f52 100644
--- a/src/views/EncounterCreatorPage.vue
+++ b/src/views/EncounterCreatorPage.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex text-white max-lg:flex-col justify-center">
     <!-- left panel - filters -->
-    <div class="self-start lg:sticky top-0 min-w-[25rem] flex justify-center 
+    <div class="self-start lg:sticky top-0 min-w-[25rem] flex justify-center
       lg:p-16 h-[100vh] mt-0 bg-[#552026] max-lg:w-full max-lg:h-full max-lg:p-4 max-h-[90vh] overflow-y-auto overflow-x-hidden"
     >
       <div v-if="!loggedIn">
@@ -92,7 +92,7 @@
 
     <!-- right panel - enter specs -->
     <div
-      class="self-start lg:sticky top-0 min-w-[25rem] flex flex-col justify-start lg:p-14 max-h-[100vh] mt-0 bg-[#552026] 
+      class="self-start lg:sticky top-0 min-w-[25rem] flex flex-col justify-start lg:p-14 max-h-[100vh] mt-0 bg-[#552026]
             max-lg:w-full max-lg:h-full max-lg:p-4 max-h-[90vh] overflow-y-auto relative"
     >
       <CCInput
@@ -113,14 +113,21 @@
           class="flex flex-row items-center">
           <p class="m-1">Level:</p>
           <CCInput
-            
             class="w-10"
             v-model="encounterLevel"
             placeholder="Level"
           />
         </div>
       </div>
-      
+      <div>
+        <Dropdown
+          v-model="encounterDraw"
+          class="w-34"
+          :type="Color.RED"
+          :options="['Drawlist', 'RandomDraw', 'PerfectDraw']"
+        />
+      </div>
+
       <!-- image upload -->
       <div class="mb-5">
         <div v-if="cropImage == ''">
@@ -158,7 +165,7 @@
       <!-- Added cards section -->
       <span class="my-4"> Cards added - {{ cardsAdded }}/40 </span>
       <div
-        v-for="(item, index) in drawList" :key="item.id" 
+        v-for="(item, index) in drawList" :key="item.id"
       >
         <div class="flex flex-row w-full h-6 mb-2 select-none cursor-grab"
           draggable="true"
@@ -169,7 +176,7 @@
           @click="removeCard(index)"
         >
           <div class="w-6 flex-none bg-transparent">
-            {{item.count}}x  
+            {{item.count}}x
           </div>
           <div class="flex-1 flex items-center justify-between text-black bg-white items-center w-full p-0 m-0">
             <!-- Left Section -->
@@ -276,6 +283,7 @@ const drawList = ref([]);
 let cropImage = ref('');
 let encounterName = ref('');
 let encounterType = ref('Constructed');
+let encounterDraw = ref('Drawlist');
 let encounterLevel = ref(0);
 let filtersVisible = ref(true);
 let dragFrom = -1;
@@ -304,7 +312,7 @@ watch(drawList.value, () => {
       for (let [key, value] of Object.entries(hq.class)) {
         if (value == false && item.class[key] == true) {
           drawList.value.splice(index, 1)
-        } 
+        }
       }
     })
   }
@@ -385,10 +393,11 @@ onMounted(() => {
     .then((res) => {
       cropImage.value = res.encounter.image;
       encounterName = res.encounter.encounter.name;
-      
+
       let parameters = res.encounter.encounter.parameters;
       encounterType = ref(R.find(x => x.key == "type")(parameters).value ?? "Constructed");
       encounterLevel = ref(R.find(x => x.key == "level")(parameters).value ?? "0");
+      encounterDraw = ref(R.find(x => x.key == "draw")(parameters).value ?? "Drawlist");
 
       res.encounter.encounter.Drawlist.forEach(entry => {
         loadCard(entry).then(res => {
@@ -399,7 +408,7 @@ onMounted(() => {
 });
 
 const inputFile = (event) => {
-  let file = event.target.files[0]; 
+  let file = event.target.files[0];
 
   uploadImg(file, env.cardImgMaxKB, (result) => {
     if (result.startsWith("Error")) {
@@ -463,7 +472,7 @@ const onDrop = (evt, targetIndex) => {
 const removeCard = (index) => {
   if(drawList.value[index].count == 1)
     drawList.value.splice(index, 1);
-  else 
+  else
     drawList.value[index].count--;
   updateCardsAdded();
 }
@@ -511,7 +520,7 @@ const publish = () => {
   // unfold drawlist
   let cards = R.flatten( R.map(x => R.repeat(x.id, x.count), drawList.value) )
 
-  let parameters = {type: encounterType, level: encounterLevel}
+  let parameters = {type: encounterType, level: encounterLevel, draw: encounterDraw}
 
   encounterCreate(encounterName, cards, parameters, cropImage.value, (res) => {
     console.log("success", res)

From 376bfbeba796eb2c7baeeea0e8a8b98bc72b3914 Mon Sep 17 00:00:00 2001
From: lxgr-linux <lxgr@protonmail.com>
Date: Wed, 30 Jul 2025 15:15:03 +0200
Subject: [PATCH 3/5] Made encounters ACKSHUALLY work now

---
 src/def-composables/useTx.ts       |  5 +++--
 src/views/EncounterCreatorPage.vue | 20 ++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/def-composables/useTx.ts b/src/def-composables/useTx.ts
index 0de4a476..51d2a5ea 100644
--- a/src/def-composables/useTx.ts
+++ b/src/def-composables/useTx.ts
@@ -9,6 +9,7 @@ import { ref, watch, type Ref } from "vue";
 import {
   msgTypes as CCMsgTypes,
   CardWithImage,
+  Parameter,
   type SingleVote,
 } from "decentralcardgame-cardchain-client-ts/cardchain.cardchain";
 import { Response as CouncilResponse } from "decentralcardgame-cardchain-client-ts/types/cardchain/cardchain/council";
@@ -262,7 +263,7 @@ export const useTxInstance: () => {
   encounterCreate: (
     name: string,
     Drawlist: number[],
-    parameters: { [key: string]: string },
+    parameters: Parameter[],
     image: string,
     then: (res: any) => void,
     err: (res: any) => void,
@@ -684,7 +685,7 @@ export const useTxInstance: () => {
   const encounterCreate = (
     name: string,
     drawlist: number[],
-    parameters: { [key: string]: string },
+    parameters: Parameter[],
     image: string,
     then: (res: any) => void,
     err: (res: any) => void,
diff --git a/src/views/EncounterCreatorPage.vue b/src/views/EncounterCreatorPage.vue
index af09294f..acd5cddb 100644
--- a/src/views/EncounterCreatorPage.vue
+++ b/src/views/EncounterCreatorPage.vue
@@ -243,6 +243,7 @@ import { useAddress } from "@/def-composables/useAddress";
 import { useQuery } from "@/def-composables/useQuery";
 import { useTx } from "@/def-composables/useTx";
 import type { QueryEncounterWithImageResponse } from "decentralcardgame-cardchain-client-ts/types/cardchain/cardchain/query";
+import type { Parameter } from "decentralcardgame-cardchain-client-ts/cardchain.cardchain";
 
 const { notifyFail } = useNotifications();
 const route = useRoute();
@@ -380,7 +381,7 @@ onMounted(() => {
   queryEncounterWithImage(route.query.id).then(
     (res: QueryEncounterWithImageResponse) => {
       cropImage.value = res.encounter!.image;
-      encounterName = res.encounter!.encounter!.name;
+      encounterName.value = res.encounter!.encounter!.name;
 
       let parameters = res.encounter!.encounter!.parameters;
       encounterType = ref(
@@ -506,7 +507,7 @@ const publish = () => {
     notifyFail("HQ", "An Encounter needs a HQ. Add one please.");
     return;
   }
-  if (encounterName === "") {
+  if (encounterName.value === "") {
     notifyFail("Name", "An Encounter needs a Name. Add one please.");
     return;
   }
@@ -514,14 +515,17 @@ const publish = () => {
   // unfold drawlist
   let cards = R.flatten(R.map((x) => R.repeat(x.id, x.count), drawList.value));
 
-  let parameters = {
-    type: encounterType,
-    level: encounterLevel,
-    draw: encounterDraw,
-  };
+  let parameters: Parameter[] = [
+    { key: "type", value: encounterType.value },
+    {
+      key: "level",
+      value: "" + encounterLevel.value,
+    },
+    { key: "draw", value: encounterDraw.value },
+  ];
 
   encounterCreate(
-    encounterName,
+    encounterName.value,
     cards,
     parameters,
     cropImage.value,

From 3538dccb1143b6f007b0bdd288cd177e5cc8ebbc Mon Sep 17 00:00:00 2001
From: lxgr-linux <lxgr@protonmail.com>
Date: Wed, 30 Jul 2025 15:47:02 +0200
Subject: [PATCH 4/5] Added types to encounter creator

---
 src/views/EncounterCreatorPage.vue | 58 +++++++++++++++---------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/views/EncounterCreatorPage.vue b/src/views/EncounterCreatorPage.vue
index acd5cddb..022ecb8b 100644
--- a/src/views/EncounterCreatorPage.vue
+++ b/src/views/EncounterCreatorPage.vue
@@ -160,10 +160,10 @@
         <div
           class="flex flex-row w-full h-6 mb-2 select-none cursor-grab"
           draggable="true"
-          @drop="onDrop($event, index)"
+          @drop="onDrop(index)"
           @dragover.prevent
           @dragenter.prevent
-          @dragstart="startDrag($event, index)"
+          @dragstart="startDrag(index)"
           @click="removeCard(index)"
         >
           <div class="w-6 flex-none bg-transparent">{{ item.count }}x</div>
@@ -208,7 +208,7 @@
 import * as R from "ramda";
 import { env } from "@/env";
 import { onMounted, watch, ref } from "vue";
-import { useRoute, useRouter } from "vue-router";
+import { useRoute } from "vue-router";
 import { useCards } from "@/def-composables/useCards";
 import { useNotifications } from "@/def-composables/useNotifications";
 import BaseCCButton from "@/components/elements/CCButton/BaseCCButton.vue";
@@ -235,8 +235,7 @@ import { Color } from "@/components/utils/color";
 import { useGallery } from "@/def-composables/useGallery";
 import { uploadImg } from "@/components/utils/utils";
 import CCInput from "@/components/elements/CCInput/CCInput.vue";
-import { CardStatus } from "decentralcardgame-cardchain-client-ts/types/cardchain/cardchain/card";
-import { Card } from "@/model/Card";
+import { Card, CardClass } from "@/model/Card";
 import SortDirectionButton from "@/components/elements/SortDirectionButton.vue";
 import { useLoggedIn } from "@/def-composables/useLoggedIn";
 import { useAddress } from "@/def-composables/useAddress";
@@ -244,31 +243,32 @@ import { useQuery } from "@/def-composables/useQuery";
 import { useTx } from "@/def-composables/useTx";
 import type { QueryEncounterWithImageResponse } from "decentralcardgame-cardchain-client-ts/types/cardchain/cardchain/query";
 import type { Parameter } from "decentralcardgame-cardchain-client-ts/cardchain.cardchain";
+import type { Ref } from "vue";
 
 const { notifyFail } = useNotifications();
 const route = useRoute();
-const router = useRouter();
 const { loggedIn } = useLoggedIn();
 const { address } = useAddress();
-const isCardViewModalVisible = ref(false);
-const cardViewModalCardId = ref(-1);
 const {
   cardList,
   loadQueryCardList,
   galleryFilters,
   pageQueryFromGalleryFilters,
-  galleryFiltersFromPageQuery,
 } = useGallery();
-const { encounterDo, encounterCreate, encounterClose } = useTx();
+const { encounterCreate } = useTx();
 const { getCard } = useCards();
-const {
-  queryEncounter,
-  queryEncounterWithImage,
-  queryEncounters,
-  queryEncountersWithImage,
-} = useQuery();
+const { queryEncounterWithImage } = useQuery();
+
+type Entry = {
+  id: number;
+  name: string;
+  cost: number;
+  type: string;
+  class: CardClass;
+  count: number;
+};
 
-const drawList = ref([]);
+const drawList: Ref<Entry[]> = ref([]);
 let cropImage = ref("");
 let encounterName = ref("");
 let encounterType = ref("Constructed");
@@ -280,13 +280,14 @@ let hqSelected = ref(false);
 let cardsAdded = 0;
 
 watch(drawList.value, () => {
-  let hq = undefined;
+  let hq: Entry | undefined = undefined;
   drawList.value.forEach((item, index) => {
     if (item.type == "Headquarter") {
       if (hq) drawList.value.splice(index, 1);
       else hq = item;
     }
   });
+
   if (hq) {
     // change filters to cards only matching HQ
     galleryFilters.value.nature = hq.class.Nature;
@@ -371,7 +372,6 @@ const typeOptions: GalleryFilterImageChooserOptions<GalleryFilters> = [
 onMounted(() => {
   galleryFilters.value.owner = address.value;
   galleryFilters.value.status = "playable";
-  [CardStatus.prototype];
   galleryFilters.value.hq = true;
 
   let filters = pageQueryFromGalleryFilters();
@@ -436,12 +436,12 @@ const loadCard = async (cardId: number) => {
 const addCardToEncounter = (card: Card) => {
   if (
     !R.isEmpty(drawList.value) &&
-    R.last(drawList.value).id == card.id &&
+    R.last(drawList.value)!.id == card.id &&
     card.type != "Headquarter"
   ) {
-    R.last(drawList.value).count++;
+    R.last(drawList.value)!.count++;
   } else {
-    let newEntry = {
+    let newEntry: Entry = {
       id: card.id,
       name: card.CardName,
       cost: card.Delay || card.CastingCost,
@@ -455,31 +455,31 @@ const addCardToEncounter = (card: Card) => {
   updateCardsAdded();
 };
 
-const startDrag = (evt, index) => {
+const startDrag = (index: number) => {
   dragFrom = index;
 };
 
-const onDrop = (evt, targetIndex) => {
+const onDrop = (targetIndex: number) => {
   if (targetIndex == 0) targetIndex = 1;
   drawList.value = R.move(dragFrom, targetIndex, drawList.value);
 
-  let newList = [];
+  let newList: Entry[] = [];
   for (let entry of drawList.value) {
-    if (R.last(newList) && R.last(newList).id == entry.id)
-      R.last(newList).count += entry.count;
+    if (R.last(newList) && R.last(newList)!.id == entry.id)
+      R.last(newList)!.count += entry.count;
     else newList.push(entry);
   }
   drawList.value.splice(0, drawList.value.length, ...newList);
   updateCardsAdded();
 };
 
-const removeCard = (index) => {
+const removeCard = (index: number) => {
   if (drawList.value[index].count == 1) drawList.value.splice(index, 1);
   else drawList.value[index].count--;
   updateCardsAdded();
 };
 
-const getMiniFrame = (item) => {
+const getMiniFrame = (item: Entry) => {
   var cardClass = "";
   if (item.type == "Headquarter") return "icon/minicardframe/HQFrame.png";
   else {

From 33cb73460ab76366d6e60b6642714af7a87c9a76 Mon Sep 17 00:00:00 2001
From: lxgr-linux <lxgr@protonmail.com>
Date: Wed, 30 Jul 2025 16:09:17 +0200
Subject: [PATCH 5/5] fix: made edit encounter work

---
 package-lock.json               |  8 ++++----
 package.json                    |  2 +-
 src/views/UserView/UserView.vue | 12 ++++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1054114..cb7f0397 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "axios": "0.21.4",
         "bignumber.js": "^9.1.2",
         "crypto-js": "^4.2.0",
-        "decentralcardgame-cardchain-client-ts": "^0.0.38",
+        "decentralcardgame-cardchain-client-ts": "^0.0.39",
         "discord-oauth2": "^2.12.1",
         "long": "^5.2.3",
         "merge-images": "^2.0.0",
@@ -2981,9 +2981,9 @@
       }
     },
     "node_modules/decentralcardgame-cardchain-client-ts": {
-      "version": "0.0.38",
-      "resolved": "https://registry.npmjs.org/decentralcardgame-cardchain-client-ts/-/decentralcardgame-cardchain-client-ts-0.0.38.tgz",
-      "integrity": "sha512-kOqaXVI7rpBBIjLfrHipZxSqvGN0PuX53vdf8USxKqHwPqoIlJjEq7tGJoz2oRngnGo+ZcwQyNQXF9cAml26qg==",
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/decentralcardgame-cardchain-client-ts/-/decentralcardgame-cardchain-client-ts-0.0.39.tgz",
+      "integrity": "sha512-V0+Lk9yUnt+2jMpJVgegEDl2nPzxj3yukYzvaskA/xT04C6BT25zOkSGurIqIgX6aGXvnifR7aTWPaZIQ/ttQw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@bufbuild/protobuf": "^2.4.0",
diff --git a/package.json b/package.json
index 9ed536dd..e2fe51dc 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "axios": "0.21.4",
     "bignumber.js": "^9.1.2",
     "crypto-js": "^4.2.0",
-    "decentralcardgame-cardchain-client-ts": "^0.0.38",
+    "decentralcardgame-cardchain-client-ts": "^0.0.39",
     "discord-oauth2": "^2.12.1",
     "long": "^5.2.3",
     "merge-images": "^2.0.0",
diff --git a/src/views/UserView/UserView.vue b/src/views/UserView/UserView.vue
index 2f25f896..611a7ce9 100644
--- a/src/views/UserView/UserView.vue
+++ b/src/views/UserView/UserView.vue
@@ -236,8 +236,12 @@ import ChoosePBModal from "@/components/modals/ChoosePBModal.vue";
 import { Color } from "@/components/utils/color";
 import { CouncilStatus } from "decentralcardgame-cardchain-client-ts/types/cardchain/cardchain/user";
 import CompactAddressComponent from "@/components/elements/CompactAddressComponent.vue";
-import type { AxiosResponse } from "axios";
-import type { QueryMatchesResponse } from "decentralcardgame-cardchain-client-ts/types/cardchain/cardchain/query";
+import type {
+  QueryEncounterResponse,
+  QueryEncountersResponse,
+  QueryMatchesResponse,
+} from "decentralcardgame-cardchain-client-ts/types/cardchain/cardchain/query";
+import type { Encounter } from "decentralcardgame-cardchain-client-ts/cardchain.cardchain";
 
 const { queryUser, queryAllBalances, queryMatches } = useQuery();
 const { queryEncounters, queryEncountersWithImage } = useQuery();
@@ -345,9 +349,9 @@ const getMatches = () => {
 };
 
 const getEncounters = () => {
-  queryEncounters().then((res) => {
+  queryEncounters().then((res: QueryEncountersResponse) => {
     state.ownEncounters = R.map(
-      (y) => ({ id: y.Id, name: y.name }),
+      (y: Encounter) => ({ id: y.id, name: y.name }),
       R.filter((x) => x.owner == state.addr, res.encounters),
     );
   });