|  haroon amjad | b27e3268b1 | Merge branch 'master' into haroon_dev # Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart | 3 weeks ago | 
				
					
						|  aamir-csol | 24362f67cb | family screen & widgets | 3 weeks ago | 
				
					
						|  aamir-csol | aaa8222b1a | Merge branch 'master' into dev_aamir # Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart | 4 weeks ago | 
				
					
						|  aamir-csol | d918b6e464 | family screen & widgets | 4 weeks ago | 
				
					
						|  haroon amjad | 2de02102c2 | profile settings update | 1 month ago | 
				
					
						|  haroon amjad | 1af2db5c09 | patient profile settings page integration implementation contd. | 1 month ago | 
				
					
						|  Haroon Amjad | 62e82a7a31 | Empty data state implementation contd. | 1 month ago | 
				
					
						|  haroon amjad | 6048b3b5f1 | Advance payment module implementation contd. | 1 month ago | 
				
					
						|  Haroon Amjad | a4854bbe4a | Habib Wallet updates | 1 month ago | 
				
					
						|  haroon amjad | 3b5d2d27a4 | Updates | 1 month ago | 
				
					
						|  Sikander Saleem | 57827549b8 | language switch added in drawer, and ui improvements | 1 month ago | 
				
					
						|  Sikander Saleem | c00e69ef0c | profile wallet linked with view model. | 1 month ago | 
				
					
						|  Sikander Saleem | c83754fc4a | user profile welcome widget improvement. | 1 month ago | 
				
					
						|  Sikander Saleem | 8f0e910e4f | profile and settings ui completed. | 1 month ago | 
				
					
						|  Sikander Saleem | e17d207ce5 | swiper carousal view added in profile settings | 2 months ago |