Skip to content

Commit e3b0600

Browse files
committed
Refactor with feedback suggestions
1 parent ccfea9f commit e3b0600

File tree

2 files changed

+17
-35
lines changed

2 files changed

+17
-35
lines changed

src/lib/components/inventory/selected_item_info.ts

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -100,29 +100,23 @@ export class SelectedItemInfo extends FloatElement {
100100

101101
const containerChildren: TemplateResult[] = [];
102102

103-
if (isSkin(this.asset.description)) {
104-
if (this.itemInfo) {
105-
const fadePercentage = getFadePercentage(this.asset.description, this.itemInfo);
106-
107-
containerChildren.push(
108-
html`<div>
109-
Float: ${this.itemInfo.floatvalue.toFixed(14)} ${renderClickableRank(this.itemInfo)}
110-
</div>`
111-
);
112-
containerChildren.push(html`<div>Paint Seed: ${formatSeed(this.itemInfo)}</div>`);
113-
if (fadePercentage !== undefined) {
114-
containerChildren.push(html`<div>Fade: ${floor(fadePercentage, 5)}%</div>`);
115-
}
116-
}
117-
} else if (isCharm(this.asset.description)) {
118-
if (this.itemInfo) {
119-
containerChildren.push(
120-
html`<div>
121-
Pattern:
122-
#${this.itemInfo.keychains?.length > 0 ? this.itemInfo.keychains[0].pattern : 'Unknown'}
123-
</div>`
124-
);
103+
if (isSkin(this.asset.description) && this.itemInfo) {
104+
containerChildren.push(
105+
html`<div>Float: ${this.itemInfo.floatvalue.toFixed(14)} ${renderClickableRank(this.itemInfo)}</div>`
106+
);
107+
108+
containerChildren.push(html`<div>Paint Seed: ${formatSeed(this.itemInfo)}</div>`);
109+
110+
const fadePercentage = getFadePercentage(this.asset.description, this.itemInfo);
111+
if (fadePercentage !== undefined) {
112+
containerChildren.push(html`<div>Fade: ${floor(fadePercentage, 5)}%</div>`);
125113
}
114+
} else if (isCharm(this.asset.description) && this.itemInfo) {
115+
containerChildren.push(
116+
html`<div>
117+
Pattern: #${this.itemInfo.keychains?.length > 0 ? this.itemInfo.keychains[0].pattern : 'Unknown'}
118+
</div>`
119+
);
126120
}
127121

128122
if (isSellableOnCSFloat(this.asset.description)) {

src/lib/utils/skin.ts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,7 @@ export function renderClickableRank(info: ItemInfo): TemplateResult<1> {
105105
}
106106

107107
export function isSellableOnCSFloat(asset: rgAsset): boolean {
108-
return (
109-
isSkin(asset) ||
110-
isCharm(asset) ||
111-
isAgent(asset) ||
112-
isSticker(asset) ||
113-
isPin(asset) ||
114-
isPatch(asset) ||
115-
isCase(asset)
116-
);
108+
return isSkin(asset) || isCharm(asset) || isAgent(asset) || isSticker(asset) || isPatch(asset) || isCase(asset);
117109
}
118110

119111
export function isSkin(asset: rgAsset): boolean {
@@ -136,10 +128,6 @@ export function isSticker(asset: rgAsset): boolean {
136128
return isAbstractType(asset, 'Sticker', 'CSGO_Tool_Sticker');
137129
}
138130

139-
export function isPin(asset: rgAsset): boolean {
140-
return isAbstractType(asset, 'Pin', 'CSGO_Type_Collectible');
141-
}
142-
143131
export function isPatch(asset: rgAsset): boolean {
144132
return isAbstractType(asset, 'Patch', 'CSGO_Type_Patch');
145133
}

0 commit comments

Comments
 (0)