Refactor with feedback suggestions

csfloat · Nov 18, 2024 · e3b0600 · e3b0600
1 parent ccfea9f
commit e3b0600
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 35 deletions.
diff --git a/src/lib/components/inventory/selected_item_info.ts b/src/lib/components/inventory/selected_item_info.ts
@@ -100,29 +100,23 @@ export class SelectedItemInfo extends FloatElement {
 
         const containerChildren: TemplateResult[] = [];
 
-        if (isSkin(this.asset.description)) {
-            if (this.itemInfo) {
-                const fadePercentage = getFadePercentage(this.asset.description, this.itemInfo);
-
-                containerChildren.push(
-                    html`<div>
-                        Float: ${this.itemInfo.floatvalue.toFixed(14)} ${renderClickableRank(this.itemInfo)}
-                    </div>`
-                );
-                containerChildren.push(html`<div>Paint Seed: ${formatSeed(this.itemInfo)}</div>`);
-                if (fadePercentage !== undefined) {
-                    containerChildren.push(html`<div>Fade: ${floor(fadePercentage, 5)}%</div>`);
-                }
-            }
-        } else if (isCharm(this.asset.description)) {
-            if (this.itemInfo) {
-                containerChildren.push(
-                    html`<div>
-                        Pattern:
-                        #${this.itemInfo.keychains?.length > 0 ? this.itemInfo.keychains[0].pattern : 'Unknown'}
-                    </div>`
-                );
+        if (isSkin(this.asset.description) && this.itemInfo) {
+            containerChildren.push(
+                html`<div>Float: ${this.itemInfo.floatvalue.toFixed(14)} ${renderClickableRank(this.itemInfo)}</div>`
+            );
+
+            containerChildren.push(html`<div>Paint Seed: ${formatSeed(this.itemInfo)}</div>`);
+
+            const fadePercentage = getFadePercentage(this.asset.description, this.itemInfo);
+            if (fadePercentage !== undefined) {
+                containerChildren.push(html`<div>Fade: ${floor(fadePercentage, 5)}%</div>`);
             }
+        } else if (isCharm(this.asset.description) && this.itemInfo) {
+            containerChildren.push(
+                html`<div>
+                    Pattern: #${this.itemInfo.keychains?.length > 0 ? this.itemInfo.keychains[0].pattern : 'Unknown'}
+                </div>`
+            );
         }
 
         if (isSellableOnCSFloat(this.asset.description)) {

diff --git a/src/lib/utils/skin.ts b/src/lib/utils/skin.ts
@@ -105,15 +105,7 @@ export function renderClickableRank(info: ItemInfo): TemplateResult<1> {
 }
 
 export function isSellableOnCSFloat(asset: rgAsset): boolean {
-    return (
-        isSkin(asset) ||
-        isCharm(asset) ||
-        isAgent(asset) ||
-        isSticker(asset) ||
-        isPin(asset) ||
-        isPatch(asset) ||
-        isCase(asset)
-    );
+    return isSkin(asset) || isCharm(asset) || isAgent(asset) || isSticker(asset) || isPatch(asset) || isCase(asset);
 }
 
 export function isSkin(asset: rgAsset): boolean {
@@ -136,10 +128,6 @@ export function isSticker(asset: rgAsset): boolean {
     return isAbstractType(asset, 'Sticker', 'CSGO_Tool_Sticker');
 }
 
-export function isPin(asset: rgAsset): boolean {
-    return isAbstractType(asset, 'Pin', 'CSGO_Type_Collectible');
-}
-
 export function isPatch(asset: rgAsset): boolean {
     return isAbstractType(asset, 'Patch', 'CSGO_Type_Patch');
 }