Merge branch 'master' into aisosa-starter

1 files changed, 4 insertions, 4 deletions

diff --git a/src/client/views/collections/CollectionCardDeckView.tsx b/src/client/views/collections/CollectionCardDeckView.tsx
index 4bd9a77b5..2390d162c 100644
--- a/src/client/views/collections/CollectionCardDeckView.tsx
+++ b/src/client/views/collections/CollectionCardDeckView.tsx
@@ -116,11 +116,11 @@ export class CollectionCardView extends CollectionSubView() {
     }
 
     @computed get cardSort_customField() {
-        return StrCast(this.Document.cardSort_customField) as any as 'chat' | 'star' | 'idea' | 'like';
+        return StrCast(this.Document.cardSort_customField) as 'chat' | 'star' | 'idea' | 'like';
     }
 
     @computed get cardSort() {
-        return StrCast(this.Document.cardSort) as any as cardSortings;
+        return StrCast(this.Document.cardSort) as cardSortings;
     }
 
     /**
@@ -671,8 +671,8 @@ export class CollectionCardView extends CollectionSubView() {
                 className="collectionCardView-outer"
                 ref={(ele: HTMLDivElement | null) => this.createDashEventsTarget(ele)}
                 style={{
-                    background: this._props.styleProvider?.(this.layoutDoc, this._props, StyleProp.BackgroundColor),
-                    color: this._props.styleProvider?.(this.layoutDoc, this._props, StyleProp.Color),
+                    background: this._props.styleProvider?.(this.layoutDoc, this._props, StyleProp.BackgroundColor) as string,
+                    color: this._props.styleProvider?.(this.layoutDoc, this._props, StyleProp.Color) as string,
                 }}>
                 <div
                     className="card-wrapper"