@momo-kits/foundation 0.103.1-beta.2 → 0.103.1-beta.4

package/Application/Components.tsx

@@ -26,7 +26,6 @@ import {
   HeaderBackgroundProps,
   HeaderBackProps,
   NavigationButtonProps,
-  RouteParams,
   TitleCustomProps,
 } from './types';
 import {scaleSize, Text} from '../Text';
@@ -150,13 +149,11 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   const goBackSafe = () => {
     const goBack = () => {
       const canGoBack = navigator?.ref?.current?.canGoBack?.();
-      const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
+      const currentRoute: any = navigator?.ref?.current?.getCurrentRoute?.();
       const params = {
         appId: context.appId,
         code: context.code,
-        screen_name:
-          (currentRoute?.params as RouteParams)?.screen?.name ??
-          currentRoute?.name,
+        screen_name: currentRoute?.params?.screen?.name ?? currentRoute?.name,
         trigger_id: '111154000000000000',
         icon_name: 'back',
       };

package/Application/Localize.ts

@@ -17,6 +17,10 @@ class Localize {
     }
   }
 
+  get getCurrentLanguage() {
+    return this.currentLanguage;
+  }
+
   translate(key: string) {
     return this.assets[this.currentLanguage]?.[key] || key;
   }
@@ -26,7 +30,10 @@ class Localize {
   }
 
   addTranslations(translations: LocalizationObject) {
-    this.assets = translations;
+    this.assets = {
+      vi: {...translations?.vi, ...this.assets.vi},
+      en: {...translations?.en, ...this.assets.en},
+    };
   }
 
   setLanguage(language: 'en' | 'vi') {

package/Application/types.ts

@@ -248,11 +248,6 @@ export type AnimatedHeader = {
   headerTitle?: (props?: any) => React.ReactElement;
 };
 
-export interface RouteParams {
-  screen?: {
-    name?: string;
-  };
-}
 type NavigatorActionSuccessCallbackType = {
   status: NavigationActionCallbackStatusEnum.Success;
 };

package/Popup/PopupNotify.tsx

@@ -7,7 +7,6 @@ import {Icon} from '../Icon';
 import {Image} from '../Image';
 import {scaleSize, Text} from '../Text';
 import {PopupNotifyProps} from './types';
-import {RouteParams} from '../Application/types';
 
 const PopupNotify: React.FC<PopupNotifyProps> = ({
   id,
@@ -34,12 +33,11 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
    * tracking
    */
   useEffect(() => {
-    const routes = navigator?.ref.current?.getRootState()?.routes || [];
+    const routes: any = navigator?.ref.current?.getRootState()?.routes || [];
     const routesLength = routes.length;
-    let screen_name = (routes?.[0]?.params as RouteParams)?.screen?.name;
+    let screen_name = routes?.[0]?.params?.screen?.name;
     if (routesLength > 1) {
-      screen_name = (routes[routesLength - 2]?.params as RouteParams)?.screen
-        ?.name;
+      screen_name = routes[routesLength - 2]?.params?.screen?.name;
     }
     const tracking = {
       appId: context.appId,

package/Popup/PopupPromotion.tsx

@@ -5,7 +5,6 @@ import {ApplicationContext, MiniAppContext} from '../Application';
 import {Image} from '../Image';
 import {Radius, Spacing} from '../Consts';
 import {Icon} from '../Icon';
-import {RouteParams} from '../Application/types';
 
 const PopupPromotion: React.FC<PopupPromotionProps> = ({
   id,
@@ -20,12 +19,11 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
    * tracking
    */
   useEffect(() => {
-    const routes = navigator?.ref.current?.getRootState()?.routes || [];
+    const routes: any = navigator?.ref.current?.getRootState()?.routes || [];
     const routesLength = routes.length;
-    let screen_name = (routes?.[0]?.params as RouteParams)?.screen?.name;
+    let screen_name = routes?.[0]?.params?.screen?.name;
     if (routesLength > 1) {
-      screen_name = (routes[routesLength - 2]?.params as RouteParams)?.screen
-        ?.name;
+      screen_name = routes[routesLength - 2]?.params?.screen?.name;
     }
     const tracking = {
       appId: context.appId,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.103.1-beta.2",
+    "version": "0.103.1-beta.4",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -39,7 +39,8 @@
         "react-test-renderer": "17.0.1",
         "typescript": "^4.0.3",
         "@momo-platform/versions": "4.1.11",
-        "react-scanner": "^1.1.0"
+        "react-scanner": "^1.1.0",
+        "@types/color": "3.0.6"
     },
     "author": "@momo-kits/foundation",
     "license": "ISC"