Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing errors in development #280

Open
wants to merge 29 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9b3de5c
Enhance MenuButton and SettingsButton with theme support and translat…
Dec 10, 2024
20387a0
Fixed <img /> to React Native's <Image /> tags
KoudeIceTea Dec 10, 2024
fc9fd44
fix: update disclaimer handling to use AsyncStorage for persistence
Dec 10, 2024
46c69e4
Merge branch 'Fixing-errors-in-development' of https://github.com/Win…
Dec 10, 2024
3385a51
chore: update dependencies and improve package.json formatting
Dec 10, 2024
5afca72
FIX: VirtualList nesting now not nested anymore
KoudeIceTea Dec 10, 2024
774f56c
feat: add Clear Storage button to HomeScreen for easier data management
Dec 10, 2024
4908ff7
refactor: remove Clear Storage button and associated functionality fr…
Dec 10, 2024
1c3f8a1
refactor: remove unused Button import from HomeScreen
Dec 10, 2024
2f5f8e2
Refactor MenuButton and SettingsButton for improved styling; update H…
Dec 10, 2024
9c600b4
Refactor MenuButton positioning and styling; update Layout to include…
Dec 10, 2024
b09c44c
Update MenuButton font size and icon case sensitivity for consistency
Dec 10, 2024
66ac4e1
FIX: Updated expo to latest version + updated all dependancies for Ex…
KoudeIceTea Dec 10, 2024
84bd198
Merge branch 'Fixing-errors-in-development' of https://github.com/Win…
KoudeIceTea Dec 10, 2024
1c70759
Merge branch 'Fixing-errors-in-development' into SCRUM-241-refine_menu
Dec 11, 2024
af6af1b
FIX: npm ci dep errors
KoudeIceTea Dec 11, 2024
37db007
FIX: update expo to latest version
KoudeIceTea Dec 11, 2024
c4ea9d2
FIX: expo-doctor issues, removed unused packages that conflict
KoudeIceTea Dec 11, 2024
9c2cfb8
FIX: es-lint errors
KoudeIceTea Dec 11, 2024
7440582
fix indenting issues
KoudeIceTea Dec 11, 2024
87e9dde
FIX: TSC errors + Tests failing
KoudeIceTea Dec 11, 2024
44dde17
added deprecated lib to depcheck ignore file
KoudeIceTea Dec 11, 2024
2275e8a
added @types/react-dom to depcheck ignore list
KoudeIceTea Dec 11, 2024
3e1b86f
added react-dom to depcheck ignore list
KoudeIceTea Dec 11, 2024
c20a8ce
update baseUrl in Cypress config to match app local url
KoudeIceTea Dec 11, 2024
c89cb86
fix: ✏️ Enable new arch for expo 52
luximus-hunter Dec 12, 2024
b2191e5
Merge branch 'SCRUM-241-refine_menu' into Fixing-errors-in-development
KoudeIceTea Dec 12, 2024
3474dbf
FIX: lint error
KoudeIceTea Dec 12, 2024
9101fbe
FIX: unused disable warning
KoudeIceTea Dec 12, 2024
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
3 changes: 3 additions & 0 deletions .depcheckrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"react-error-boundary",
"react-native-dotenv",
"react-native-fs",
"@expo/webpack-config",
"@types/react-dom",
"react-dom",
"react-navigation",
"react-numeric-input",
"react-native-web"
Expand Down
4 changes: 2 additions & 2 deletions __tests__/components/general/PageScrollView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Store, AnyAction, configureStore } from '@reduxjs/toolkit';
import { Store, configureStore, UnknownAction } from '@reduxjs/toolkit';
import { render } from '@testing-library/react-native';
import React from 'react';
import { Text } from 'react-native';
Expand All @@ -16,7 +16,7 @@ jest.useFakeTimers();

describe('PageScrollView component', () => {
// @ts-ignore
let store: Store<unknown, AnyAction>;
let store: Store<unknown, UnknownAction>;

beforeEach(() => {
store = mockStore({
Expand Down
4 changes: 2 additions & 2 deletions __tests__/components/general/WhScrollView.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Store, AnyAction, configureStore } from '@reduxjs/toolkit';
import { Store, configureStore, UnknownAction } from '@reduxjs/toolkit';
import { render } from '@testing-library/react-native';
import React from 'react';
import { Text } from 'react-native';
Expand All @@ -13,7 +13,7 @@ jest.useFakeTimers();

describe('WhScrollView component', () => {
// @ts-ignore
let store: Store<unknown, AnyAction>;
let store: Store<unknown, UnknownAction>;

beforeEach(() => {
store = configureStore({
Expand Down
1 change: 1 addition & 0 deletions __tests__/unit/redux/slice/LoadingSlice.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const { setLoading } = loadingSlice.actions;
describe('loadingSlice', () => {
it('should have the correct initial state', () => {
const initialState = loadingSlice.reducer(undefined, {
// @ts-ignore
type: undefined,
});
expect(initialState).toEqual({ isLoading: false });
Expand Down
1 change: 1 addition & 0 deletions __tests__/unit/redux/slice/NavigationSlice.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const { showNavBar, updateSelectedNavBarRoute } = navigationActions;
describe('navigationSlice', () => {
it('should have the correct initial state', () => {
const initialState = navigationSlice.reducer(undefined, {
// @ts-ignore
type: undefined,
});
expect(initialState).toEqual({
Expand Down
1 change: 1 addition & 0 deletions __tests__/unit/redux/slice/NotificationSlice.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
describe('NotificationSlice', () => {
it('should have the correct initial state', () => {
const initialState = notificationSlice.reducer(undefined, {
// @ts-ignore
type: undefined,
});
expect(initialState).toEqual({ notifications: [] });
Expand Down
1 change: 1 addition & 0 deletions __tests__/unit/redux/slice/ThemeSlice.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const { changeTheme, setHighContrastEnabled } = themeActions;
describe('themeSlice', () => {
it('should have the correct initial state', () => {
const initialState: ThemeState = themeSlice.reducer(undefined, {
// @ts-ignore
type: undefined,
});
expect(initialState).toEqual({
Expand Down
3 changes: 2 additions & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"url": "https://u.expo.dev/027fbe3b-d508-4eb7-8c16-d259e6d78041"
},
"owner": "luximus",
"plugins": ["expo-font"]
"plugins": ["expo-font"],
"newArchEnabled": true
}
}
2 changes: 1 addition & 1 deletion cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default defineConfig({
fixturesFolder: 'cypress/fixtures',

e2e: {
baseUrl: 'http://localhost:19006',
baseUrl: 'http://localhost:8081',
projectId: 'cypress',

setupNodeEvents(on, config) {
Expand Down
2 changes: 1 addition & 1 deletion jest-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useAppSelector } from './src/lib/redux/Hooks';
import { ThemeState } from './src/lib/redux/slices/ThemeSlice';

// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
// jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
jest.mock('react-native-vector-icons/FontAwesome5', () => 'FontAwesome5');
jest.mock('react-native-webview', () => 'WebView');

Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
setupFilesAfterEnv: ['./jest-setup.ts'],
transformIgnorePatterns: [
'node_modules/(?!(jest-)?react-native|@react-native|@react-native-community|@react-navigation|expo-font|expo-modules-core|expo-asset|expo-constants|expo-file-system|expo-status-bar)',
'node_modules/(?!(jest-)?react-native|@react-native|@react-native-community|@react-navigation|expo-font|expo-modules-core|expo-asset|expo-constants|expo-file-system|expo-status-bar|react-redux)',
],
moduleNameMapper: {
'\\.(ttf)$': '<rootDir>/fonts.js',
Expand Down
Loading
Loading