Use option icon in case it exists for selected items (#21152)

frontend/src/metabase/core/components/Select/Select.jsx

@@ -148,27 +148,29 @@ export default class Select extends Component {
   };
 
   renderItemIcon = item => {
-    if (this.itemIsSelected(item)) {
+    const icon = this.props.optionIconFn(item);
+    if (icon) {
       return (
         <Icon
-          name="check"
-          size={14}
-          color={color("text-dark")}
+          name={icon}
+          size={item.iconSize || 18}
+          color={item.iconColor || color("text-dark")}
           style={{ minWidth: MIN_ICON_WIDTH }}
         />
       );
     }
-    const icon = this.props.optionIconFn(item);
-    if (icon) {
+
+    if (this.itemIsSelected(item)) {
       return (
         <Icon
-          name={icon}
-          size={item.iconSize || 18}
-          color={item.iconColor || color("text-dark")}
+          name="check"
+          size={14}
+          color={color("text-dark")}
           style={{ minWidth: MIN_ICON_WIDTH }}
         />
       );
     }
+
     return <span style={{ minWidth: MIN_ICON_WIDTH }} />;
   };