From 40f8578d793de90caf83fc7c565f7ec54c973dc3 Mon Sep 17 00:00:00 2001
From: farrizabalaga <farrizabalaga@alkemy-x.com>
Date: Mon, 29 Jan 2024 17:28:35 -0700
Subject: [PATCH 1/3] Fix traypublisher asset/folderPath bug when updating
 instances

---
 openpype/hosts/traypublisher/api/plugin.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 14c66fa08f..6859b85a46 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -221,9 +221,16 @@ class SettingsCreator(TrayPublishCreator):
             ):
                 filtered_instance_data.append(instance)
 
-        asset_names = {
-            instance["asset"]
-            for instance in filtered_instance_data}
+        if AYON_SERVER_ENABLED:
+            asset_names = {
+                instance["folderPath"]
+                for instance in filtered_instance_data
+            }
+        else:
+            asset_names = {
+                instance["asset"]
+                for instance in filtered_instance_data
+            }
         subset_names = {
             instance["subset"]
             for instance in filtered_instance_data}
@@ -231,7 +238,10 @@ class SettingsCreator(TrayPublishCreator):
             asset_names, subset_names
         )
         for instance in filtered_instance_data:
-            asset_name = instance["asset"]
+            if AYON_SERVER_ENABLED:
+                asset_name = instance["folderPath"]
+            else:
+                asset_name = instance["asset"]
             subset_name = instance["subset"]
             version = subset_docs_by_asset_id[asset_name][subset_name]
             instance["creator_attributes"]["version_to_use"] = version

From 246731f1dcc0d7931a9016bbc5a5b12a1e517126 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Wed, 31 Jan 2024 03:24:55 +0000
Subject: [PATCH 2/3] [Automated] Bump version

---
 openpype/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/version.py b/openpype/version.py
index 2f2fc517b8..6cbe5ba6cd 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.18.6-nightly.1"
+__version__ = "3.18.6-nightly.2"

From 9a129100fc6fdf2828792440f8bf9aa3d501b19b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 03:25:30 +0000
Subject: [PATCH 3/3] chore(): update bug report / version

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 039b42bff3..cd81171b73 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.18.6-nightly.2
         - 3.18.6-nightly.1
         - 3.18.5
         - 3.18.5-nightly.3
@@ -134,7 +135,6 @@ body:
         - 3.15.9-nightly.1
         - 3.15.8
         - 3.15.8-nightly.3
-        - 3.15.8-nightly.2
     validations:
       required: true
   - type: dropdown