Commit cc78e4d
committed
Merge branch 'mobile' into fix/upload
# Conflicts:
# mobile/app/(observer)/(app)/form-questionnaire/[questionId].tsx
# mobile/app/(observer)/(app)/report-issue.tsx
# mobile/assets/locales/en/translations.json
# mobile/contexts/persist-query/PersistQueryContext.provider.tsx
# mobile/hooks/useCamera.tsx
# mobile/package-lock.json
# mobile/package.json152 files changed
Lines changed: 43795 additions & 35577 deletions
File tree
- mobile
- .tamagui
- app
- (app)
- (drawer)/(tabs)
- (observation)
- form-questionnaire
- (citizen)
- (main)
- (drawer)
- (tabs)
- questionnaire
- (observer)
- (app)
- (drawer)
- (tabs)
- (observation)
- form-details
- (quick-report)
- report-details
- form-questionnaire
- assets
- icons
- questionCard
- tabs
- images
- locales
- bg
- en
- pl
- ro
- sr
- common
- models
- utils
- components
- FormInputs
- Inputs
- SkeletonLoaders
- WizardFormInputs
- contexts
- app-mode
- auth
- citizen-user
- notification
- persist-query
- user
- helpers
- hooks
- services
- api
- interfaces
- mutations
- feedback
- queries
- theme
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
19 | | - | |
| 21 | + | |
20 | 22 | | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
24 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
25 | 30 | | |
26 | 31 | | |
27 | 32 | | |
28 | 33 | | |
29 | | - | |
| 34 | + | |
30 | 35 | | |
31 | 36 | | |
32 | 37 | | |
| |||
41 | 46 | | |
42 | 47 | | |
43 | 48 | | |
44 | | - | |
45 | | - | |
46 | | - | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
47 | 52 | | |
48 | 53 | | |
49 | 54 | | |
| |||
74 | 79 | | |
75 | 80 | | |
76 | 81 | | |
77 | | - | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
78 | 85 | | |
79 | 86 | | |
80 | 87 | | |
81 | 88 | | |
82 | 89 | | |
83 | 90 | | |
84 | | - | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
85 | 94 | | |
86 | 95 | | |
87 | 96 | | |
| |||
105 | 114 | | |
106 | 115 | | |
107 | 116 | | |
108 | | - | |
| 117 | + | |
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments