Merge pull request #78 from skalenetwork/add-erc721-tokens-support

Add erc721 tokens support
skalenetwork · Nov 14, 2022 · fa516a3 · fa516a3
2 parents 75377f8 + a373240
commit fa516a3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/src/components/TokenList/TokenList.tsx b/src/components/TokenList/TokenList.tsx
@@ -17,7 +17,7 @@ import TokenBalance from './TokenBalance';
 
 import styles from "../WidgetUI/WidgetUI.scss";
 import localStyles from "./TokenList.scss";
-import { getIconSrc, iconPath } from "./iconsHelper";
+import { getIconSrc, iconPath, getTokenName } from "./helper";
 
 
 export default function TokenList(props) {
@@ -63,7 +63,7 @@ export default function TokenList(props) {
                 styles.mp__flexGrow,
                 styles.mp__margRi10
               )}>
-                {props.token.unwrappedSymbol ? props.token.unwrappedSymbol : props.token.name}
+                {getTokenName(props.token)}
               </p>
               <TokenBalance token={props.token} />
             </div>

diff --git a/src/components/TokenList/iconsHelper.ts → src/components/TokenList/helper.ts b/src/components/TokenList/iconsHelper.ts → src/components/TokenList/helper.ts
@@ -17,13 +17,25 @@
  */
 
 /**
- * @file iconsHelper.ts
+ * @file helper.ts
  * @copyright SKALE Labs 2022-Present
  */
 
 import TokenData from '../../core/dataclasses/TokenData';
 
 
+export function getTokenSymbol(token: TokenData): string {
+    let symbol = token.unwrappedSymbol ? token.unwrappedSymbol : token.symbol;
+    if (token.clone) symbol = token.cloneSymbol ? token.cloneSymbol : symbol;
+    return symbol;
+}
+
+
+export function getTokenName(token: TokenData): string {
+    return token.name ? token.name : getTokenSymbol(token);
+}
+
+
 function importAll(r) {
     const images = {};
     r.keys().map((item, index) => { images[item.replace('./', '')] = r(item); });

diff --git a/src/components/TokenListSection/TokenListSection.tsx b/src/components/TokenListSection/TokenListSection.tsx
@@ -11,7 +11,7 @@ import TokenBalance from '../TokenList/TokenBalance';
 
 import styles from "../WidgetUI/WidgetUI.scss";
 import localStyles from "./TokenListSection.scss";
-import { getIconSrc } from "../TokenList/iconsHelper";
+import { getIconSrc, getTokenName } from "../TokenList/helper";
 
 
 export default function TokenListSection(props) {
@@ -49,7 +49,7 @@ export default function TokenListSection(props) {
                 styles.mp__flexGrow,
                 styles.mp__margRi10
               )}>
-                {props.tokens[key].unwrappedSymbol ? props.tokens[key].unwrappedSymbol : props.tokens[key].name}
+                {getTokenName(props.tokens[key])}
               </p>
               <TokenBalance token={props.tokens[key]} />
             </div>

diff --git a/src/components/WidgetBody/WidgetBody.tsx b/src/components/WidgetBody/WidgetBody.tsx
@@ -68,9 +68,9 @@ export default function WidgetBody(props) {
       </Collapse>
       <Collapse in={
         props.operationType !== OperationType.unwrap &&
-        !props.expandedFrom &&
-        !props.expandedTo &&
-        !props.expandedTokens &&
+        !expandedFrom &&
+        !expandedTo &&
+        !expandedTokens &&
         !wrapTransferAction
       }>
         <WrappedTokensWarning