@smart-link/rn-im 1.0.23 → 1.0.24

package/dist/hooks/useDownloadSource.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,16 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useDownloadImgSource = void 0;
-const react_1 = require("react");
-const init_1 = require("../init");
+import { useEffect, useState } from "react";
+import { getImManager } from "../init";
 function useDownload({ fileId, localPath, filename, resourceType }) {
-    const [local, setLocal] = (0, react_1.useState)(localPath);
-    (0, react_1.useEffect)(() => {
+    const [local, setLocal] = useState(localPath);
+    useEffect(() => {
         let cancel = false;
         const load = () => __awaiter(this, void 0, void 0, function* () {
-            const imManager = (0, init_1.getImManager)();
+            const imManager = getImManager();
             if (!localPath && fileId) {
                 const tmp = yield imManager.loadResourceFromCache(fileId);
                 if (tmp) {
@@ -46,7 +43,7 @@ function useDownload({ fileId, localPath, filename, resourceType }) {
     }, [localPath, fileId, filename]);
     return local;
 }
-function useDownloadImgSource(payload) {
+export function useDownloadImgSource(payload) {
     const { imageName, imagePath, imageFileId } = payload;
     return useDownload({
         localPath: imagePath,
@@ -55,8 +52,7 @@ function useDownloadImgSource(payload) {
         resourceType: 'picture'
     });
 }
-exports.useDownloadImgSource = useDownloadImgSource;
-function useDownloadSource(payload) {
+export default function useDownloadSource(payload) {
     const { localPath, fileId, filename, } = payload;
     return useDownload({
         localPath,
@@ -65,4 +61,3 @@ function useDownloadSource(payload) {
         resourceType: 'picture',
     });
 }
-exports.default = useDownloadSource;

package/dist/hooks/useFormatMsgTime.js

@@ -1,17 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatTime = void 0;
-const useTranslation_1 = __importDefault(require("./useTranslation"));
+import useTranslation from './useTranslation';
 const isDate = (date) => {
     if (date === null || date === undefined) {
         return false;
     }
     return !isNaN(new Date(date).getTime());
 };
-const formatTime = (time, t, i18n, showDetail = true) => {
+export const formatTime = (time, t, i18n, showDetail = true) => {
     let date = new Date(time), nowDate = new Date();
     let nowDay = nowDate.getDate(), nowMonth = nowDate.getMonth() + 1, nowYear = nowDate.getFullYear();
     let year = date.getFullYear(), hours = date.getHours(), minutes = date.getMinutes(), month = date.getMonth() + 1, days = date.getDate();
@@ -42,12 +36,10 @@ const formatTime = (time, t, i18n, showDetail = true) => {
     }
     return `${year}/${month}/${days} ${showDetail ? `${hours}:${minutes}` : ''}`;
 };
-exports.formatTime = formatTime;
-function useFormatMsgTime(time, showDetail = true) {
-    const { t, i18n } = (0, useTranslation_1.default)();
+export default function useFormatMsgTime(time, showDetail = true) {
+    const { t, i18n } = useTranslation();
     if (!isDate(time)) {
         return '';
     }
-    return (0, exports.formatTime)(time, t, i18n, showDetail);
+    return formatTime(time, t, i18n, showDetail);
 }
-exports.default = useFormatMsgTime;

package/dist/hooks/useImReady.js

@@ -1,15 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = require("react");
-const init_1 = require("../init");
+import { useEffect, useState } from "react";
+import { getImManager } from "../init";
 let isReady = false;
-function useImReady() {
-    const [ready, setReady] = (0, react_1.useState)(isReady);
-    (0, react_1.useEffect)(() => {
-        let imManager = (0, init_1.getImManager)();
+export default function useImReady() {
+    const [ready, setReady] = useState(isReady);
+    useEffect(() => {
+        let imManager = getImManager();
         if (!imManager) {
             const cycle = setInterval(() => {
-                imManager = (0, init_1.getImManager)();
+                imManager = getImManager();
                 if (imManager) {
                     clearInterval(cycle);
                     isReady = true;
@@ -24,4 +22,3 @@ function useImReady() {
     }, []);
     return isReady || ready;
 }
-exports.default = useImReady;

package/dist/hooks/useImSelector.js

@@ -1,48 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.usePanel = exports.useContact = exports.useChatGroup = exports.useSetting = exports.useForward = exports.useCollection = exports.useVideo = exports.useAuth = exports.useMessage = exports.useAvatars = exports.useConversation = void 0;
-const react_redux_1 = require("react-redux");
-function useConversation() {
-    return (0, react_redux_1.useSelector)(state => state['chat/conversation']);
-}
-exports.useConversation = useConversation;
-function useAvatars() {
-    return (0, react_redux_1.useSelector)(state => state['chat/conversation']['avatarsMap']);
-}
-exports.useAvatars = useAvatars;
-function useMessage() {
-    return (0, react_redux_1.useSelector)(state => state['chat/message']);
-}
-exports.useMessage = useMessage;
-function useAuth() {
-    return (0, react_redux_1.useSelector)(state => state.auth);
-}
-exports.useAuth = useAuth;
-function useVideo() {
-    return (0, react_redux_1.useSelector)(state => state['chat/video']);
-}
-exports.useVideo = useVideo;
-function useCollection() {
-    return (0, react_redux_1.useSelector)(state => state['chat/collection']);
-}
-exports.useCollection = useCollection;
-function useForward() {
-    return (0, react_redux_1.useSelector)(state => state['chat/forward']);
-}
-exports.useForward = useForward;
-function useSetting() {
-    return (0, react_redux_1.useSelector)(state => state['chat/setting']);
-}
-exports.useSetting = useSetting;
-function useChatGroup() {
-    return (0, react_redux_1.useSelector)(state => state['chat/group']);
-}
-exports.useChatGroup = useChatGroup;
-function useContact() {
-    return (0, react_redux_1.useSelector)(state => state['chat/contact']);
-}
-exports.useContact = useContact;
-function usePanel() {
-    return (0, react_redux_1.useSelector)(state => state['chat/panel']);
-}
-exports.usePanel = usePanel;
+import { useSelector } from 'react-redux';
+export function useConversation() {
+    return useSelector(state => state['chat/conversation']);
+}
+export function useAvatars() {
+    return useSelector(state => state['chat/conversation']['avatarsMap']);
+}
+export function useMessage() {
+    return useSelector(state => state['chat/message']);
+}
+export function useAuth() {
+    return useSelector(state => state.auth);
+}
+export function useVideo() {
+    return useSelector(state => state['chat/video']);
+}
+export function useCollection() {
+    return useSelector(state => state['chat/collection']);
+}
+export function useForward() {
+    return useSelector(state => state['chat/forward']);
+}
+export function useSetting() {
+    return useSelector(state => state['chat/setting']);
+}
+export function useChatGroup() {
+    return useSelector(state => state['chat/group']);
+}
+export function useContact() {
+    return useSelector(state => state['chat/contact']);
+}
+export function usePanel() {
+    return useSelector(state => state['chat/panel']);
+}

package/dist/hooks/useTranslation.js

@@ -1,12 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useTranslationAddrList = void 0;
-const react_i18next_1 = require("react-i18next");
-function useTranslation() {
-    return (0, react_i18next_1.useTranslation)('im');
+import { useTranslation as useReactTranslation } from 'react-i18next';
+export default function useTranslation() {
+    return useReactTranslation('im');
 }
-exports.default = useTranslation;
-function useTranslationAddrList() {
-    return (0, react_i18next_1.useTranslation)('addressList');
+export function useTranslationAddrList() {
+    return useReactTranslation('addressList');
 }
-exports.useTranslationAddrList = useTranslationAddrList;

package/dist/index.d.ts

@@ -5,3 +5,4 @@ export * from './slice';
 export * from './locales';
 export * from './hooks/useImSelector';
 export { default as ChatAvatar } from './components/ChatAvatar/ChatAvatar';
+export { default as VideoPlayer } from './components/VideoPlayer';

package/dist/index.js

@@ -1,28 +1,8 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChatAvatar = void 0;
-__exportStar(require("@smart-link/im-base"), exports);
-__exportStar(require("./init"), exports);
-__exportStar(require("./pages"), exports);
-__exportStar(require("./slice"), exports);
-__exportStar(require("./locales"), exports);
-__exportStar(require("./hooks/useImSelector"), exports);
-var ChatAvatar_1 = require("./components/ChatAvatar/ChatAvatar");
-Object.defineProperty(exports, "ChatAvatar", { enumerable: true, get: function () { return __importDefault(ChatAvatar_1).default; } });
+export * from '@smart-link/im-base';
+export * from './init';
+export * from './pages';
+export * from './slice';
+export * from './locales';
+export * from './hooks/useImSelector';
+export { default as ChatAvatar } from './components/ChatAvatar/ChatAvatar';
+export { default as VideoPlayer } from './components/VideoPlayer';

package/dist/init.js

@@ -1,4 +1,3 @@
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,54 +7,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogo = exports.getImManager = exports.initRequest = exports.initImSdk = void 0;
-const im_base_1 = require("@smart-link/im-base");
-const react_native_1 = require("react-native");
-const react_native_sqlite_storage_1 = __importDefault(require("react-native-sqlite-storage"));
-const request_1 = require("./utils/request");
-const default_assets_1 = require("./default-assets");
-const upload_1 = __importDefault(require("./utils/upload"));
-const file_1 = require("./utils/file");
-const rn_ui_1 = require("@smart-link/rn-ui");
-const lodash_es_1 = require("lodash-es");
-const cookie_1 = require("./utils/cookie");
+import { DBAdapter, ImManager, PayloadType, Platform as OS, SqliteStorage, } from '@smart-link/im-base';
+import { Platform } from 'react-native';
+import Sqlite from 'react-native-sqlite-storage';
+import { createRequest } from './utils/request';
+import { defaultAvatars } from './default-assets';
+import uploadFile from './utils/upload';
+import { download, initDir } from './utils/file';
+import { dp, Toast } from '@smart-link/rn-ui';
+import { cloneDeep } from "lodash-es";
+import { clearCookies } from "./utils/cookie";
 let imManager;
 let logo;
-const initImSdk = ({ user, storage, store, server, logo: outLogo, t, logout, undoLimitTime }) => __awaiter(void 0, void 0, void 0, function* () {
+export const initImSdk = ({ user, storage, store, server, logo: outLogo, t, logout, undoLimitTime }) => __awaiter(void 0, void 0, void 0, function* () {
     console.log('initImSdk: ', server);
     logo = outLogo;
     if (imManager && !imManager.isDestroyed()) {
         return imManager;
     }
     // 初始化目录
-    yield (0, file_1.initDir)(user);
+    yield initDir(user);
     // 初始化数据库
-    const db = new im_base_1.DBAdapter(new im_base_1.SqliteStorage(react_native_sqlite_storage_1.default));
+    const db = new DBAdapter(new SqliteStorage(Sqlite));
     yield db.createStores(user.userId);
-    imManager = new im_base_1.ImManager({
+    imManager = new ImManager({
         db,
         store,
         storage,
         server,
         namespace: '/chat',
-        user: (0, lodash_es_1.cloneDeep)(user),
-        platform: react_native_1.Platform.OS === 'ios' ? im_base_1.Platform.IOS : im_base_1.Platform.ANDROID,
+        user: cloneDeep(user),
+        platform: Platform.OS === 'ios' ? OS.IOS : OS.ANDROID,
         t,
         undoLimitTime: undoLimitTime || 1000 * 60 * 5,
-        defaultAvatars: default_assets_1.defaultAvatars,
+        defaultAvatars: defaultAvatars,
         logout,
         uploadFile: (file, onProgress) => {
-            return (0, upload_1.default)(file.localPath, file.type, onProgress);
+            return uploadFile(file.localPath, file.type, onProgress);
         },
         beforeUpload: (payload, payloadType) => __awaiter(void 0, void 0, void 0, function* () {
             const file = payload;
-            if (payloadType === im_base_1.PayloadType.VIDEO) {
+            if (payloadType === PayloadType.VIDEO) {
                 if (!file.imageFileId) {
-                    file.imageFileId = yield (0, upload_1.default)(file.imagePath, 'image/jpg');
+                    file.imageFileId = yield uploadFile(file.imagePath, 'image/jpg');
                 }
                 return file;
             }
@@ -64,22 +58,21 @@ const initImSdk = ({ user, storage, store, server, logo: outLogo, t, logout, und
             }
             return payload;
         }),
-        download: file_1.download,
+        download: download,
         toast(message, type) {
             console.log('toast: ', message, type);
             if (type === 'success') {
-                rn_ui_1.Toast.success(message);
+                Toast.success(message);
             }
             else if (type === 'fail') {
-                rn_ui_1.Toast.error(message);
+                Toast.error(message);
             }
             else {
-                rn_ui_1.Toast.info(message);
+                Toast.info(message);
             }
         },
         scrollToLatest(animated) {
             var _a;
-            console.log('scrollToLatest: ', animated);
             const flatList = (_a = imManager.flatListRef) === null || _a === void 0 ? void 0 : _a.current;
             if (flatList) {
                 flatList.scrollToOffset({ animated, offset: 0 });
@@ -99,23 +92,20 @@ const initImSdk = ({ user, storage, store, server, logo: outLogo, t, logout, und
                     flatList.scrollToIndex({
                         animated,
                         index: index,
+                        viewOffset: dp(15)
                     });
                 }
             }
         },
         onDestroyed() {
             console.log('IM onDestroyed');
-            (0, cookie_1.clearCookies)();
+            clearCookies();
         },
     });
     return imManager;
 });
-exports.initImSdk = initImSdk;
-const initRequest = (server) => {
-    (0, request_1.createRequest)(server);
+export const initRequest = (server) => {
+    createRequest(server);
 };
-exports.initRequest = initRequest;
-const getImManager = () => imManager;
-exports.getImManager = getImManager;
-const getLogo = () => logo;
-exports.getLogo = getLogo;
+export const getImManager = () => imManager;
+export const getLogo = () => logo;

package/dist/interface.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/locales/en/addressList.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const locale = {
     search: 'Search',
     addressList: 'Address Book',
@@ -28,4 +26,4 @@ const locale = {
     job: 'Job',
     otherJob: 'Other Job',
 };
-exports.default = locale;
+export default locale;

package/dist/locales/index.js

@@ -1,27 +1,4 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addressListLao = exports.addressListEn = exports.addressListZh = void 0;
-var addressList_1 = require("./zh/addressList");
-Object.defineProperty(exports, "addressListZh", { enumerable: true, get: function () { return __importDefault(addressList_1).default; } });
-var addressList_2 = require("./en/addressList");
-Object.defineProperty(exports, "addressListEn", { enumerable: true, get: function () { return __importDefault(addressList_2).default; } });
-var addressList_3 = require("./lao/addressList");
-Object.defineProperty(exports, "addressListLao", { enumerable: true, get: function () { return __importDefault(addressList_3).default; } });
-__exportStar(require("./zh/addressList"), exports);
+export { default as addressListZh } from './zh/addressList';
+export { default as addressListEn } from './en/addressList';
+export { default as addressListLao } from './lao/addressList';
+export * from './zh/addressList';

package/dist/locales/lao/addressList.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const locale = {
     search: 'ຄົ້ນຫາ',
     addressList: 'ລາຍຊື່ການຕິດຕໍ່',
@@ -28,4 +26,4 @@ const locale = {
     job: 'ວຽກ',
     otherJob: 'ວຽກອື່ນໆ',
 };
-exports.default = locale;
+export default locale;

package/dist/locales/zh/addressList.js

@@ -1,6 +1,4 @@
-"use strict";
 // ui 国际化语言
-Object.defineProperty(exports, "__esModule", { value: true });
 const locale = {
     search: '搜索',
     addressList: '通讯录',
@@ -29,4 +27,4 @@ const locale = {
     job: '主岗',
     otherJob: '兼岗',
 };
-exports.default = locale;
+export default locale;

package/dist/pages/address-list/AddressList.js

@@ -1,46 +1,18 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const rn_ui_1 = require("@smart-link/rn-ui");
-const react_1 = __importStar(require("react"));
-const react_native_1 = require("react-native");
-const useTranslation_1 = __importDefault(require("../../hooks/useTranslation"));
-const Icons_1 = require("./Icons");
-const addressList_1 = require("../../api/addressList");
-const useImSelector_1 = require("../../hooks/useImSelector");
+import { dp, ListRow, NavigationPage, SearchBar, useTheme } from '@smart-link/rn-ui';
+import React, { useEffect, useState } from 'react';
+import { View, Text, StyleSheet } from 'react-native';
+import useTranslation from '../../hooks/useTranslation';
+import { Unfold } from './Icons';
+import { listGroupCategory } from '../../api/addressList';
+import { useAuth } from '../../hooks/useImSelector';
 const AddressList = ({ navigation }) => {
-    const [groupCategoryList, setGroupCategoryList] = (0, react_1.useState)([]);
-    const { t } = (0, useTranslation_1.default)();
-    const theme = (0, rn_ui_1.useTheme)();
-    const { user } = (0, useImSelector_1.useAuth)();
+    const [groupCategoryList, setGroupCategoryList] = useState([]);
+    const { t } = useTranslation();
+    const theme = useTheme();
+    const { user } = useAuth();
     const compName = (user === null || user === void 0 ? void 0 : user.groupNamePath) || (user === null || user === void 0 ? void 0 : user.userName) || '';
-    (0, react_1.useEffect)(() => {
-        (0, addressList_1.listGroupCategory)({ appType: null }).then(({ data }) => {
+    useEffect(() => {
+        listGroupCategory({ appType: null }).then(({ data }) => {
             setGroupCategoryList(data);
         });
     }, []);
@@ -51,10 +23,10 @@ const AddressList = ({ navigation }) => {
     const handleGroupCategory = (item) => {
         navigation.navigate('Organization', Object.assign({}, item));
     };
-    return (<rn_ui_1.NavigationPage noPadding noInsetBottom scroll>
-            <react_native_1.View style={{ height: 10 }}/>
-            <rn_ui_1.SearchBar style={{ marginHorizontal: 10 }} onSearch={onPressSearch}/>
-            <react_native_1.View style={{ height: 8 }}/>
+    return (<NavigationPage noPadding noInsetBottom scroll>
+            <View style={{ height: 10 }}/>
+            <SearchBar style={{ marginHorizontal: 10 }} onSearch={onPressSearch}/>
+            <View style={{ height: 8 }}/>
             {/*<ListRow*/}
             {/*    title={*/}
             {/*        <View style={[styles.orgLine]}>*/}
@@ -70,21 +42,21 @@ const AddressList = ({ navigation }) => {
             {/*    topSeparator="full"*/}
             {/*/>*/}
 
-            <react_native_1.View style={{ height: 15 }}/>
+            <View style={{ height: 15 }}/>
 
-            <rn_ui_1.ListRow title={<react_native_1.View style={styles.orgLine}>
+            <ListRow title={<View style={styles.orgLine}>
                         {/*<Image style={{width: 30, height: 30, borderRadius: 3}}*/}
                         {/*       source={Tenant.config.logoOrg || Tenant.config.logo}/>*/}
-                        <react_native_1.Text style={styles.compName}>{compName}</react_native_1.Text>
-                    </react_native_1.View>}/>
+                        <Text style={styles.compName}>{compName}</Text>
+                    </View>}/>
 
             {groupCategoryList.map(item => {
-            return (<rn_ui_1.ListRow key={item.groupCategoryId} title={<react_native_1.View style={styles.orgLine}>
-                                <react_native_1.Text style={styles.smallIcon}>
-                                    <Icons_1.Unfold size={18} color={theme.primaryColor}/>
-                                </react_native_1.Text>
-                                <react_native_1.Text style={styles.title}>{item.groupCategoryName}</react_native_1.Text>
-                            </react_native_1.View>} onPress={() => handleGroupCategory(item)} topSeparator="full"/>);
+            return (<ListRow key={item.groupCategoryId} title={<View style={styles.orgLine}>
+                                <Text style={styles.smallIcon}>
+                                    <Unfold size={18} color={theme.primaryColor}/>
+                                </Text>
+                                <Text style={styles.title}>{item.groupCategoryName}</Text>
+                            </View>} onPress={() => handleGroupCategory(item)} topSeparator="full"/>);
         })}
 
             {/*<ListRow title=*/}
@@ -103,17 +75,17 @@ const AddressList = ({ navigation }) => {
             {/*    }*/}
             {/*    bottomSeparator='full'/>*/}
 
-            <react_native_1.View style={{ height: 15 }}/>
-        </rn_ui_1.NavigationPage>);
+            <View style={{ height: 15 }}/>
+        </NavigationPage>);
 };
-const styles = react_native_1.StyleSheet.create({
+const styles = StyleSheet.create({
     orgInfo: {
         paddingTop: 20,
         backgroundColor: '#f1f1f1',
         textAlignVertical: 'center',
     },
     orgLine: {
-        width: (0, rn_ui_1.dp)(350),
+        width: dp(350),
         flexDirection: 'row',
         alignItems: 'center',
     },
@@ -122,7 +94,7 @@ const styles = react_native_1.StyleSheet.create({
         borderTopWidth: 1,
     },
     compName: {
-        width: (0, rn_ui_1.dp)(305),
+        width: dp(305),
         fontSize: 16,
         fontWeight: '500',
         textAlignVertical: 'center',
@@ -151,4 +123,4 @@ const styles = react_native_1.StyleSheet.create({
         fontSize: 16,
     },
 });
-exports.default = AddressList;
+export default AddressList;