From 7ca7ad9b7280dc64c2562110cac069be1916e6ff Mon Sep 17 00:00:00 2001
From: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Date: Mon, 7 Jun 2021 19:50:40 -0700
Subject: [PATCH] Fix missing user_tags exception and configure gems button

---
 .../Resources/ProjectManager.qss              | 24 +++++++++++++++++++
 .../ProjectManager/Source/PythonBindings.cpp  |  7 ++++--
 .../Source/UpdateProjectCtrl.cpp              |  4 ++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
index c18d61fc24..80470591a8 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
@@ -291,6 +291,30 @@ QTabBar::tab:pressed
     height:50px;
 }
 
+#projectSettingsTab::tab-bar > QPushButton {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #888888, stop: 1.0 #555555);
+    qproperty-flat: true;
+    margin-right:30px;
+    margin-bottom:12px;
+    margin-top:0px;
+    min-width:170px;
+    max-width:170px;
+    min-height:26px;
+    max-height:26px;
+    border-radius: 3px;
+    text-align:center;
+    font-size:13px;
+}
+#projectSettingsTab::tab-bar > QPushButton:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #999999, stop: 1.0 #666666);
+}
+#projectSettingsTab::tab-bar > QPushButton:pressed {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                            stop: 0 #555555, stop: 1.0 #777777);
+}
+
 #projectSettingsTopFrame {
     background-color:#1E252F;
 }
diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
index 73e860112f..5e7c78d2ec 100644
--- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp
+++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp
@@ -682,9 +682,12 @@ namespace O3DE::ProjectManager
                 projectInfo.m_displayName = Py_To_String_Optional(projectData, "display_name", projectInfo.m_projectName);
                 projectInfo.m_origin = Py_To_String_Optional(projectData, "origin", projectInfo.m_origin);
                 projectInfo.m_summary = Py_To_String_Optional(projectData, "summary", projectInfo.m_summary);
-                for (auto tag : projectData["user_tags"])
+                if (projectData.contains("user_tags"))
                 {
-                    projectInfo.m_userTags.append(Py_To_String(tag));
+                    for (auto tag : projectData["user_tags"])
+                    {
+                        projectInfo.m_userTags.append(Py_To_String(tag));
+                    }
                 }
             }
             catch ([[maybe_unused]] const std::exception& e)
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
index 3fb2d97e25..be1f0e5529 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
@@ -58,7 +58,7 @@ namespace O3DE::ProjectManager
         tabWidget->tabBar()->setObjectName("projectSettingsTabBar");
         tabWidget->addTab(m_updateSettingsScreen, tr("General"));
 
-        QPushButton* gemsButton = new QPushButton(tr("Add More Gems"), this);
+        QPushButton* gemsButton = new QPushButton(tr("Configure Gems"), this);
         topBarHLayout->addWidget(gemsButton);
         tabWidget->setCornerWidget(gemsButton);
 
@@ -189,7 +189,7 @@ namespace O3DE::ProjectManager
     {
         if (m_stack->currentIndex() == ScreenOrder::Gems)
         {
-            m_header->setSubTitle(QString(tr("Add More Gems to \"%1\"")).arg(m_projectInfo.m_projectName));
+            m_header->setSubTitle(QString(tr("Configure Gems for \"%1\"")).arg(m_projectInfo.m_projectName));
             m_nextButton->setText(tr("Confirm"));
         }
         else