Merge pull request #1700 from chainapsis/sam/keplr-1508

Smart grouping is no longer beta + delay inital expand of stake page rewards card

Author: Thunnini

apps/extension/src/languages/en.json

@@ -700,7 +700,7 @@
 
   "page.main.components.context-menu.title": "View Options",
   "page.main.components.context-menu.tooltip-title": "New",
-  "page.main.components.context-menu.tooltip-paragraph": "Tired of cluttered asset lists?{br}Try Smart Grouping (Beta)!",
+  "page.main.components.context-menu.tooltip-paragraph": "Tired of cluttered asset lists?{br}Try Smart Grouping!",
   "page.main.components.context-menu.hide-low-balance": "Hide Low Balances",
   "page.main.components.context-menu.manage-asset-list": "Manage Asset List",
   "page.main.components.context-menu.smart-grouping": "Smart Grouping",

apps/extension/src/languages/ko.json

@@ -681,7 +681,7 @@
 
   "page.main.components.context-menu.title": "자산 보기 설정",
   "page.main.components.context-menu.tooltip-title": "신규",
-  "page.main.components.context-menu.tooltip-paragraph": "흩어진 자산을 한 눈에!{br}스마트 그루핑 기능(베타) 출시",
+  "page.main.components.context-menu.tooltip-paragraph": "흩어진 자산을 한 눈에!{br}스마트 그루핑 기능을 사용해보세요!",
   "page.main.components.context-menu.hide-low-balance": "소액 숨기기",
   "page.main.components.context-menu.smart-grouping": "Smart Grouping",
   "page.main.components.context-menu.manage-asset-list": "자산 표시 관리",

apps/extension/src/pages/main/components/context-menu/index.tsx

@@ -205,8 +205,6 @@ const MainMenu: React.FC<MainMenuProps> = observer(
                   id: "page.main.components.context-menu.smart-grouping",
                 })}
               </Body3>
-              <Gutter size="0.125rem" />
-              <BetaIcon />
             </Styles.MenuItemXAxis>
             <div onClick={(e) => e.stopPropagation()}>
               <Toggle
@@ -683,46 +681,3 @@ const FireIcon: FunctionComponent<IconProps> = ({ color }) => {
     </div>
   );
 };
-
-const BetaIcon: FunctionComponent<IconProps> = () => {
-  return (
-    <div
-      style={{
-        display: "flex",
-        width: "28px",
-        height: "15px",
-        padding: "1px 3px",
-        justifyContent: "center",
-        alignItems: "center",
-        gap: "10px",
-        borderRadius: "4px",
-        background: "var(--Blue-Blue400, #2C4BE2)",
-      }}
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        width="20"
-        height="8"
-        viewBox="0 0 20 8"
-        fill="none"
-      >
-        <path
-          d="M15.1934 7.04541C14.7979 7.04541 14.5254 6.79932 14.5254 6.44775C14.5254 6.30273 14.5649 6.13574 14.666 5.84131L15.9932 1.95215C16.2305 1.24023 16.5732 0.95459 17.2061 0.95459C17.8389 0.95459 18.1729 1.23584 18.4146 1.95215L19.7373 5.84131C19.8164 6.0874 19.856 6.26318 19.856 6.41699C19.856 6.79932 19.5835 7.04541 19.166 7.04541C18.7793 7.04541 18.5552 6.83447 18.4102 6.33789L18.1816 5.62158H16.1646L15.9316 6.33789C15.7866 6.84766 15.5801 7.04541 15.1934 7.04541ZM16.4634 4.57129H17.8872L17.2148 2.29932H17.1445L16.4634 4.57129Z"
-          fill="#FEFEFE"
-        />
-        <path
-          d="M12.4577 7.04102C12.005 7.04102 11.7326 6.75098 11.7326 6.27637V2.18945H10.5944C10.2604 2.18945 10.0099 1.93457 10.0099 1.59619C10.0099 1.25342 10.2604 0.998535 10.5944 0.998535H14.3341C14.6681 0.998535 14.9142 1.25342 14.9142 1.59619C14.9142 1.93457 14.6681 2.18945 14.3341 2.18945H13.1872V6.27637C13.1872 6.75098 12.9103 7.04102 12.4577 7.04102Z"
-          fill="#FEFEFE"
-        />
-        <path
-          d="M5.68782 6.1665V1.8291C5.68782 1.29297 5.98225 0.998535 6.53157 0.998535H9.25179C9.58577 0.998535 9.82307 1.23584 9.82307 1.57861C9.82307 1.91699 9.58577 2.1499 9.25179 2.1499H7.12483V3.44629H9.14632C9.45833 3.44629 9.66927 3.66602 9.66927 3.98242C9.66927 4.30322 9.45833 4.50977 9.14632 4.50977H7.12483V5.8457H9.23421C9.58577 5.8457 9.82307 6.07422 9.82307 6.42139C9.82307 6.77295 9.58577 6.99707 9.22981 6.99707H6.53157C5.98225 6.99707 5.68782 6.70703 5.68782 6.1665Z"
-          fill="#FEFEFE"
-        />
-        <path
-          d="M0.144028 6.1665V1.8291C0.144028 1.29297 0.438461 0.998535 0.987778 0.998535H2.80272C3.93651 0.998535 4.64842 1.56543 4.64842 2.4707C4.64842 3.15625 4.23534 3.65723 3.57616 3.78027V3.84619C4.38036 3.89893 4.93407 4.48779 4.93407 5.29639C4.93407 6.31592 4.09911 6.99707 2.84666 6.99707H0.987778C0.438461 6.99707 0.144028 6.70703 0.144028 6.1665ZM1.58104 3.4375H2.27977C2.94334 3.4375 3.22899 3.14746 3.22899 2.72119C3.22899 2.29932 2.93895 2.02686 2.43358 2.02686H1.58104V3.4375ZM1.58104 5.96875H2.35887C3.1367 5.96875 3.4575 5.66553 3.4575 5.17773C3.4575 4.68994 3.1367 4.36914 2.50389 4.36914H1.58104V5.96875Z"
-          fill="#FEFEFE"
-        />
-      </svg>
-    </div>
-  );
-};

apps/extension/src/pages/stake/components/rewards-card.tsx

@@ -58,7 +58,9 @@ export const RewardsCard: FunctionComponent<{
 
   useEffect(() => {
     if (initialExpand) {
-      setIsExpanded(true);
+      setTimeout(() => {
+        setIsExpanded(true);
+      }, 250);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);