diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 3452bb2c..f7ec920c 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -245,6 +245,17 @@ class APIController extends Controller
 
         $otp_mode = $_ENV['OTP_MODE'];
 
+        // check for hardcoded phone number for app store testing
+        if ($phone_number == '639991112233')
+        {
+            $code = '123456';
+            $this->session->setConfirmCode($code)
+                ->setPhoneNumber($phone_number);
+            $em->flush();
+
+            return $res->getReturnResponse();
+        }
+        
         // check if otp_mode is test
         if ($otp_mode == 'test')
         {
@@ -1966,10 +1977,10 @@ class APIController extends Controller
             $sap_batt = $warranty->getSAPBattery()->getID();
         }
         if (!(is_null($warranty->getDateClaim()))) {
-            $claim_date = $warranty->getDateClaim()->format("d M Y g:i A");
+            $claim_date = $warranty->getDateClaim()->format("d M Y");
         }
         if (!(is_null($warranty->getDateExpire()))) {
-            $expiry_date = $warranty->getDateExpire()->format("d M Y g:i A");
+            $expiry_date = $warranty->getDateExpire()->format("d M Y");
         }
 
         $warr[] = [
@@ -1985,7 +1996,7 @@ class APIController extends Controller
             'sap_battery' => $sap_batt,
             'status' => $warranty->getStatus(),
             'date_create' => $warranty->getDateCreate()->format("d M Y g:i A"),
-            'date_purchase' => $warranty->getDatePurchase()->format("d M Y g:i A"),
+            'date_purchase' => $warranty->getDatePurchase()->format("d M Y"),
             'date_expire' => $expiry_date,
             'date_claim' => $claim_date,
             'claim_from' => $warranty->getClaimedFrom(),
diff --git a/src/Controller/ReviewController.php b/src/Controller/ReviewController.php
index b5acae33..7d6d6e7d 100644
--- a/src/Controller/ReviewController.php
+++ b/src/Controller/ReviewController.php
@@ -87,7 +87,7 @@ class ReviewController extends Controller
             $row['partner'] = $orow->getPartner()->getName();
             $row['rating'] = $orow->getRating();
             $row['message'] = $orow->getMessage();
-            $row['mobile_session'] = $orow->getMobileSession()->getID();
+            $row['mobile_number'] = $orow->getMobileSession()->getPhoneNumber();
 
             // add row metadata
             $row['meta'] = [
diff --git a/templates/review/form.html.twig b/templates/review/form.html.twig
index 5b173816..a497a7f7 100644
--- a/templates/review/form.html.twig
+++ b/templates/review/form.html.twig
@@ -54,11 +54,11 @@
                         </div>
                         <div class="form-group m-form__group row no-border">
                             <div class="col-lg-6">
-                                <label for="mobile_session" data-field="mobile_session">
-                                   Mobile Session
+                                <label for="mobile_number" data-field="mobile_number">
+                                   Mobile Number
                                 </label>
-                                <input type="text" name="mobile_session" class="form-control m-input" value="{{ obj.getMobileSession.getID|default('') }}" disabled>
-                                <div class="form-control-feedback hide" data-field="mobile_session"></div>
+                                <input type="text" name="mobile_number" class="form-control m-input" value="{{ obj.getMobileSession.getPhoneNumber|default('') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="mobile_number"></div>
                             </div>
                             <div class="col-lg-6">
                                 <label for="date_create" data-field="date_create">
diff --git a/templates/review/list.html.twig b/templates/review/list.html.twig
index a7fecacc..eb2a76d6 100644
--- a/templates/review/list.html.twig
+++ b/templates/review/list.html.twig
@@ -84,8 +84,8 @@
                 title: 'Message'
             },
             {
-                field: 'mobile_session',
-                title: 'Mobile'
+                field: 'mobile_number',
+                title: 'Mobile Number'
             },
             {
                 field: 'Actions',