Skip to content
Draft
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions app/AppContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import { NavigationContainer } from '@react-navigation/native';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import { connect } from 'react-redux';

import { SetUsernameStackParamList, StackParamList } from './definitions/navigationTypes';
import Navigation from './lib/navigation/appNavigation';
import { defaultHeader, getActiveRouteName, navigationTheme } from './lib/methods/helpers/navigation';
import { RootEnum } from './definitions';
import { SetUsernameStackParamList, StackParamList } from '@definitions/navigationTypes';
import Navigation from '@lib/navigation/appNavigation';
import { defaultHeader, getActiveRouteName, navigationTheme } from '@lib/methods/helpers/navigation';
import { RootEnum } from '@/definitions';
// Stacks
import AuthLoadingView from './views/AuthLoadingView';
import AuthLoadingView from '@views/AuthLoadingView';
// SetUsername Stack
import SetUsernameView from './views/SetUsernameView';
import OutsideStack from './stacks/OutsideStack';
import InsideStack from './stacks/InsideStack';
import MasterDetailStack from './stacks/MasterDetailStack';
import ShareExtensionStack from './stacks/ShareExtensionStack';
import { ThemeContext } from './theme';
import { setCurrentScreen } from './lib/methods/helpers/log';
import SetUsernameView from '@views/SetUsernameView';
import OutsideStack from '@stacks/OutsideStack';
import InsideStack from '@stacks/InsideStack';
import MasterDetailStack from '@stacks/MasterDetailStack';
import ShareExtensionStack from '@stacks/ShareExtensionStack';
import { ThemeContext } from '@/theme';
import { setCurrentScreen } from '@lib/methods/helpers/log';

const createStackNavigator = createNativeStackNavigator;

Expand Down
4 changes: 2 additions & 2 deletions app/actions/activeUsers.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Action } from 'redux';

import { IActiveUsers } from '../reducers/activeUsers';
import { ACTIVE_USERS } from './actionsTypes';
import { IActiveUsers } from '@reducers/activeUsers';
import { ACTIVE_USERS } from '@actions/actionsTypes';

interface ISetActiveUsers extends Action {
activeUsers: IActiveUsers;
Expand Down
2 changes: 1 addition & 1 deletion app/actions/app.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Action } from 'redux';
import { NetInfoStateType } from '@react-native-community/netinfo';

import { RootEnum } from '../definitions';
import { RootEnum } from '@/definitions';
import { APP } from './actionsTypes';

interface IAppStart extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/createChannel.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { TCreateChannelResult } from '../reducers/createChannel';
import { TCreateChannelResult } from '@reducers/createChannel';
import { CREATE_CHANNEL } from './actionsTypes';

interface ICreateChannelRequest extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/customEmojis.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Action } from 'redux';

import { SET_CUSTOM_EMOJIS } from './actionsTypes';
import { ICustomEmojis } from '../definitions';
import { ICustomEmojis } from '@/definitions';

export interface ISetCustomEmojis extends Action {
emojis: ICustomEmojis;
Expand Down
2 changes: 1 addition & 1 deletion app/actions/encryption.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { IBanner } from '../reducers/encryption';
import { IBanner } from '@reducers/encryption';
import { ENCRYPTION } from './actionsTypes';

export interface IEncryptionSet extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/enterpriseModules.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { IEnterpriseModules } from '../reducers/enterpriseModules';
import { IEnterpriseModules } from '@reducers/enterpriseModules';
import { ENTERPRISE_MODULES } from './actionsTypes';

interface ISetEnterpriseModules extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/inviteLinks.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { TInvite } from '../reducers/inviteLinks';
import { TInvite } from '@reducers/inviteLinks';
import { INVITE_LINKS } from './actionsTypes';

interface IInviteLinksGeneric extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/login.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { IUser } from '../definitions';
import { IUser } from '@/definitions';
import * as types from './actionsTypes';

interface ICredentials {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/messages.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Action } from 'redux';

import { MESSAGES } from './actionsTypes';
import { IMessage } from '../definitions';
import { IMessage } from '@/definitions';

interface IReplyBroadcast extends Action {
message: IMessage;
Expand Down
2 changes: 1 addition & 1 deletion app/actions/permissions.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { IPermissionsState, TSupportedPermissions } from '../reducers/permissions';
import { IPermissionsState, TSupportedPermissions } from '@reducers/permissions';
import { PERMISSIONS } from './actionsTypes';

interface ISetPermissions extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/roles.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { IRoles } from '../reducers/roles';
import { IRoles } from '@reducers/roles';
import { ROLES } from './actionsTypes';

export interface ISetRoles extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/room.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { ERoomType, RoomType } from '../definitions';
import { ERoomType, RoomType } from '@/definitions';
import { ROOM } from './actionsTypes';

// TYPE RETURN RELATED
Expand Down
2 changes: 1 addition & 1 deletion app/actions/selectedUsers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { ISelectedUser } from '../reducers/selectedUsers';
import { ISelectedUser } from '@reducers/selectedUsers';
import * as types from './actionsTypes';

type TUser = {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/settings.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { TSettingsState, TSupportedSettings, TSettingsValues } from '../reducers/settings';
import { TSettingsState, TSupportedSettings, TSettingsValues } from '@reducers/settings';
import { SETTINGS } from './actionsTypes';

interface IAddSettings extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/share.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { TShareParams } from '../reducers/share';
import { TShareParams } from '@reducers/share';
import { SHARE } from './actionsTypes';

interface IShareSetParams extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/sortPreferences.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { IPreferences } from '../definitions';
import { IPreferences } from '@/definitions';
import { SORT_PREFERENCES } from './actionsTypes';

interface ISetAllPreferences extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/actions/supportedVersions.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Action } from 'redux';

import { SUPPORTED_VERSIONS } from './actionsTypes';
import { TSVDictionary, TSVMessage, TSVStatus } from '../definitions';
import { TSVDictionary, TSVMessage, TSVStatus } from '@/definitions';

type TSetSupportedVersions = {
status: TSVStatus;
Expand Down
2 changes: 1 addition & 1 deletion app/actions/troubleshootingNotification.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Action } from 'redux';

import { TROUBLESHOOTING_NOTIFICATION } from './actionsTypes';
import { ITroubleshootingNotification } from '../reducers/troubleshootingNotification';
import { ITroubleshootingNotification } from '@reducers/troubleshootingNotification';

type TSetTroubleshootingNotification = Action & { payload: Partial<ITroubleshootingNotification> };

Expand Down
2 changes: 1 addition & 1 deletion app/actions/usersRoles.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { TUsersRoles } from '../reducers/usersRoles';
import { TUsersRoles } from '@reducers/usersRoles';
import { USERS_ROLES } from './actionsTypes';

export type TActionUsersRoles = Action & { usersRoles: TUsersRoles };
Expand Down
2 changes: 1 addition & 1 deletion app/actions/videoConf.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from 'redux';

import { ICallInfo } from '../reducers/videoConf';
import { ICallInfo } from '@reducers/videoConf';
import { VIDEO_CONF } from './actionsTypes';

interface IHandleVideoConfIncomingWebsocketMessages extends Action {
Expand Down
2 changes: 1 addition & 1 deletion app/dimensions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { Dimensions } from 'react-native';
import hoistNonReactStatics from 'hoist-non-react-statics';

import { TNavigationOptions } from './definitions/navigationTypes';
import { TNavigationOptions } from '@definitions/navigationTypes';

export interface IDimensionsContextProps {
width: number;
Expand Down
28 changes: 14 additions & 14 deletions app/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ import RNScreens from 'react-native-screens';
import { Provider } from 'react-redux';

import AppContainer from './AppContainer';
import { appInit, appInitLocalSettings, setMasterDetail as setMasterDetailAction } from './actions/app';
import { deepLinkingOpen } from './actions/deepLinking';
import { ActionSheetProvider } from './containers/ActionSheet';
import InAppNotification from './containers/InAppNotification';
import Loading from './containers/Loading';
import Toast from './containers/Toast';
import TwoFactor from './containers/TwoFactor';
import { IThemePreference } from './definitions/ITheme';
import { DimensionsContext } from './dimensions';
import { MIN_WIDTH_MASTER_DETAIL_LAYOUT, colors, isFDroidBuild, themes } from './lib/constants';
import { getAllowAnalyticsEvents, getAllowCrashReport } from './lib/methods';
import { debounce, isTablet } from './lib/methods/helpers';
import { toggleAnalyticsEventsReport, toggleCrashErrorsReport } from './lib/methods/helpers/log';
import parseQuery from './lib/methods/helpers/parseQuery';
import { appInit, appInitLocalSettings, setMasterDetail as setMasterDetailAction } from '@actions/app';
import { deepLinkingOpen } from '@actions/deepLinking';
import { ActionSheetProvider } from '@containers/ActionSheet';
import InAppNotification from '@containers/InAppNotification';
import Loading from '@containers/Loading';
import Toast from '@containers/Toast';
import TwoFactor from '@containers/TwoFactor';
import { IThemePreference } from '@definitions/ITheme';
import { DimensionsContext } from '@/dimensions';
import { MIN_WIDTH_MASTER_DETAIL_LAYOUT, colors, isFDroidBuild, themes } from '@lib/constants';
import { getAllowAnalyticsEvents, getAllowCrashReport } from '@lib/methods';
import { debounce, isTablet } from '@lib/methods/helpers';
import { toggleAnalyticsEventsReport, toggleCrashErrorsReport } from '@lib/methods/helpers/log';
import parseQuery from '@lib/methods/helpers/parseQuery';
import {
getTheme,
initialTheme,
Expand Down
6 changes: 3 additions & 3 deletions app/theme.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import hoistNonReactStatics from 'hoist-non-react-statics';
import React from 'react';

import { IThemePreference } from './definitions/ITheme';
import { TNavigationOptions } from './definitions/navigationTypes';
import { colors } from './lib/constants';
import { IThemePreference } from '@definitions/ITheme';
import { TNavigationOptions } from '@definitions/navigationTypes';
import { colors } from '@lib/constants';

export type TSupportedThemes = keyof typeof colors;
export type TColors = (typeof colors)[TSupportedThemes];
Expand Down
24 changes: 23 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,29 @@ module.exports = {
['@babel/plugin-proposal-decorators', { legacy: true }],
'react-native-reanimated/plugin',
'@babel/plugin-transform-named-capturing-groups-regex',
['module:react-native-dotenv']
['module:react-native-dotenv'],
[
'module-resolver',
{
root: ['.'],
extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.android.js', '.ios.js', '.android.ts', '.ios.ts', '.android.tsx', '.ios.tsx', '.android.jsx', '.ios.jsx'],
alias: {
'@': './app',
'@actions': './app/actions',
'@containers': './app/containers',
'@definitions': './app/definitions',
'@ee': './app/ee',
'@i18n': './app/i18n',
'@lib': './app/lib',
'@reducers': './app/reducers',
'@sagas': './app/sagas',
'@selectors': './app/selectors',
'@stacks': './app/stacks',
'@statics': './app/statics',
'@views': './app/views',
},
},
]
],
env: {
production: {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"@rocket.chat/message-parser": "0.31.26",
"@rocket.chat/sdk": "RocketChat/Rocket.Chat.js.SDK#mobile",
"@rocket.chat/ui-kit": "0.31.19",
"babel-plugin-module-resolver": "^5.0.2",
"bytebuffer": "5.0.1",
"color2k": "1.2.4",
"commonmark": "git+https://github.com/RocketChat/commonmark.js.git",
Expand Down
17 changes: 16 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,22 @@
/* Advanced Options */
"skipLibCheck": true /* Skip type checking of declaration files. */,
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
"resolveJsonModule": true
"resolveJsonModule": true,
"paths": {
"@/*": ["*"],
"@actions/*": ["actions/*"],
"@containers/*": ["containers/*"],
"@definitions/*": ["definitions/*"],
"@ee/*": ["ee/*"],
"@i18n/*": ["i18n/*"],
"@lib/*": ["lib/*"],
"@reducers/*": ["reducers/*"],
"@sagas/*": ["sagas/*"],
"@selectors/*": ["selectors/*"],
"@stacks/*": ["stacks/*"],
"@statics/*": ["statics/*"],
"@views/*": ["views/*"]
}
},
"exclude": ["node_modules", "__mocks__"]
}
Loading