Skip to content
This repository has been archived by the owner on May 23, 2024. It is now read-only.

Commit

Permalink
Release 8.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nzcovidtracer-dev committed Dec 12, 2022
1 parent 2b1215b commit bd0c96a
Show file tree
Hide file tree
Showing 43 changed files with 64 additions and 845 deletions.
4 changes: 4 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,10 @@ dependencies {
implementation jscFlavor
}

implementation 'androidx.work:work-runtime-ktx:2.7.0'

implementation 'androidx.work:work-runtime:2.7.1'

implementation project(':realm')

implementation project(':react-native-push-notification')
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<resources>
<string name="app_name">NZ COVID Tracer</string>
<string name="appCenterCrashes_whenToSendCrashes" moduleConfig="true" translatable="false">DO_NOT_ASK_JAVASCRIPT</string>
<string name="appCenterAnalytics_whenToEnableAnalytics" moduleConfig="true" translatable="false">ALWAYS_SEND</string>
</resources>
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
ext {
buildToolsVersion = "30.0.2"
minSdkVersion = 23
compileSdkVersion = 30
targetSdkVersion = 30
compileSdkVersion = 31
targetSdkVersion = 31
ndkVersion = "21.4.7075529"
firebaseMessagingVersion = "21.1.0"
}
Expand Down
4 changes: 2 additions & 2 deletions appcenter-post-clone.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
echo "---------NODE VERSION---------"
node -v
echo "---------START YARN INSTALL AND TEST---------"
yarn && yarn test
echo "---------START YARN INSTALL ---------"
yarn
cd ios && pod install && cd ..
6 changes: 3 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ PODS:
- React-Core
- RNReactNativeHapticFeedback (1.13.0):
- React-Core
- RNReanimated (2.8.0):
- RNReanimated (2.13.0):
- DoubleConversion
- FBLazyVector
- FBReactNativeSpec
Expand Down Expand Up @@ -776,7 +776,7 @@ SPEC CHECKSUMS:
RNKeychain: b8e0711b959a19c5b057d1e970d3c83d159b6da5
RNPermissions: 5df468064df661a4c8c017e2791ce90d7695eea5
RNReactNativeHapticFeedback: b83bfb4b537bdd78eb4f6ffe63c6884f7b049ead
RNReanimated: 58b57be69a237fb02ec8099d25171057638cf41a
RNReanimated: 81ae02204392903240908ab05385e178b4f88690
RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2
RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8
RNSecureRandom: 0dcee021fdb3d50cd5cee5db0ebf583c42f5af0e
Expand All @@ -786,6 +786,6 @@ SPEC CHECKSUMS:
SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280

PODFILE CHECKSUM: 02322daf9265889d84e092f44fcf08a099bdb33e
PODFILE CHECKSUM: 69610f78827e0b2665a7b678927f86c9d34a9b1d

COCOAPODS: 1.11.3
4 changes: 2 additions & 2 deletions lib/covidtracer_migration/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CovidTracerMigration_kotlinVersion=1.4.10
CovidTracerMigration_compileSdkVersion=30
CovidTracerMigration_compileSdkVersion=31
CovidTracerMigration_buildToolsVersion=30.0.2
CovidTracerMigration_targetSdkVersion=30
CovidTracerMigration_targetSdkVersion=31
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="nz.govt.health.covidtracer">

</manifest>
</manifest>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"react-native-permissions": "^2.2.0",
"react-native-progress-circle": "^2.1.0",
"react-native-push-notification": "^6.0.0",
"react-native-reanimated": "^2.6.0",
"react-native-reanimated": "^2.10.0",
"react-native-safe-area-context": "^3.1.7",
"react-native-screens": "2.10.1",
"react-native-secure-key-store": "^2.0.9",
Expand Down
1 change: 0 additions & 1 deletion src/features/dashboard/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export type DashboardItem =
| "beenInContact"
| "statsLoading"
| "announcement"
| "diaryPercentage"
| "bluetoothStatus"
| "vaccinePassInfo"
| "reminder"
Expand Down
38 changes: 1 addition & 37 deletions src/features/dashboard/views/DashboardList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { AnnouncementEvents } from "@features/announcement/events";
import { selectAnnouncement } from "@features/announcement/selectors";
import { requestNotificationPermission } from "@features/device/reducer";
import { selectNotificationPermission } from "@features/device/selectors";
import { DiaryPercentage } from "@features/diary/components/DiaryPercentage";
import { BeenInCloseContact } from "@features/enfExposure/components/beenInCloseContact/BeenInCloseContact";
import { useProcessEnfContacts } from "@features/enfExposure/hooks/useProcessEnfContacts";
import { selectENFAlert } from "@features/enfExposure/selectors";
Expand All @@ -20,7 +19,6 @@ import { RequestCallbackScreen } from "@features/exposure/screens";
import { selectMatch } from "@features/exposure/selectors";
import { setHasSeenDashboard } from "@features/onboarding/reducer";
import { ReminderCard } from "@features/reminder/components/ReminderCard";
import { selectHasInAppReminder } from "@features/reminder/selectors";
import { StatsCard } from "@features/stats/components/StatsCard";
import { useStatsSection } from "@features/stats/hooks/useStatsSection";
import { useFocusEffect } from "@react-navigation/native";
Expand All @@ -37,7 +35,6 @@ import { DashboardBluetoothStatus } from "../components/DashboardBlueToothStatus
import { DashboardFooter } from "../components/DashboardFooter";
import { DashboardItemSeparator } from "../components/DashboardItemSeparator";
import { DashboardVaccinePassInfo } from "../components/DashboardVaccinePassInfo";
import { selectHasSeenVaccinePassInfo } from "../selectors";
import { DashboardItem } from "../types";

const SectionFooter = styled(Text)`
Expand Down Expand Up @@ -86,10 +83,6 @@ const _DashboardList = (props: Props) => {

const statsSection = useStatsSection();

const hasInAppReminder = useSelector(selectHasInAppReminder);

const hasSeenVaccinePassInfo = useSelector(selectHasSeenVaccinePassInfo);

const sections = useMemo(() => {
const notificationsCard: DashboardItem | undefined =
notificationPermission === "denied" ||
Expand All @@ -113,27 +106,6 @@ const _DashboardList = (props: Props) => {
]
: [];

const reminders = hasInAppReminder
? [
{
title: t("screens:dashboard:sections:reminder"),
data: ["reminder" as const],
},
]
: [];

const infoItems = !hasSeenVaccinePassInfo
? [
{
title: t("screens:dashboard:sections:whatsNew"),
data:
hasSeenVaccinePassInfo == null
? []
: ["vaccinePassInfo" as const],
},
]
: [];

const items: SectionListData<DashboardItem>[] = [
{
title: doubleExposure
Expand All @@ -152,11 +124,9 @@ const _DashboardList = (props: Props) => {
{
data: notificationsCard == null ? [] : [notificationsCard],
},
...infoItems,
...reminders,
{
title: t("screens:dashboard:sections:status"),
data: ["bluetoothStatus", "diaryPercentage"],
data: ["bluetoothStatus"],
},
statsSection,
];
Expand All @@ -183,8 +153,6 @@ const _DashboardList = (props: Props) => {
doubleExposure,
statsSection,
announcement,
hasSeenVaccinePassInfo,
hasInAppReminder,
]);

useEffect(() => {
Expand Down Expand Up @@ -239,10 +207,6 @@ const _DashboardList = (props: Props) => {
return <Announcement />;
}

if (item === "diaryPercentage") {
return <DiaryPercentage />;
}

if (item === "bluetoothStatus") {
return <DashboardBluetoothStatus />;
}
Expand Down
130 changes: 0 additions & 130 deletions src/features/diary/components/DiaryPercentage.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/features/diary/reducer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ const buildInitialState = (
map[item.id] = item;
return map;
}, {} as { [id: string]: DiaryEntry }),
hasSeenScanTutorial: false,
userIds: [userId],
sessions: {
[sessionId]: {
Expand Down
13 changes: 1 addition & 12 deletions src/features/diary/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
import { ReduxState } from "@domain/types";
import { addFavourite } from "@features/locations/actions/addFavourite";
import { removeFavourite } from "@features/locations/actions/removeFavourite";
import { setSessionType } from "@features/onboarding/reducer";
import { createLogger } from "@logger/createLogger";
import AsyncStorage from "@react-native-async-storage/async-storage";
import {
Expand Down Expand Up @@ -43,12 +42,11 @@ import {
export const persistConfig = {
storage: AsyncStorage,
key: "diary",
whitelist: ["hasSeenScanTutorial"],
whitelist: [],
};

const INITIAL_STATE: DiaryState = {
byId: {},
hasSeenScanTutorial: false,
userIds: [],
sessions: {},
shareDiary: {
Expand Down Expand Up @@ -244,9 +242,6 @@ const diarySlice = createSlice({
name: "diary",
initialState: INITIAL_STATE,
reducers: {
setHasSeenScanTutorial(state) {
state.hasSeenScanTutorial = true;
},
setUserIds(state, { payload }: PayloadAction<string[]>) {
state.userIds = payload;
},
Expand Down Expand Up @@ -447,11 +442,6 @@ const diarySlice = createSlice({
.addCase(deleteEntry.rejected, (_state, action) => {
logError(action.error);
})
.addCase(setSessionType, (state, { payload }) => {
if (payload === "single" || payload === "multi") {
state.hasSeenScanTutorial = true;
}
})
.addCase(setCountedOldDiaries, (state) => {
state.countedOldDiaries = true;
})
Expand Down Expand Up @@ -512,7 +502,6 @@ function reorderSession(state: DiaryState, session: DiaryPaginationSession) {
const { actions, reducer } = diarySlice;

export const {
setHasSeenScanTutorial,
setUserIds,
addLoadedEntries,
setQuerying,
Expand Down
5 changes: 0 additions & 5 deletions src/features/diary/selectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ export const selectDiary = (state: ReduxState) => state.diary;

export const selectById = createSelector(selectDiary, (diary) => diary.byId);

export const selectHasSeenScanTutorial = createSelector(
selectDiary,
(diary) => diary.hasSeenScanTutorial,
);

export const selectSessions = createSelector(
selectDiary,
(diary) => diary.sessions,
Expand Down

0 comments on commit bd0c96a

Please sign in to comment.