Fixed issues with gems and viewing them from chat

AdamKyle · Dec 20, 2023 · 825072f · 825072f
1 parent a52617b
commit 825072f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/resources/js/game/sections/character-sheet/components/modals/components/gem-details.tsx b/resources/js/game/sections/character-sheet/components/modals/components/gem-details.tsx
@@ -22,6 +22,14 @@ export default class GemDetails extends React.Component<any, any> {
         </Fragment>
     }
 
+    getGem() {
+        if (this.props.gem.gem) {
+            return this.props.gem.gem;
+        }
+
+        return this.props.gem;
+    }
+
     render() {
         return (
             <Fragment>
@@ -36,7 +44,7 @@ export default class GemDetails extends React.Component<any, any> {
                     </p>
                 </div>
                 <div className='border-b-2 border-b-gray-300 dark:border-b-gray-600 my-6'></div>
-                {this.renderDetails(this.props.gem.gem)}
+                {this.renderDetails(this.getGem())}
             </Fragment>
         )
     }

diff --git a/...urces/js/game/sections/game-actions-section/components/crafting-sections/gem-crafting.tsx b/...urces/js/game/sections/game-actions-section/components/crafting-sections/gem-crafting.tsx
@@ -181,7 +181,9 @@ export default class GemCrafting extends React.Component<any, any> {
 
                                     {
                                         this.state.tiersForCrafting.length > 0 ?
-                                            <CraftingXp skill_xp={this.state.skill_xp} />
+                                            <div className='my-4'>
+                                                <CraftingXp skill_xp={this.state.skill_xp} />
+                                            </div>
                                         : null
                                     }
                                 </Fragment>
@@ -190,9 +192,13 @@ export default class GemCrafting extends React.Component<any, any> {
                 </div>
                 {
                     this.state.errorMessage !== null ?
-                        <DangerAlert>
-                            {this.state.errorMessage}
-                        </DangerAlert>
+                        <div className='mt-2 lg:grid lg:grid-cols-3 lg:gap-2 lg:ml-[120px]'>
+                            <div className='lg:cols-start-1 lg:col-span-2'>
+                                <DangerAlert>
+                                    {this.state.errorMessage}
+                                </DangerAlert>
+                            </div>
+                        </div>
                     : null
                 }
                 <div className='text-center lg:ml-[-100px] mt-3 mb-3'>