Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
404 commits
Select commit Hold shift + click to select a range
8e2d398
- Implemented PaymentStatusMessage component for displaying order status
Mvjtb Apr 18, 2025
c4c5661
Created option for upload profile image
jsayago77 Apr 19, 2025
1b5efbf
Using menu as screen
jsayago77 Apr 19, 2025
f702658
Creation of new user address and eliminating address
IglesiasMiguel Apr 19, 2025
bddfbf7
Merge branch 'feature/APP-M-8/Profile' of https://github.com/PharmaTe…
IglesiasMiguel Apr 19, 2025
26f0856
Updated order id
jsayago77 Apr 19, 2025
c192215
created getOrder in user service and updated orderDetail
jsayago77 Apr 19, 2025
d860e80
Resolved errors
jsayago77 Apr 19, 2025
0e41c9e
Feature/app m 8/profile (#45)
Mvjtb Apr 19, 2025
f4e9c7c
Merge branch 'dev' into feature/APP-M-9/Checkout
Mvjtb Apr 19, 2025
5a9edb3
Changes to avoid conflicts
IglesiasMiguel Apr 19, 2025
50a8e68
-Merge branch 'dev' into feature/APP-M-9/Checkout
Mvjtb Apr 19, 2025
33d9869
Merge branch 'dev' into feature/APP-D-1/Delivery
IglesiasMiguel Apr 19, 2025
1d47097
Updating to new sdk and fixing avatar
IglesiasMiguel Apr 19, 2025
83f2b8a
Added notifications screen
jsayago77 Apr 19, 2025
4865ea4
Changed Avatar fontSize
jsayago77 Apr 19, 2025
9789c0d
Refactor branch selection and modal integration in CheckoutScreen; up…
Mvjtb Apr 19, 2025
d69e856
Added categories service
jsayago77 Apr 20, 2025
3a818aa
Handle upload image to cloudinary
jsayago77 Apr 20, 2025
5a9ca68
Refactor CheckoutScreen to remove unused userName state and related e…
Mvjtb Apr 20, 2025
ab9310a
Added images
jsayago77 Apr 20, 2025
088af54
Changes to locationSelector and refactoring some services to use sdk …
IglesiasMiguel Apr 20, 2025
9647d66
Adapting app to show maps in iOS
IglesiasMiguel Apr 20, 2025
3f81f86
Fixing some inconsistencies
IglesiasMiguel Apr 21, 2025
4c39c38
Added search products screen and updated searchInput component
jsayago77 Apr 21, 2025
0d811ee
Using product id and presentation id for home screen products and pro…
jsayago77 Apr 21, 2025
bf8cc26
Updated product detail to use sdk types
jsayago77 Apr 21, 2025
475e1de
Merge branch 'feature/APP-M-9/Checkout' of https://github.com/PharmaT…
jsayago77 Apr 21, 2025
b9a6397
Integrating delivery sdk in assigned orders
IglesiasMiguel Apr 21, 2025
cbde2e1
Integrating delivery details
IglesiasMiguel Apr 22, 2025
a8e33d3
Updated searchProduct page, added filterOptions
jsayago77 Apr 22, 2025
7274876
Delivery history list and details
IglesiasMiguel Apr 22, 2025
cb16e9e
Adapting user.ts to latest sdk and implementing profile picture to cu…
IglesiasMiguel Apr 22, 2025
cf55e13
Adapting to new key and refactoring delivery maps
IglesiasMiguel Apr 22, 2025
bb627f8
Checkout navigation and design fixes
IglesiasMiguel Apr 22, 2025
623e771
feature/APP-M-9/Checkout (#47)
IglesiasMiguel Apr 22, 2025
0c03123
Merge branch 'dev' into feature/APP-M-13/Filters
jsayago77 Apr 23, 2025
fccd417
Merge branch 'dev' into feature/APP-D-1/Delivery
IglesiasMiguel Apr 23, 2025
13e2b24
Merge branch 'dev' into feature/APP-M-11/Categories
jsayago77 Apr 23, 2025
f42ba2d
Added categories screen
jsayago77 Apr 23, 2025
4710186
Moving delivery flow access to menu screen and adpting to latest sdk
IglesiasMiguel Apr 23, 2025
c9572e7
Added title
jsayago77 Apr 23, 2025
6cba3aa
Small fixes for delivery
IglesiasMiguel Apr 23, 2025
184170f
Fixes to delivery flow so it works with a context
IglesiasMiguel Apr 23, 2025
6475dc8
Feature/app d 1/delivery (#48)
IglesiasMiguel Apr 23, 2025
a50c29d
Merge branch 'dev' into feature/APP-M-11/Categories
IglesiasMiguel Apr 23, 2025
6d1a0b0
Added others selectors and added products
jsayago77 Apr 23, 2025
623c831
APP M 11/Categories (#49)
IglesiasMiguel Apr 23, 2025
0245539
Merge branch 'dev' into feature/APP-M-13/Filters
jsayago77 Apr 23, 2025
f84d9a9
Changed checkbox and updated in searchProduct
jsayago77 Apr 23, 2025
d5da1ee
Resolved errors
jsayago77 Apr 23, 2025
1d83511
Merge branch 'dev' into fix/APP-M-8/Profile
jsayago77 Apr 23, 2025
0895610
Added truncate order id
jsayago77 Apr 23, 2025
711b773
APP M 13/Filters (#51)
IglesiasMiguel Apr 23, 2025
e38bb2b
Merge branch 'dev' into fix/APP-M-8/Profile
IglesiasMiguel Apr 23, 2025
5f152ed
Fix/APP M 8/Profile (#52)
IglesiasMiguel Apr 23, 2025
12a516c
Ya los metodos de pago estan conectados con el SDK y no estan harcode…
Mvjtb Apr 26, 2025
20f3449
Add validation popup for incomplete checkout fields
Mvjtb Apr 26, 2025
e90d11c
Update LocationSelector to include branch address in options and sele…
Mvjtb Apr 26, 2025
7c88f1c
Integrate Dropdown component for bank selection in PaymentInfoForm an…
Mvjtb Apr 26, 2025
f1d9ca7
Add checkout slice to manage checkout state and actions, including co…
Mvjtb Apr 26, 2025
bce8848
Enhance coupon functionality by integrating last applied coupon state…
Mvjtb Apr 26, 2025
32ee278
Changes to eas.json and adding it in gitignore
IglesiasMiguel Apr 26, 2025
f8b6f4c
Add bank selection validation and improve input error handling in Pay…
Mvjtb Apr 26, 2025
7d2f43d
Fixing the way maps use the key
IglesiasMiguel Apr 26, 2025
bba4f41
Back button fix
IglesiasMiguel Apr 26, 2025
a903a39
Adding activity indicators to some screens
IglesiasMiguel Apr 26, 2025
87cb43a
Changing where app starts for delivery users
IglesiasMiguel Apr 26, 2025
a5e1c3d
Delivery fixes and fixing alerts I erased in login by mistake
IglesiasMiguel Apr 27, 2025
36d347a
Enhanced alerts
jsayago77 Apr 28, 2025
bac7c38
Updated stock to Disponible in productdetal
jsayago77 Apr 28, 2025
062db96
Added show map button and updated dropdown
jsayago77 Apr 28, 2025
7b2bbd2
Static product name in dropdown
jsayago77 Apr 28, 2025
7611cd3
Added OrderBadge component for order status
jsayago77 Apr 28, 2025
0d3dfe4
see build message
jsayago77 Apr 29, 2025
c926eb1
Updated profile picture
jsayago77 Apr 29, 2025
e823c98
change
jsayago77 Apr 29, 2025
87628be
update avatar in screens
jsayago77 Apr 29, 2025
76d1d63
Merge branch 'dev' into feature/APP-M-10/Notifications
jsayago77 Apr 29, 2025
0cdd4b8
Updated stock in productDetail by state
jsayago77 Apr 29, 2025
cd04ff5
Add user validation check and email verification modal in CheckoutScreen
Mvjtb Apr 29, 2025
2c43fdf
Update @pharmatech/sdk to version 0.4.11, enhance PaymentInfoForm wit…
Mvjtb Apr 29, 2025
47a6f25
Fetch bank options from PharmaTech SDK and update Dropdown options in…
Mvjtb Apr 29, 2025
f7494b7
Enhance NotificationsScreen layout
Mvjtb Apr 30, 2025
d2195c0
Refactor NotificationsScreen to fetch notifications from the server a…
Mvjtb Apr 30, 2025
d010e89
@pharmatech/sdk dependency version to 0.4.9 in package.json and packa…
Mvjtb Apr 30, 2025
ca02993
Fixing filter styles
IglesiasMiguel Apr 30, 2025
3d6bf66
Add notification icons and improve message translation in Notificatio…
Mvjtb Apr 30, 2025
78ad82b
Add notifications context and service for managing app notifications
Mvjtb Apr 30, 2025
277d785
Finishing search filters
IglesiasMiguel Apr 30, 2025
813d13e
Adapting project to latest sdk release with the elimination of zip code
IglesiasMiguel Apr 30, 2025
fe84d86
Refactor Notifications handling and improve TopBar layout
Mvjtb Apr 30, 2025
185480b
improve notification state handling in NotificationsProvider
Mvjtb Apr 30, 2025
04ed32e
Adding order products to delivery flow
IglesiasMiguel May 1, 2025
2952e0f
Fix/app f g 2/general fixes (#54)
jsayago77 May 1, 2025
9edae88
Merge branch 'dev' into fix/APP-F-DP-1/ProductDetail-fixes
jsayago77 May 1, 2025
104666e
Merge branch 'dev' into fix/APP-F-PERFIL-1/Profile-fixes
jsayago77 May 1, 2025
6a667d1
Handle no image update
jsayago77 May 1, 2025
71087b1
updated alert position
jsayago77 May 1, 2025
b787f47
Merge branch 'dev' into fix/APP-F-PEDIDOS-1/Orders-fixes
jsayago77 May 1, 2025
38695cd
Merge branch 'dev' into fix/APP-M-9/Checkout-fixes
Mvjtb May 1, 2025
1ae0cc9
Merge branch 'dev' into feature/APP-M-10/Notifications
Mvjtb May 1, 2025
0be0b1f
Update date formatting in NotificationsScreen to use 'Hace' instead o…
Mvjtb May 1, 2025
8b65094
Active Orders
Mvjtb May 2, 2025
5bce9bc
Merge branch 'dev' into feature/APP-M-12-active-orders
Mvjtb May 2, 2025
d1e6627
Enhance ActiveOrdersScreen: Add status labels and colors for order st…
Mvjtb May 3, 2025
708449d
Including nativewind-env in tsconfig
IglesiasMiguel May 4, 2025
aef2dfb
Merge branch 'dev' into fix/APP-F-PERFIL-1/Profile-fixes
IglesiasMiguel May 4, 2025
4c59b3b
fix/app f perfil 1/Profile fixes (#55)
IglesiasMiguel May 4, 2025
915df9b
Merge branch 'fix/APP-F-DP-1/ProductDetail-fixes' of https://github.c…
IglesiasMiguel May 4, 2025
e32d92a
Merge branch 'dev' into fix/APP-M-9/Checkout-fixes
IglesiasMiguel May 4, 2025
37162f8
Fix/app m 9/checkout fixes (#53)
IglesiasMiguel May 4, 2025
ff87a2d
Merge branch 'feature/APP-M-10/Notifications' of https://github.com/P…
IglesiasMiguel May 4, 2025
4838abe
Minor style fixes
IglesiasMiguel May 4, 2025
e3ba67d
Feature/app m 10/notifications (#58)
IglesiasMiguel May 4, 2025
94594be
Merge branch 'feature/APP-M-12-active-orders' of https://github.com/P…
IglesiasMiguel May 4, 2025
4c4119a
Minor style fix
IglesiasMiguel May 4, 2025
b638417
Creating branches flow
IglesiasMiguel May 5, 2025
bb3ce68
Style fixes to branch details
IglesiasMiguel May 5, 2025
a5ece9e
Fixing quantity and modal in branches
IglesiasMiguel May 5, 2025
e8f1508
feature/APP-M-13/BranchesTab (#60)
IglesiasMiguel May 5, 2025
617cf52
Adding recommendations to homescreen
IglesiasMiguel May 6, 2025
991988c
Added orderTracking screen
jsayago77 May 6, 2025
253c096
Implement websocket
jsayago77 May 6, 2025
7abe595
Make map buttom dependent of state and inventor, changed title margin
jsayago77 May 6, 2025
35e32d5
Merge branch 'dev' into fix/APP-F-DP-1/ProductDetail-fixes
jsayago77 May 6, 2025
179e3ca
Merge branch 'dev' into fix/APP-F-PEDIDOS-1/Orders-fixes
jsayago77 May 6, 2025
63a64b5
Handle reorder in OrderDetail screen
jsayago77 May 6, 2025
2fea19b
Added reorder to orders screen
jsayago77 May 6, 2025
35e8aaf
Merge branch 'fix/APP-F-DP-1/ProductDetail-fixes' of https://github.c…
IglesiasMiguel May 6, 2025
d1553d2
Fixing product quantity in product details
IglesiasMiguel May 6, 2025
748853d
Stylizing a bit product details
IglesiasMiguel May 6, 2025
01598e6
Small fix in commons.ts
IglesiasMiguel May 6, 2025
9289256
Fix/app f pedidos 1/orders fixes (#57)
IglesiasMiguel May 6, 2025
bc70d52
Merge branch 'dev' into fix/Recommended-products
IglesiasMiguel May 6, 2025
89f7932
fix/Recommended-products (#61)
IglesiasMiguel May 6, 2025
b6a734d
Merge branch 'dev' into fix/APP-F-DP-1/ProductDetail-fixes
IglesiasMiguel May 6, 2025
4e8b516
Fix/app f dp 1/product detail fixes (#56)
IglesiasMiguel May 6, 2025
431030f
Eliminating IVA
IglesiasMiguel May 6, 2025
4fefa17
Eliminating hardcoded discounts
IglesiasMiguel May 6, 2025
c4939f8
Fix/iva discounts (#62)
IglesiasMiguel May 6, 2025
7ab067a
Fixing commons.ts and the way it worked in order screen
IglesiasMiguel May 6, 2025
ec424a2
Using websocket
jsayago77 May 7, 2025
100e72f
Merge branch 'dev' into feature/APP-M-12-active-orders
jsayago77 May 7, 2025
857f849
Feature/app m 12 active orders (#59)
IglesiasMiguel May 7, 2025
8bfeee7
Fixes del sprint 5 para el checkout
Mvjtb May 14, 2025
e34f086
Fixing cloudinary
IglesiasMiguel May 16, 2025
88c0e1e
babel.config fix
IglesiasMiguel May 16, 2025
443d8a1
Add order status handling and websocket integration for real-time upd…
Mvjtb May 16, 2025
40e7bd5
Refactor useOrderSocket to enhance authorization handling and improve…
Mvjtb May 16, 2025
6e0bb77
Refactor useOrderSocket to improve code clarity and enhance authoriza…
Mvjtb May 16, 2025
559955b
Update @pharmatech/sdk to version 0.4.18 and add paymentMethod to Che…
Mvjtb May 17, 2025
cc8fdfb
Update CheckoutScreen to integrate paymentMethod with SDK and refacto…
Mvjtb May 17, 2025
2ca4c65
Refactor useOrderSocket to improve token handling, add event logging,…
Mvjtb May 17, 2025
06f9ba1
Remove unnecessary comment in useOrderSocket and add a blank line in …
Mvjtb May 17, 2025
09dc66e
Refactor useOrderSocket to improve readability and memoization of ord…
Mvjtb May 17, 2025
b96f2f6
Creating new tabBar and doing fixes
IglesiasMiguel May 17, 2025
b17cd0c
CheckoutScreen to use updated CreateOrder type and remove unused paym…
Mvjtb May 17, 2025
3ada79b
Refactor useOrderSocket to enhance order handling with initial order …
Mvjtb May 17, 2025
9942652
updated websocket
jsayago77 May 18, 2025
c339ef1
Adapting maps so they appear in APKs
IglesiasMiguel May 18, 2025
3288191
Untracking eas.json
IglesiasMiguel May 18, 2025
259c705
fix/Cloudinary_GoogleMaps (#63)
IglesiasMiguel May 18, 2025
0fbf524
Merge branch 'dev' into fix/General-fixes
IglesiasMiguel May 18, 2025
09cc86b
Change to "Mi Perfil"
jsayago77 May 18, 2025
58f9a7d
Changes in directions fields and redirection
jsayago77 May 18, 2025
2d1347e
Fixing some errors that appeared in delivery details
IglesiasMiguel May 18, 2025
b184415
Change alert in direction change
jsayago77 May 18, 2025
8632ed5
Adapting proper estimated time to order delivery cards
IglesiasMiguel May 19, 2025
b99ed5e
Added category detail
jsayago77 May 19, 2025
668276a
Add OfferCard component with props and styles
Mvjtb May 20, 2025
67db2f2
Refactor OfferCard component and enhance OffersScreen with loading st…
Mvjtb May 21, 2025
3ee7a6e
Refactor NotificationsScreen to improve notification handling and UI …
Mvjtb May 21, 2025
bb94a48
Refactor NotificationsScreen to use SVG icons instead of images; impr…
Mvjtb May 21, 2025
59a5e11
Update @pharmatech/sdk to version 0.4.19; refactor CheckoutScreen to …
Mvjtb May 21, 2025
b301ea5
Refactor PaymentInformationService.findAll to return response directl…
Mvjtb May 21, 2025
1e830ee
Fixes in Profile and Directions (#65)
IglesiasMiguel May 21, 2025
ac6785d
Merge branch 'dev' into fix/categories
IglesiasMiguel May 21, 2025
5c94d53
Fix in Categories (#66)
IglesiasMiguel May 21, 2025
1f5ddd1
Merge branch 'dev' into feature/app-M-14-Offers
Mvjtb May 21, 2025
b14d0b5
Fix PaymentInformationService to return response directly instead of …
Mvjtb May 21, 2025
f390008
Refactor PaymentInformationService to return response directly withou…
Mvjtb May 21, 2025
c2ec3cd
Merge branch 'dev' into fix/sprint-5-checkout
Mvjtb May 21, 2025
a2db735
Updating to latest sdk version
IglesiasMiguel May 21, 2025
008db41
Refactor product and offer handling to utilize promo discounts and up…
Mvjtb May 21, 2025
c832eb5
Refactor
Mvjtb May 21, 2025
5cba771
Add a type guard hasPromo to safely check for the promo
Mvjtb May 21, 2025
51810d3
Merge branch 'dev' into fix/General-fixes
IglesiasMiguel May 23, 2025
7a8385c
Enhance cart functionality to support discounts
Mvjtb May 23, 2025
51d7aad
Merge branch 'dev' into fix/APP-FIXES-NOTIFICACIONES
Mvjtb May 23, 2025
15d158c
Implement SSE for real-time notifications and remove polling mechanism
Mvjtb May 23, 2025
df00381
Add react-native-sse dependency for server-sent events support
Mvjtb May 23, 2025
93f8dfa
PaymentConfirmation interface to include the orderId
Mvjtb May 24, 2025
9e3a42a
Add payment method handling in CheckoutScreen
Mvjtb May 24, 2025
82411e0
Adding expanded view of maps in delivery flow
IglesiasMiguel May 24, 2025
f1ed70a
Add InProgressOrder screen and update Checkout flow for order tracking
Mvjtb May 24, 2025
773121d
Refactor Checkout and InProgressOrder screens to streamline order han…
Mvjtb May 24, 2025
8249357
Update InProgressOrderScreen to skip step 2 for CARD and CASH payment…
Mvjtb May 24, 2025
057ab04
Refactor InProgressOrderScreen, integrate order updates via WebSocket
Mvjtb May 24, 2025
093183d
Remove unused order status utility file
Mvjtb May 24, 2025
a8cbb49
Add validation popup and refactor InProgressOrderScreen for payment f…
Mvjtb May 24, 2025
ddfdef4
Refactor WebSocket
Mvjtb May 25, 2025
7865a77
Merge branch 'dev' into fix/active-orders
jsayago77 May 25, 2025
96c0b3f
Update @pharmatech/sdk to version 0.4.19 and adjust styles in OrderTr…
jsayago77 May 25, 2025
44e2cc4
Integrating delivery status websocket
IglesiasMiguel May 25, 2025
b130695
Integrating delivery real time location websocket
IglesiasMiguel May 26, 2025
a94dcf6
Implement WebSocket InProgressOrderScreen for real-time order updates
Mvjtb May 26, 2025
3df3a68
Fixing the way discounts worked in cartlist coming from productDetails
IglesiasMiguel May 27, 2025
bccfa05
Fixing prices to work with cents
IglesiasMiguel May 27, 2025
4abbe91
Fixing some services according to the solution implemented in checkou…
IglesiasMiguel May 27, 2025
f52a55f
Add VerticalStepper component and integrate it into OrderTrackingScreen
jsayago77 May 28, 2025
7edc5f7
Refactor InProgressOrderScreen to utilize centralized WebSocket manag…
Mvjtb May 28, 2025
dcfacba
Changing the socket structure
Mvjtb May 29, 2025
dc0f7fa
Add pull-to-refresh functionality
Mvjtb May 29, 2025
bd39dca
Refactor notifications handling in TopBar and HomeScreen components t…
Mvjtb May 29, 2025
15e102b
Add loading indicator for payment processing in InProgressOrderScreen
Mvjtb May 29, 2025
74740a6
Update @pharmatech/sdk to version 0.4.21 and enhance OrderTrackingScr…
jsayago77 May 29, 2025
012d171
Adapting to latest sdk
IglesiasMiguel May 29, 2025
4631cd3
Merge branch 'fix/sprint-5-checkout' of https://github.com/PharmaTech…
IglesiasMiguel May 29, 2025
a2435fb
Add refresh functionality to ActiveOrdersScreen and update OrderTrack…
jsayago77 May 29, 2025
4b81ef0
Fix/sprint 5 checkout (#69)
IglesiasMiguel May 29, 2025
d2b6e8a
Merge branch 'dev' into feature/app-M-14-Offers
IglesiasMiguel May 29, 2025
068e798
Update delivery status check in OrderTrackingScreen from ASSIGNED to …
jsayago77 May 29, 2025
b7a542f
Merge branch 'dev' into fix/active-orders
jsayago77 May 29, 2025
d68e0bb
Refactor delivery status check in OrderTrackingScreen to simplify con…
jsayago77 May 29, 2025
b21c648
Fixing more prices to work with cents
IglesiasMiguel May 29, 2025
6f8df86
Feature/app m 14 offers (#67)
IglesiasMiguel May 29, 2025
3dfc79b
Merge branch 'dev' into fix/General-fixes
IglesiasMiguel May 29, 2025
46f1d2e
Merge branch 'dev' into fix/General-fixes
IglesiasMiguel May 29, 2025
2cfdd20
Update OrderBadge labels and enhance OrderDetailScreen with subtotal …
jsayago77 May 29, 2025
27f9f69
Fixes for products with no stock
IglesiasMiguel May 29, 2025
45c968c
Fix/general fixes (#64)
IglesiasMiguel May 30, 2025
5bf31d4
Merge branch 'dev' into fix/active-orders
jsayago77 May 30, 2025
aa80237
Merge branch 'dev' into fix/APP-FIXES-NOTIFICACIONES
IglesiasMiguel May 30, 2025
4448be3
Refactor notification service to handle token retrieval internally
jsayago77 May 30, 2025
0f074f1
Remove token retrieval from NotificationsScreen to streamline notific…
jsayago77 May 30, 2025
af21e0a
Fix/app fixes notificaciones (#68)
IglesiasMiguel May 30, 2025
973998e
Calculate discount based on price and quantity in OrderDetailScreen
jsayago77 May 30, 2025
3b22ce9
Merge branch 'dev' into fix/active-orders
jsayago77 May 30, 2025
d6a1566
Update OrderDetailScreen to display full product details and correct …
jsayago77 May 30, 2025
d716735
Height styles
IglesiasMiguel May 30, 2025
63648cd
Merge branch 'fix/active-orders' of https://github.com/PharmaTechVe/a…
IglesiasMiguel May 30, 2025
ed1b775
Fix translation for 'ready_for_pickup' status and enhance OrderTracki…
jsayago77 May 30, 2025
9f602c2
Merge branch 'fix/active-orders' of https://github.com/PharmaTechVe/a…
jsayago77 May 30, 2025
57ed903
Showing delivery map to client
IglesiasMiguel May 30, 2025
6f2bc67
Adding more cent prices and eliminating stars rating
IglesiasMiguel May 30, 2025
8cbdb10
Using icons for delivery maps
IglesiasMiguel May 30, 2025
b59ef2f
Fix active orders (#70)
IglesiasMiguel May 30, 2025
3089ae4
Upgrade vesion 1.0.0
andres15alvarez May 30, 2025
a01b7af
Merge branch 'main' into dev
andres15alvarez May 30, 2025
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,6 @@ docs/pages/versions/*/react-native/*.diff
!crsqlite.xcframework

# iOS
**/ios/.xcode.env.local
**/ios/.xcode.env.local

eas.json
35 changes: 27 additions & 8 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,36 @@
"scheme": "pharmatech",
"version": "0.2.0",
"orientation": "portrait",
"icon": "./src/assets/images/icon.png",
"icon": "./src/assets/images/PharmaTech-icon.png",
"userInterfaceStyle": "light",
"newArchEnabled": true,
"splash": {
"image": "src/assets/images/splash-icon.png",
"image": "src/assets/images/PharmaTech-icon.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
"backgroundColor": "#1C2143"
},
"ios": {
"config": {
"googleMapsApiKey": "process.env.GOOGLE_MAPS_API_KEY"
},
"supportsTablet": true
},
"android": {
"permissions": ["ACCESS_FINE_LOCATION", "ACCESS_COARSE_LOCATION"],
"adaptiveIcon": {
"foregroundImage": "./src/assets/images/icon.png",
"backgroundColor": "#ffffff"
"foregroundImage": "./src/assets/images/PharmaTech-icon.png",
"backgroundColor": "#1C2143"
},
"package": "com.pharmatech.pharmatech"
"package": "com.pharmatech.pharmatech",
"config": {
"googleMaps": {
"apiKey": "AIzaSyAoesWK-4-JCtlF5TkHPLn3iInC8tiGNg4"
}
}
},
"web": {
"bundler": "metro",
"favicon": "./src/assets/images/icon.png"
"favicon": "./src/assets/images/PharmaTech-icon.png"
},
"extra": {
"router": {
Expand All @@ -42,6 +51,16 @@
"updates": {
"url": "https://u.expo.dev/3b8bad5d-7426-4881-aebd-cfb1ccf0795d"
},
"plugins": ["expo-font", "expo-router", "expo-secure-store"]
"plugins": [
"expo-font",
"expo-router",
"expo-secure-store",
[
"expo-image-picker",
{
"photosPermission": "Allow $(PRODUCT_NAME) to access your camera."
}
]
]
}
}
5 changes: 5 additions & 0 deletions declarations.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ declare module '*.png' {
const value: number;
export default value;
}

declare module '*.jpg' {
const value: string;
export default value;
}
17 changes: 0 additions & 17 deletions eas.json

This file was deleted.

Loading
Loading