Merge branch 'last-fix' into 'staging'

Fix bugs

See merge request !85

.gitlab-ci.yml

@@ -85,7 +85,7 @@ android:
     - yarn install
     - export ANDROID_SDK_ROOT=/usr/lib/android-sdk
     - cd android
-    - chmod +x gradlew && ./gradlew clean && ./gradlew assembleRelease
+    - chmod +x gradlew && ./gradlew assembleRelease
     - cd .. && cp android/app/build/outputs/apk/release/app-release.apk $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME.apk
   artifacts:
     expire_in: 1 week

src/scenes/payment/PaymentWebView/index.tsx

@@ -13,13 +13,17 @@ const PaymentWebView: FC = () => {
   const navigation = useNavigation();
   const route = useRoute();
   const { url } = route.params as { url: string };
-  const { user } = useContext(UserContext);
+  const { user, setUser } = useContext(UserContext);
 
   const postPay = async (state: any) => {
     if (state.url.startsWith(`${API_BASE_URL}/payment/midtrans-redirection`)) {
-      await updateCartApi(user.cart_id, {
+      const response = await updateCartApi(user.cart_id, {
         transaction_status: TransactionStatus.SUCCESS,
       });
+      setUser({
+        ...user,
+        nutritionist: response.data?.nutritionist || null,
+      });
       navigation.navigate(ROUTES.paymentResult);
     }
   };

src/services/auth/models.ts

@@ -27,7 +27,11 @@ export interface User {
   deadline: string | null;
 }
 
-export interface AuthUserResponse extends User {
+export interface AuthUserResponse {
+  id: number | null;
+  email: string;
+  name: string;
+  role: UserRole | null;
   transaction_status: TransactionStatus | null;
   is_finished_onboarding: boolean;
   cart_id: number | null;

src/services/nutritionists/models.ts

@@ -8,4 +8,5 @@ export interface Nutritionist {
   another_practice_place: string;
   languages: string;
   profile_picture?: string;
+  phone_number: string;
 }