Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion assets/lang/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import LocalizedStrings from 'react-native-localization';
import { NotificationType } from '../../src/types';
import { BiometricAccessType } from '../../src/types/app';
import { SortType } from '../../src/types/drive';
import { SortType } from '../../src/types/drive/ui';

const strings = new LocalizedStrings({
en: {
Expand Down
20 changes: 10 additions & 10 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ PODS:
- IDZSwiftCommonCrypto (0.16.1)
- internxt-mobile-sdk (0.2.41):
- React-Core
- jail-monkey (2.8.3):
- jail-monkey (2.8.4):
- React-Core
- libwebp (1.5.0):
- libwebp/demux (= 1.5.0)
Expand Down Expand Up @@ -945,17 +945,17 @@ PODS:
- React-debug
- react-native-capture-protection (2.0.10):
- React-Core
- react-native-create-thumbnail (2.0.0):
- react-native-create-thumbnail (2.2.0):
- React-Core
- react-native-document-picker (4.3.0):
- React-Core
- react-native-pdf (6.7.6):
- react-native-pdf (6.7.7):
- React-Core
- react-native-pdf-thumbnail (1.3.1):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
- react-native-randombytes (3.6.1):
- react-native-randombytes (3.6.2):
- React-Core
- react-native-safe-area-context (4.8.2):
- React-Core
Expand Down Expand Up @@ -1169,7 +1169,7 @@ PODS:
- RCT-Folly (= 2022.05.16.00)
- React-Core
- ReactCommon/turbomodule/core
- RNScreens (3.34.0):
- RNScreens (3.34.1):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
Expand Down Expand Up @@ -1542,7 +1542,7 @@ SPEC CHECKSUMS:
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
IDZSwiftCommonCrypto: aefd3487b88dc3d7a1de2553188c720ac3194940
internxt-mobile-sdk: 821a26ae1521019b968b5c2bc716ca5498e8a7d1
jail-monkey: 066e0af74e67cbf432fbb4d214b046ef6dccf910
jail-monkey: 425f5ea33b17a1ce5763d40614df66245421bf00
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
RCTRequired: ca1d7414aba0b27efcfa2ccd37637edb1ab77d96
Expand All @@ -1567,11 +1567,11 @@ SPEC CHECKSUMS:
React-logger: 3eb80a977f0d9669468ef641a5e1fabbc50a09ec
React-Mapbuffer: 84ea43c6c6232049135b1550b8c60b2faac19fab
react-native-capture-protection: f2dd78383b616b9e1768eb577d190593f7232da2
react-native-create-thumbnail: ab55d24aea01723cf386f18b0b542aabb1982f27
react-native-create-thumbnail: 4f175cf70f560b293694ea7260efe0a31683dbd1
react-native-document-picker: 20f652c2402d3ddc81f396d8167c3bd978add4a2
react-native-pdf: 70ec85fc764070ce9324f5aea504795e889e6ba0
react-native-pdf: 73accc61238e8e9bc6e376191225028af20b996e
react-native-pdf-thumbnail: 390b1bc4b115b613ca61d6b14cbc712b3621b1df
react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
react-native-randombytes: ddf6edfd3fb9091af8c6ed1b35e57c308b5f5f2c
react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
react-native-video: 5d1ee3d683ff5509af36dbc458c8c0e3c118a13a
Expand Down Expand Up @@ -1608,7 +1608,7 @@ SPEC CHECKSUMS:
RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
RNPermissions: 4e3714e18afe7141d000beae3755e5b5fb2f5e05
RNReanimated: f6b02d8f5eaa2830296411d4ec3b8ef5442dd13d
RNScreens: 29418ceffb585b8f0ebd363de304288c3dce8323
RNScreens: 157ea2c7f02c6df42f252cf4e95d24a5afd3afbb
RNShare: a5dc3b9c53ddc73e155b8cd9a94c70c91913c43c
RNSVG: ba3e7232f45e34b7b47e74472386cf4e1a676d0a
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
Expand Down
62 changes: 32 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
"@expo/config-plugins": "7.8.4",
"@expo/config-types": "^47.0.0",
"@hookform/resolvers": "^2.9.1",
"@internxt/lib": "^1.2.0",
"@internxt/lib": "^1.4.1",
"@internxt/mobile-sdk": "^0.2.41",
"@internxt/rn-crypto": "0.1.15",
"@internxt/sdk": "=1.11.23",
"@internxt/sdk": "1.11.25",
"@react-native-async-storage/async-storage": "1.21.0",
"@react-navigation/bottom-tabs": "^6.2.0",
"@react-navigation/native": "^6.1.18",
Expand All @@ -48,10 +48,10 @@
"@testing-library/react-hooks": "^8.0.1",
"@types/luxon": "^3.0.1",
"@types/unorm": "^1.3.28",
"assert": "^1.5.0",
"async": "^3.2.0",
"assert": "1.5.1",
"async": "^3.2.6",
"asyncstorage-down": "^4.2.0",
"axios": "^0.27.2",
"axios": "^1.13.2",
"base-64": "^1.0.0",
"crypto-js": "=3.1.9-1",
"domain-browser": "^1.2.0",
Expand Down Expand Up @@ -80,12 +80,12 @@
"expo-updates": "~0.24.13",
"intl": "^1.2.5",
"jail-monkey": "^2.8.3",
"jwt-decode": "^3.1.2",
"lodash": "^4.17.20",
"luxon": "^3.0.3",
"jwt-decode": "^4.0.0",
"lodash": "^4.17.21",
"luxon": "^3.7.2",
"moment": "^2.29.2",
"node-libs-react-native": "^1.2.1",
"p-limit": "^6.2.0",
"p-limit": "^7.2.0",
"phosphor-react-native": "^1.1.1",
"prettysize": "^2.0.0",
"punycode": "^1.4.1",
Expand All @@ -94,7 +94,7 @@
"react-hook-form": "^7.32.0",
"react-native": "0.73.6",
"react-native-bip39": "^2.3.0",
"react-native-capture-protection": "^2.0.10",
"react-native-capture-protection": "2.0.10",
"react-native-collapsible": "^1.6.0",
"react-native-create-thumbnail": "^2.0.0",
"react-native-crypto": "^2.2.0",
Expand Down Expand Up @@ -122,7 +122,7 @@
"react-native-swipe-gestures": "^1.0.5",
"react-native-toast-message": "^2.1.1",
"react-native-uuid": "^2.0.1",
"react-native-video": "^6.6.4",
"react-native-video": "6.6.4",
"react-native-web": "~0.19.6",
"react-native-webview": "13.6.4",
"react-native-windows": "^0.75.4",
Expand All @@ -131,23 +131,23 @@
"recyclerlistview": "^4.1.3",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"reflect-metadata": "^0.1.13",
"reflect-metadata": "^0.2.2",
"rn-fetch-blob": "=0.11.2",
"socket.io-client": "^4.5.1",
"socket.io-client": "^4.8.3",
"tailwind-rn": "^4.2.0",
"unorm": "^1.6.0",
"usehooks-ts": "^2.6.0",
"yup": "^0.32.11"
"usehooks-ts": "^3.1.1",
"yup": "^1.7.1"
},
"devDependencies": {
"@babel/core": "^7.25.8",
"@babel/preset-env": "^7.1.6",
"@internxt/eslint-config-internxt": "^1.0.8",
"@babel/core": "^7.28.5",
"@babel/preset-env": "^7.28.5",
"@internxt/eslint-config-internxt": "^1.0.9",
"@internxt/prettier-config": "^1.0.2",
"@testing-library/jest-native": "^4.0.12",
"@testing-library/react-native": "^11.5.0",
"@testing-library/jest-native": "^4.0.13",
"@testing-library/react-native": "^12.8.0",
"@types/async": "^3.2.6",
"@types/jest": "^29.2.4",
"@types/jest": "^29.5.14",
"@types/lodash": "^4.14.165",
"@types/node": "^14.14.41",
"@types/react-native-indicators": "^0.16.0",
Expand All @@ -158,32 +158,34 @@
"@types/redux-thunk": "^2.1.0",
"@types/unorm": "^1.3.28",
"@welldone-software/why-did-you-render": "^7.0.1",
"autoprefixer": "^10.2.5",
"autoprefixer": "^10.4.23",
"babel-plugin-module-resolver": "^5.0.2",
"concurrently": "^7.2.1",
"concurrently": "^9.2.1",
"detox": "^19.7.0",
"eslint": "^8.8.0",
"husky": "^7.0.2",
"husky": "^9.1.7",
"jest": "^29.3.1",
"jest-expo": "~50.0.4",
"metro-react-native-babel-transformer": "^0.77.0",
"patch-package": "^8.0.1",
"path": "^0.12.7",
"postcss": "^8.2.15",
"postcss": "^8.5.6",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.3.2",
"prettier": "^3.7.4",
"react-native-svg-transformer": "^0.14.3",
"react-test-renderer": "^18.2.0",
"redux-devtools-extension": "^2.13.8",
"tailwindcss": "^3.0.0",
"ts-jest": "^29.0.3",
"ts-node": "^10.7.0",
"typescript": "^5.3.0"
"ts-jest": "^29.4.6",
"ts-node": "^10.9.2",
"typescript": "^5.9.3"
},
"engines": {
"node": ">=16.16.0"
},
"resolutions": {
"pbkdf2": "^3.1.3"
"pbkdf2": "^3.1.3",
"glob": "^7.2.3",
"@types/react": "^18.2.0"
}
}
3 changes: 2 additions & 1 deletion src/@inxt-js/api/FileObjectUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ export class FileObjectUpload extends EventEmitter {
const fileIterator = fileManager.iterator(determineShardSize(this.fileMeta.size));

for (let i = 0; i < nShards; i++) {
shardBuffer = Buffer.from(await fileIterator.next());
const chunk = await fileIterator.next();
shardBuffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);

cipher.write(shardBuffer);

Expand Down
4 changes: 2 additions & 2 deletions src/components/DriveItemSkinSkeleton/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DriveListViewMode } from '@internxt-mobile/types/drive';
import { DriveListViewMode } from '@internxt-mobile/types/drive/ui';
import React, { useState } from 'react';
import { View, Animated, Easing } from 'react-native';
import { Animated, Easing, View } from 'react-native';
import { useTailwind } from 'tailwind-rn';

const DriveItemSkinSkeleton: React.FC<{ viewMode?: DriveListViewMode }> = ({ viewMode }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/DriveNavigableItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { checkIsFolder, FolderIcon, getFileTypeIcon } from '../../helpers';
import { getDisplayName } from '../../helpers/itemNames';
import useGetColor from '../../hooks/useColor';
import globalStyle from '../../styles/global';
import { DriveNavigableItemProps } from '../../types/drive';
import { DriveNavigableItemProps } from '../../types/drive/ui';
import AppText from '../AppText';

const DriveNavigableItem: React.FC<DriveNavigableItemProps> = ({ isLoading, disabled, ...props }) => {
Expand Down
3 changes: 2 additions & 1 deletion src/components/drive/lists/DriveList/DriveList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import _ from 'lodash';
import React, { useEffect, useMemo, useState } from 'react';
import { FlatList, useWindowDimensions, View, ViewStyle } from 'react-native';

import { DriveListType, DriveListViewMode } from '@internxt-mobile/types/drive/ui';
import * as driveUseCases from '@internxt-mobile/useCases/drive';
import { useTailwind } from 'tailwind-rn';
import EmptyDriveImage from '../../../../../assets/images/screens/empty-drive.svg';
import EmptyFolderImage from '../../../../../assets/images/screens/empty-folder.svg';
import NoResultsImage from '../../../../../assets/images/screens/no-results.svg';
import strings from '../../../../../assets/lang/strings';
import useGetColor from '../../../../hooks/useColor';
import { DriveListItem, DriveListType, DriveListViewMode } from '../../../../types/drive';
import { DriveListItem } from '../../../../types/drive/item';
import DriveItemSkinSkeleton from '../../../DriveItemSkinSkeleton';
import EmptyList from '../../../EmptyList';
import { DriveGridModeItem } from '../items/DriveGridModeItem';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import FastImage from 'react-native-fast-image';
import { useTailwind } from 'tailwind-rn';
import { FolderIcon, getFileTypeIcon } from '../../../../../helpers';
import useGetColor from '../../../../../hooks/useColor';
import { DownloadedThumbnail, DriveItemProps, DriveItemStatus } from '../../../../../types/drive';
import { DownloadedThumbnail } from '../../../../../types/drive/file';
import { DriveItemStatus } from '../../../../../types/drive/item';
import { DriveItemProps } from '../../../../../types/drive/ui';
import AppText from '../../../../AppText';

function DriveGridModeItemComp(props: DriveItemProps): JSX.Element {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import ProgressBar from '../../../../AppProgressBar';
import AppText from '../../../../AppText';

import { time } from '@internxt-mobile/services/common/time';
import { DriveListType } from '@internxt-mobile/types/drive/ui';
import { useTailwind } from 'tailwind-rn';
import useGetColor from '../../../../../hooks/useColor';
import { DriveItemProps, DriveItemStatus, DriveListType } from '../../../../../types/drive';
import { DriveItemStatus } from '../../../../../types/drive/item';
import { DriveItemProps } from '../../../../../types/drive/ui';

export function DriveListModeItem(props: DriveItemProps): JSX.Element {
const tailwind = useTailwind();
Expand Down
3 changes: 2 additions & 1 deletion src/components/drive/lists/items/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import ProgressBar from '../../../AppProgressBar';
import AppText from '../../../AppText';

import { time } from '@internxt-mobile/services/common/time';
import { DriveListType } from '@internxt-mobile/types/drive/ui';
import { useTailwind } from 'tailwind-rn';
import useGetColor from '../../../../hooks/useColor';
import useDriveItem from '../../../../hooks/useDriveItem';
import { DriveItemProps, DriveListType } from '../../../../types/drive';
import { DriveItemProps } from '../../../../types/drive/ui';

function DriveItemTable(props: DriveItemProps): JSX.Element {
const tailwind = useTailwind();
Expand Down
2 changes: 1 addition & 1 deletion src/components/forms/AuthenticationForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Eye, EyeSlash } from 'phosphor-react-native';
import useGetColor from 'src/hooks/useColor';
import { authActions } from 'src/store/slices/auth';

const schema: yup.SchemaOf<AuthenticationFormData> = yup
const schema: yup.ObjectSchema<AuthenticationFormData> = yup
.object()
.shape({
password: yup.string().required(strings.errors.requiredField),
Expand Down
2 changes: 1 addition & 1 deletion src/components/forms/ChangePasswordForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const ChangePasswordForm = (props: BaseFormProps) => {
const [showNewPassword, setShowNewPassword] = useState(false);
const [showConfirmNewPassword, setShowConfirmNewPassword] = useState(false);
const { user } = useAppSelector((state) => state.auth);
const schema: yup.SchemaOf<ChangePasswordFormData> = yup
const schema: yup.ObjectSchema<ChangePasswordFormData> = yup
.object()
.shape({
newPassword: yup
Expand Down
4 changes: 2 additions & 2 deletions src/components/forms/EditNameForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import AppTextInput from '../../AppTextInput';
import { useAppDispatch, useAppSelector } from '../../../store/hooks';
import { authThunks } from '../../../store/slices/auth';

const schema: yup.SchemaOf<EditNameFormData> = yup
const schema: yup.ObjectSchema<EditNameFormData> = yup
.object()
.shape({
name: yup.string().required(strings.errors.requiredField),
lastName: yup.string(),
lastName: yup.string().required(),
})
.required();

Expand Down
2 changes: 1 addition & 1 deletion src/components/forms/SignUpForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import appService from '@internxt-mobile/services/AppService';
import StrengthMeter from 'src/components/StrengthMeter';
import { INCREASED_TOUCH_AREA } from 'src/styles/global';

const schema: yup.SchemaOf<SignUpFormData> = yup
const schema: yup.ObjectSchema<SignUpFormData> = yup
.object()
.shape({
email: yup
Expand Down
5 changes: 3 additions & 2 deletions src/components/modals/AddModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
parseExifDate,
} from '@internxt-mobile/services/drive/file/utils/exifHelpers';
import errorService from '@internxt-mobile/services/ErrorService';
import { DriveFileData, EncryptionVersion, FileEntryByUuid, Thumbnail } from '@internxt/sdk/dist/drive/storage/types';
import { DriveFileData, EncryptionVersion, FileEntryByUuid, Thumbnail } from '@internxt-mobile/types/drive/file';
import { SaveFormat } from 'expo-image-manipulator';
import { Camera, FileArrowUp, FolderSimplePlus, ImageSquare } from 'phosphor-react-native';
import uuid from 'react-native-uuid';
Expand Down Expand Up @@ -51,7 +51,8 @@ import { useAppDispatch, useAppSelector } from '../../../store/hooks';
import { driveActions, driveThunks } from '../../../store/slices/drive';
import { uiActions } from '../../../store/slices/ui';
import { NotificationType, ProgressCallback } from '../../../types';
import { DocumentPickerFile, DriveEventKey, UPLOAD_FILE_SIZE_LIMIT, UploadingFile } from '../../../types/drive';
import { DocumentPickerFile, UploadingFile, UPLOAD_FILE_SIZE_LIMIT } from '../../../types/drive/operations';
import { DriveEventKey } from '../../../types/drive/events';
import AppText from '../../AppText';
import BottomModal from '../BottomModal';
import CreateFolderModal from '../CreateFolderModal';
Expand Down
10 changes: 6 additions & 4 deletions src/components/modals/BottomModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ const BottomModal = (props: BottomModalProps): JSX.Element => {
isOpen={props.isOpen}
onClosed={props.onClosed}
position="top"
style={[
{ ...tailwind('bg-transparent'), paddingTop: props.ignoreSafeAreaTop ? 0 : safeAreaInsets.top },
props.modalStyle,
]}
style={
[
{ ...tailwind('bg-transparent'), paddingTop: props.ignoreSafeAreaTop ? 0 : safeAreaInsets.top },
props.modalStyle,
] as any
}
backButtonClose={props.backButtonClose !== undefined ? props.backButtonClose : true}
backdropPressToClose={props.backdropPressToClose}
animationDuration={props.animationDuration || 250}
Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/ConfirmMoveItemModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ArrowDown } from 'phosphor-react-native';
import { useTailwind } from 'tailwind-rn';
import strings from '../../../../assets/lang/strings';
import useGetColor from '../../../hooks/useColor';
import { DriveItemData, DriveItemFocused } from '../../../types/drive';
import { DriveItemData, FocusedItem as DriveItemFocused } from '../../../types/drive/item';
import AppButton from '../../AppButton';
import AppText from '../../AppText';
import CenterModal from '../CenterModal';
Expand Down
Loading
Loading