diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransConstant.h b/MidtransCoreKit/MidtransCoreKit/MidtransConstant.h
index 1456abca7..b72cd9569 100644
--- a/MidtransCoreKit/MidtransCoreKit/MidtransConstant.h
+++ b/MidtransCoreKit/MidtransCoreKit/MidtransConstant.h
@@ -10,7 +10,7 @@
  *  error domain
  */
 
-static NSString * const MIDTRANS_SDK_CURRENT_VERSION = @"1.12.0";
+static NSString * const MIDTRANS_SDK_CURRENT_VERSION = @"1.12.1";
 static NSString * const MIDTRANS_CUSTOMFIELD_1 = @"custom_field1";
 static NSString * const MIDTRANS_CUSTOMFIELD_2 = @"custom_field2";
 static NSString * const MIDTRANS_CUSTOMFIELD_3 = @"custom_field3";
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.h b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.h
index 7fd1a8b0d..79d5cfe7c 100644
--- a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.h
+++ b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.h
@@ -42,5 +42,18 @@ static NSString * _Nonnull const kMTMaskedCreditCardExpiresAt = @"expires_at";
 - (instancetype _Nonnull)initWithDictionary:(NSDictionary *_Nonnull)dictionary;
 
 - (instancetype _Nonnull)initWithData:(NSDictionary *_Nonnull)data;
-
+- (instancetype _Nonnull)initWithSavedTokenId:(NSString * _Nonnull)savedTokenId
+                         maskedNumber:(NSString * _Nonnull)maskedNumber
+                            tokenType:(NSString * _Nullable)tokenType
+                            expiresAt:(NSString *_Nullable)expiresAt;
+
+/*
+ self.savedTokenId = dictionary[kMTMaskedCreditCardIdentifier];
+ self.maskedNumber = dictionary[kMTMaskedCreditCardCardhash];
+ self.type = dictionary[kMTMaskedCreditCardType]?dictionary[kMTMaskedCreditCardType]:@"";
+ self.tokenType = dictionary[kMTMaskedCreditCardTokenType]?dictionary[kMTMaskedCreditCardTokenType]:@"";
+ self.expiresAt = dictionary[kMTMaskedCreditCardExpiresAt]?dictionary[kMTMaskedCreditCardExpiresAt]:@"";
+ self.statusCode = @"";
+ self.transactionId = @"";
+ */
 @end
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m
index f7673ab34..16aa9c658 100644
--- a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m
+++ b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m
@@ -46,15 +46,29 @@ - (instancetype _Nonnull)initWithDictionary:(NSDictionary *_Nonnull)dictionary {
     if (self = [super init]) {
         self.savedTokenId = dictionary[kMTMaskedCreditCardIdentifier];
         self.maskedNumber = dictionary[kMTMaskedCreditCardCardhash];
-        self.type = dictionary[kMTMaskedCreditCardType];
-        self.tokenType = dictionary[kMTMaskedCreditCardTokenType];
-        self.expiresAt = dictionary[kMTMaskedCreditCardExpiresAt];
+        self.type = dictionary[kMTMaskedCreditCardType]?dictionary[kMTMaskedCreditCardType]:@"";
+        self.tokenType = dictionary[kMTMaskedCreditCardTokenType]?dictionary[kMTMaskedCreditCardTokenType]:@"";
+        self.expiresAt = dictionary[kMTMaskedCreditCardExpiresAt]?dictionary[kMTMaskedCreditCardExpiresAt]:@"";
         self.statusCode = @"";
         self.transactionId = @"";
     }
     return self;
 }
-
+- (instancetype )initWithSavedTokenId:(NSString * _Nonnull)savedTokenId
+                         maskedNumber:(NSString * _Nonnull)maskedNumber
+                            tokenType:(NSString * _Nullable)tokenType
+                            expiresAt:(NSString *_Nullable)expiresAt {
+    
+    if (self = [super init]) {
+        self.maskedNumber = maskedNumber;
+        self.savedTokenId = savedTokenId;
+        self.expiresAt  = expiresAt;
+        self.statusCode = @"";
+        self.transactionId = @"";
+        self.type = [MidtransCreditCardHelper nameFromString:self.maskedNumber];
+    }
+    return self;
+}
 - (NSDictionary *)dictionaryValue {
     return @{kMTMaskedCreditCardIdentifier:self.savedTokenId,
              kMTMaskedCreditCardCardhash:self.maskedNumber,
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.h b/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.h
index f3a425f47..cb71727ec 100644
--- a/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.h
+++ b/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.h
@@ -62,7 +62,7 @@
  * updated method, snapping
  */
 - (void)requestTransacationWithCurrentToken:(NSString *_Nonnull)token
-                                 completion:(void (^_Nullable)(MidtransTransactionTokenResponse *_Nullable token, NSError *_Nullable error))completion;
+                                 completion:(void (^_Nullable)(MidtransTransactionTokenResponse *_Nullable regenerateToken, NSError *_Nullable error))completion;
 
 - (void)requestTransactionTokenWithTransactionDetails:(nonnull MidtransTransactionDetails *)transactionDetails
                                           itemDetails:(nullable NSArray<MidtransItemDetail*> *)itemDetails
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m b/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m
index 07d7cc9d1..742f978f8 100644
--- a/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m
+++ b/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m
@@ -183,6 +183,7 @@ - (void)fetchMaskedCardsCustomer:(MidtransCustomerDetails *)customer completion:
              if (!error) {
                  for (NSDictionary *dictionary in requestResponse) {
                      MidtransMaskedCreditCard *card = [[MidtransMaskedCreditCard alloc] initWithDictionary:dictionary];
+                     NSLog(@"data--> %@",card);
                      [result addObject:card];
                  }
              }
@@ -228,9 +229,59 @@ - (void)requestCustomerPointWithToken:(NSString * _Nonnull )token
     
 }
 - (void)requestTransacationWithCurrentToken:(NSString *_Nonnull)token
-                                 completion:(void (^_Nullable)(MidtransTransactionTokenResponse *_Nullable token, NSError *_Nullable error))completion {
+                                 completion:(void (^_Nullable)(MidtransTransactionTokenResponse *_Nullable regenerateToken, NSError *_Nullable error))completion {
     
-    //NSString *URL = [NSString stringWithFormat:@"%@/%@", [CONFIG merchantURL], MIDTRANS_CORE_SNAP_MERCHANT_SERVER_CHARGE];
+    NSString *URL = [NSString stringWithFormat:ENDPOINT_TRANSACTION_DETAIL, [PRIVATECONFIG snapURL], token];
+    [[MidtransNetworking shared] getFromURL:URL parameters:nil callback:^(id response, NSError *error) {
+        if (!error) {
+            MidtransPaymentRequestV2Response *paymentRequestV2 = [[MidtransPaymentRequestV2Response alloc] initWithDictionary:(NSDictionary *)response];
+            
+            if (completion) {
+                NSLog(@"response-->%@",response);
+                MidtransTransactionTokenResponse *token2;
+                
+                MidtransAddress *billAddressConstruct = [MidtransAddress addressWithFirstName:paymentRequestV2.customerDetails.billingAddress.firstName
+                                                                                      lastName:paymentRequestV2.customerDetails.billingAddress.firstName
+                                                                                         phone:paymentRequestV2.customerDetails.billingAddress.phone
+                                                                                       address:paymentRequestV2.customerDetails.billingAddress.firstName
+                                                                                          city:paymentRequestV2.customerDetails.billingAddress.city
+                                                                                    postalCode:paymentRequestV2.customerDetails.billingAddress.postalCode
+                                                                                   countryCode:paymentRequestV2.customerDetails.billingAddress.countryCode];
+                
+                                                         
+                NSNumber *amount =  [NSNumber numberWithInteger:[paymentRequestV2.transactionDetails.grossAmount integerValue]];
+                MidtransTransactionDetails *reConstructTransactionDetail = [[MidtransTransactionDetails alloc] initWithOrderID:paymentRequestV2.transactionDetails.orderId
+                                                                                                                andGrossAmount:amount];
+
+                
+                
+                MidtransCustomerDetails *customerDetailsMock = [[MidtransCustomerDetails alloc] initWithFirstName:paymentRequestV2.customerDetails.firstName
+                                                                                                         lastName:paymentRequestV2.customerDetails.firstName
+                                                                                                            email:paymentRequestV2.customerDetails.email
+                                                                                                            phone:paymentRequestV2.customerDetails.phone
+                                                                                                  shippingAddress:billAddressConstruct
+                                                                                                   billingAddress:billAddressConstruct];
+                NSMutableArray *itemDetails = [NSMutableArray new];
+                
+                for (MidtransPaymentRequestV2ItemDetails *detail in paymentRequestV2.itemDetails) {
+                    MidtransItemDetail *regenerate = [[MidtransItemDetail alloc]initWithItemID:detail.itemDetailsIdentifier name:detail.name price:[NSNumber numberWithDouble:detail.price] quantity:[NSNumber numberWithDouble:detail.quantity]];
+                    [itemDetails addObject:regenerate];
+                }
+                token2 = [MidtransTransactionTokenResponse modelObjectWithDictionary:@{@"token":token}
+                                                                  transactionDetails:reConstructTransactionDetail
+                                                                     customerDetails:customerDetailsMock
+                                                                         itemDetails:itemDetails];
+                
+                completion(token2,NULL);
+            }
+            
+        }
+        else {
+            if (completion) {
+                completion(NULL,error);
+            }
+        }
+    }];
 }
 - (void)requestTransactionTokenWithTransactionDetails:(nonnull MidtransTransactionDetails *)transactionDetails
                                           itemDetails:(nullable NSArray<MidtransItemDetail*> *)itemDetails
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransTransactionResult.m b/MidtransCoreKit/MidtransCoreKit/MidtransTransactionResult.m
index 93d4f82f5..9d25bbdd0 100644
--- a/MidtransCoreKit/MidtransCoreKit/MidtransTransactionResult.m
+++ b/MidtransCoreKit/MidtransCoreKit/MidtransTransactionResult.m
@@ -36,6 +36,7 @@ @implementation MidtransTransactionResult
 - (instancetype)initWithTransactionResponse:(NSDictionary *)response {
     self = [super init];
     if (self) {
+        
         NSMutableDictionary *mResponse = [NSMutableDictionary dictionaryWithDictionary:response];
         self.statusCode = [[mResponse objectThenDeleteForKey:@"status_code"] integerValue];
         self.statusMessage = [mResponse objectThenDeleteForKey:@"status_message"];
@@ -43,7 +44,7 @@ - (instancetype)initWithTransactionResponse:(NSDictionary *)response {
         self.transactionStatus = [mResponse objectThenDeleteForKey:@"transaction_status"];
         self.orderId = [mResponse objectThenDeleteForKey:@"order_id"];
         self.paymentType = [mResponse objectThenDeleteForKey:@"payment_type"];
-        
+        NSLog(@"daata-->%@",mResponse);
         id rawGrossAmount = [mResponse objectThenDeleteForKey:@"gross_amount"];
         if (rawGrossAmount) {
             self.grossAmount = @([rawGrossAmount doubleValue]);
diff --git a/MidtransCoreKit/MidtransCoreKit/Promo/MidtransPromoPromos.m b/MidtransCoreKit/MidtransCoreKit/Promo/MidtransPromoPromos.m
index aee4a1f63..75bc9fe01 100644
--- a/MidtransCoreKit/MidtransCoreKit/Promo/MidtransPromoPromos.m
+++ b/MidtransCoreKit/MidtransCoreKit/Promo/MidtransPromoPromos.m
@@ -38,7 +38,12 @@ + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
     return [[self alloc] initWithDictionary:dict];
 }
-
+- (NSString *)removeAllWhitespace:(NSString *)string{
+    return [string stringByReplacingOccurrencesOfString:@"\\s" withString:@""
+                                              options:NSRegularExpressionSearch
+                                                range:NSMakeRange(0, [string length])]
+    ;
+}
 - (instancetype)initWithDictionary:(NSDictionary *)dict
 {
     self = [super init];
@@ -46,7 +51,12 @@ - (instancetype)initWithDictionary:(NSDictionary *)dict
     // This check serves to make sure that a non-NSDictionary object
     // passed into the model class doesn't break the parsing.
     if(self && [dict isKindOfClass:[NSDictionary class]]) {
-            self.bins = [self objectOrNilForKey:kMidtransPromoPromosBins fromDictionary:dict];
+        NSMutableArray *array = [NSMutableArray new];
+        for (int i =0; i<[[self objectOrNilForKey:kMidtransPromoPromosBins fromDictionary:dict] count]; i++) {
+            NSString *currValue  =[[[self objectOrNilForKey:kMidtransPromoPromosBins fromDictionary:dict] objectAtIndex:i] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+            [array addObject:currValue];
+        }
+            self.bins = array;
             self.discountType = [self objectOrNilForKey:kMidtransPromoPromosDiscountType fromDictionary:dict];
             self.promosIdentifier = [[self objectOrNilForKey:kMidtransPromoPromosId fromDictionary:dict] doubleValue];
             self.discountedGrossAmount = [[self objectOrNilForKey:kMidtransPromoPromosDiscountedGrossAmount fromDictionary:dict] doubleValue];
diff --git a/MidtransDemo/MidtransDemo/MDAlertInputCell.xib b/MidtransDemo/MidtransDemo/MDAlertInputCell.xib
index 80339f78c..b798d2ed2 100644
--- a/MidtransDemo/MidtransDemo/MDAlertInputCell.xib
+++ b/MidtransDemo/MidtransDemo/MDAlertInputCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
diff --git a/MidtransDemo/MidtransDemo/MDAlertViewController.h b/MidtransDemo/MidtransDemo/MDAlertViewController.h
index 86299c5fc..c36de5e0d 100644
--- a/MidtransDemo/MidtransDemo/MDAlertViewController.h
+++ b/MidtransDemo/MidtransDemo/MDAlertViewController.h
@@ -11,7 +11,8 @@
 typedef NS_ENUM(NSUInteger, MDAlertOptionType) {
     MDAlertOptionTypeInput = 1,
     MDAlertOptionTypeRadio = 2,
-    MDAlertOptionTypeCheck = 3
+    MDAlertOptionTypeCheck = 3,
+    MDAlertOptionTypeMultipleInput = 4
 };
 
 @class MDAlertViewController;
@@ -22,6 +23,7 @@ typedef NS_ENUM(NSUInteger, MDAlertOptionType) {
 - (void)alertViewController:(MDAlertViewController *)viewController didApplyInput:(NSString *)inputText;
 - (void)alertViewController:(MDAlertViewController *)viewController didApplyRadio:(id)value;
 - (void)alertViewController:(MDAlertViewController *)viewController didApplyCheck:(NSArray *)values;
+- (void)alertViewController:(MDAlertViewController *)viewController didApplyMultipleInput:(NSArray *)multipleInputText;
 
 @end
 
@@ -33,6 +35,7 @@ typedef NS_ENUM(NSUInteger, MDAlertOptionType) {
 @property (nonatomic) NSString *inputPlaceholder;
 @property (nonatomic) NSString *inputText;
 @property (nonatomic) NSString *predefinedInputText;
+@property (nonatomic) NSArray *multipleInputTexts;
 @property (nonatomic) id predefinedRadio;
 @property (nonatomic) NSArray *predefinedCheckLists;
 
@@ -41,6 +44,10 @@ typedef NS_ENUM(NSUInteger, MDAlertOptionType) {
 + (MDAlertViewController *)alertWithTitle:(NSString *)title
                            predefinedText:(NSString *)predefinedText
                          inputPlaceholder:(NSString *)placeholder;
++ (MDAlertViewController *)alertWithTitle:(NSString *)title
+                           multipleTextfields:(NSArray <NSString*>*)multipleTextfields
+                         inputPlaceholder:(NSString *)placeholder;
+
 - (void)show;
 - (void)dismiss;
 
diff --git a/MidtransDemo/MidtransDemo/MDAlertViewController.m b/MidtransDemo/MidtransDemo/MDAlertViewController.m
index 3b2a3df64..7789b590a 100644
--- a/MidtransDemo/MidtransDemo/MDAlertViewController.m
+++ b/MidtransDemo/MidtransDemo/MDAlertViewController.m
@@ -12,6 +12,8 @@
 #import "MDAlertCheckCell.h"
 #import "MDUtils.h"
 
+#define MDAlertInputCellHeight 50.f
+
 @interface MDAlertViewController () <UITableViewDelegate, UITableViewDataSource>
 @property (nonatomic) IBOutlet UITableView *tableView;
 @property (nonatomic) IBOutlet NSLayoutConstraint *tableHeightConstraint;
@@ -24,6 +26,7 @@ @interface MDAlertViewController () <UITableViewDelegate, UITableViewDataSource>
 @property (nonatomic) NSString *alertTitle;
 @property (nonatomic) NSArray <NSString*>*radioButtons;
 @property (nonatomic) NSArray <NSString*>*checkLists;
+@property (nonatomic) NSArray <NSString*>*textfields;
 
 @property (nonatomic) MDAlertInputCell *inputCell;
 @end
@@ -60,6 +63,18 @@ + (MDAlertViewController *)alertWithTitle:(NSString *)title
     return vc;
 }
 
++ (MDAlertViewController *)alertWithTitle:(NSString *)title
+                       multipleTextfields:(NSArray <NSString*>*)multipleTextfields
+                         inputPlaceholder:(NSString *)placeholder {
+    MDAlertViewController *vc = [[MDAlertViewController alloc] initWithNibName:@"MDAlertViewController"
+                                                                        bundle:nil];
+    vc.alertTitle = title;
+    vc.multipleInputTexts = multipleTextfields;
+    vc.inputPlaceholder = placeholder;
+    vc.type = MDAlertOptionTypeMultipleInput;
+    return vc;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -94,6 +109,12 @@ - (void)viewDidLoad {
             }
         }
     }
+    else if (self.type == MDAlertOptionTypeMultipleInput) {
+        if (self.multipleInputTexts == nil) {
+            self.multipleInputTexts = @[@"", @"", @""];
+        }
+        self.applyButton.enabled = NO;
+    }
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
@@ -137,13 +158,16 @@ - (void)updateTableViewHeight {
     
     switch (self.type) {
         case MDAlertOptionTypeInput:
-            height = 50;
+            height = MDAlertInputCellHeight;
             break;
         case MDAlertOptionTypeRadio:
             for (int i=0; i < self.radioButtons.count; i++) {
                 height += 44;
             }
             break;
+        case MDAlertOptionTypeMultipleInput:
+            height += 3 * MDAlertInputCellHeight;
+            break;
         default:
             for (int i=0; i < self.checkLists.count; i++) {
                 height += 44;
@@ -213,6 +237,11 @@ - (IBAction)applyTap:(UIButton *)sender {
             [self.delegate alertViewController:self didApplyInput:self.inputText];
         }
     }
+    else if (self.type == MDAlertOptionTypeMultipleInput) {
+        if ([self.delegate respondsToSelector:@selector(alertViewController:didApplyMultipleInput:)]) {
+            [self.delegate alertViewController:self didApplyMultipleInput:self.multipleInputTexts];
+        }
+    }
     else {
         if ([self.delegate respondsToSelector:@selector(alertViewController:didApplyCheck:)]) {
             NSArray *indexPaths = self.tableView.indexPathsForSelectedRows;
@@ -234,6 +263,9 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
     else if (self.type == MDAlertOptionTypeInput) {
         return 1;
     }
+    else if (self.type == MDAlertOptionTypeMultipleInput) {
+        return 3;
+    }
     else {
         return self.checkLists.count;
     }
@@ -247,6 +279,14 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     else if (self.type == MDAlertOptionTypeInput) {
         return self.inputCell;
     }
+    else if (self.type == MDAlertOptionTypeMultipleInput) {
+        MDAlertInputCell *cell = [self.tableView dequeueReusableCellWithIdentifier:@"MDAlertInputCell"];
+        cell.textField.hint = self.inputPlaceholder;
+        cell.textField.text = self.multipleInputTexts[indexPath.row];
+        cell.textField.tag = indexPath.row;
+        [cell.textField addTarget:self action:@selector(inputTextChanged:) forControlEvents:UIControlEventEditingChanged];
+        return cell;
+    }
     else {
         MDAlertCheckCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MDAlertCheckCell"];
         cell.titleLabel.text = self.checkLists[indexPath.row];
@@ -254,8 +294,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     }
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (self.type == MDAlertOptionTypeInput) {
-        return 50;
+    if (self.type == MDAlertOptionTypeInput || self.type == MDAlertOptionTypeMultipleInput) {
+        return MDAlertInputCellHeight;
     }
     else {
         return 44;
@@ -266,8 +306,16 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 }
 
 - (void)inputTextChanged:(MDTextField *)textField {
-    self.inputText = textField.text;
-    self.applyButton.enabled = textField.text.length > 0;
+    if (self.type == MDAlertOptionTypeInput) {
+        self.inputText = textField.text;
+        self.applyButton.enabled = textField.text.length > 0;
+    }
+    else if (self.type == MDAlertOptionTypeMultipleInput) {
+        NSMutableArray *mutable = [NSMutableArray arrayWithArray:self.multipleInputTexts];
+        [mutable replaceObjectAtIndex:textField.tag withObject:textField.text];
+        self.multipleInputTexts = [NSArray arrayWithArray:mutable];
+        self.applyButton.enabled = [self.multipleInputTexts componentsJoinedByString:@""].length > 0;
+    }
 }
 
 @end
diff --git a/MidtransDemo/MidtransDemo/MDOptionComposerCell.xib b/MidtransDemo/MidtransDemo/MDOptionComposerCell.xib
index cddbfab3d..b036281e5 100644
--- a/MidtransDemo/MidtransDemo/MDOptionComposerCell.xib
+++ b/MidtransDemo/MidtransDemo/MDOptionComposerCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
diff --git a/MidtransDemo/MidtransDemo/MDOptionManager.h b/MidtransDemo/MidtransDemo/MDOptionManager.h
index 07a9788ee..4daa590a6 100644
--- a/MidtransDemo/MidtransDemo/MDOptionManager.h
+++ b/MidtransDemo/MidtransDemo/MDOptionManager.h
@@ -26,6 +26,7 @@
 @property (nonatomic) MDOption *permataVAOption;
 @property (nonatomic) MDOption *bcaVAOption;
 @property (nonatomic) MDOption *bniVAOption;
+@property (nonatomic) MDOption *customFieldOption;
 @property (nonatomic) MDOption *mandiriPointOption;
 @property (nonatomic) MDOption *installmentOption;
 @property (nonatomic) MDOption *paymentChannel;
diff --git a/MidtransDemo/MidtransDemo/MDOptionManager.m b/MidtransDemo/MidtransDemo/MDOptionManager.m
index ab3b53d9f..32241fb0d 100644
--- a/MidtransDemo/MidtransDemo/MDOptionManager.m
+++ b/MidtransDemo/MidtransDemo/MDOptionManager.m
@@ -44,6 +44,7 @@ - (instancetype)init {
         self.bcaVAOption = [self unArchivedObject:@"md_bca_va"];
         self.bniVAOption = [self unArchivedObject:@"md_bni_va"];;
         self.bniPointOption = [self unArchivedObject:@"md_bni_point"];
+        self.customFieldOption = [self unArchivedObject:@"md_custom_field"];
         self.installmentOption = [self unArchivedObject:@"md_installment"];
         self.paymentChannel = [self unArchivedObject:@"md_payment_channel"];
     }
@@ -118,6 +119,10 @@ - (void)setBniVAOption:(MDOption *)bniVAOption {
     _bniVAOption = bniVAOption;
     [self archiveObject:bniVAOption key:@"md_bni_va"];
 }
+- (void)setCustomFieldOption:(MDOption *)customFieldOption {
+    _customFieldOption = customFieldOption;
+    [self archiveObject:customFieldOption key:@"md_custom_field"];
+}
 - (void)setInstallmentOption:(MDOption *)installmentOption {
     _installmentOption = installmentOption;
     [self archiveObject:installmentOption key:@"md_installment"];
@@ -160,6 +165,7 @@ - (void)resetConfiguration {
     self.bcaVAOption = nil;
     self.bniPointOption =nil;
     self.installmentOption =nil;
+    self.customFieldOption = nil;
     self.paymentChannel = nil;
 }
 @end
diff --git a/MidtransDemo/MidtransDemo/MDOptionsViewController.m b/MidtransDemo/MidtransDemo/MDOptionsViewController.m
index 147ebffe3..02f5f2bde 100644
--- a/MidtransDemo/MidtransDemo/MDOptionsViewController.m
+++ b/MidtransDemo/MidtransDemo/MDOptionsViewController.m
@@ -72,11 +72,15 @@ - (void)initConfiguration{
     MidtransTransactionExpire *minute = [[MidtransTransactionExpire alloc] initWithExpireTime:[NSDate date]
                                                                                expireDuration:1
                                                                                  withUnitTime:MindtransTimeUnitTypeMinute];
+    MidtransTransactionExpire *fiveMinutes = [[MidtransTransactionExpire alloc] initWithExpireTime:[NSDate date]
+                                                                               expireDuration:5
+                                                                                 withUnitTime:MindtransTimeUnitTypeMinutes];
     MidtransTransactionExpire *hour = [[MidtransTransactionExpire alloc] initWithExpireTime:[NSDate date]
                                                                              expireDuration:1
                                                                                withUnitTime:MindtransTimeUnitTypeHour];
     options = @[[MDOption optionGeneralWithName:@"No Expiry" value:nil],
                 [MDOption optionGeneralWithName:@"1 Minute" value:minute],
+                [MDOption optionGeneralWithName:@"5 Minute" value:fiveMinutes],
                 [MDOption optionGeneralWithName:@"1 Hour" value:hour]];
     MDOptionView *optCustomExpiry = [MDOptionView viewWithIcon:[UIImage imageNamed:@"expiry"]
                                                  titleTemplate:@"%@"
@@ -186,6 +190,16 @@ - (void)initConfiguration{
                                              identifier:OPTBNIVA];
     [optBNIVA selectOptionAtIndex:[options indexOfOption:[MDOptionManager shared].bniVAOption]];
     
+    /////////////
+    //custom field
+    options = @[[MDOption optionGeneralWithName:@"Disable" value:nil],
+                [MDOption optionComposer:MDComposerTypeText name:@"Enable" value:@""]];
+    MDOptionView *optCustomField = [MDOptionView viewWithIcon:[UIImage imageNamed:@"custom_bca_va"]
+                                          titleTemplate:@"Custom Field %@d"
+                                                options:options
+                                             identifier:OPTCustomField];
+    [optCustomField selectOptionAtIndex:[options indexOfOption:[MDOptionManager shared].customFieldOption]];
+    
     
     /////////////
     //installment
@@ -227,6 +241,7 @@ - (void)initConfiguration{
                          optPermataVA,
                          optBCAVA,
                          optBNIVA,
+                         optCustomField,
                          optInstallment,
                          optPaymentChannels
                          ];
@@ -342,6 +357,19 @@ - (void)alertViewController:(MDAlertViewController *)viewController didApplyInpu
     
     [viewController dismiss];
 }
+- (void)alertViewController:(MDAlertViewController *)viewController didApplyMultipleInput:(NSArray *)multipleInputText {
+    NSUInteger index = viewController.tag;
+    MDOption *option = self.selectedOptionView.options[index];
+    option.value = multipleInputText;
+    NSInteger count = [[multipleInputText filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF.length > 0"]] count];
+    option.subName = [NSString stringWithFormat:@"%@ Fields", @(count)];
+    
+    [self.selectedOptionView selectOptionAtIndex:index];
+    
+    [MDUtils saveOptionWithView:self.selectedOptionView option:option];
+    
+    [viewController dismiss];
+}
 - (void)alertViewController:(MDAlertViewController *)viewController didApplyCheck:(NSArray *)values {
     NSUInteger index = viewController.tag;
     MDOption *option = self.selectedOptionView.options[index];
@@ -420,6 +448,15 @@ - (void)showAlertAtOptionView:(MDOptionView *)optionView
         alert.tag = [optionView.options indexOfObject:option];
         [alert show];
     }
+    else if ([idf isEqualToString:OPTCustomField]) {
+        MDAlertViewController *alert = [MDAlertViewController alertWithTitle:@"Enable Custom Field"
+                                                          multipleTextfields:option.value
+                                                            inputPlaceholder:@"Custom Field"];
+        alert.delegate = self;
+        alert.multipleInputTexts = usePredefinedValue? option.value: nil;
+        alert.tag = [optionView.options indexOfObject:option];
+        [alert show];
+    }
     self.selectedOptionView = optionView;
 }
 
diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m
index be5a642f5..6e691a6ea 100644
--- a/MidtransDemo/MidtransDemo/MDOrderViewController.m
+++ b/MidtransDemo/MidtransDemo/MDOrderViewController.m
@@ -71,18 +71,14 @@ - (void)viewDidLoad {
        merchantServerURL:merchantServer];
     
     //forced to use token storage
-    UICONFIG.hideStatusPage = YES;
-    CC_CONFIG.tokenStorageEnabled = NO;
-    CC_CONFIG.authenticationType = [[MDOptionManager shared].authTypeOption.value integerValue];
-
-    CC_CONFIG.saveCardEnabled =[[MDOptionManager shared].saveCardOption.value boolValue];
-    
-    CC_CONFIG.secure3DEnabled =[[MDOptionManager shared].secure3DOption.value boolValue];
-    CC_CONFIG.authenticationType = MTAuthenticationType3DS;
-    CC_CONFIG.acquiringBank = [[MDOptionManager shared].issuingBankOption.value integerValue];
-    CC_CONFIG.predefinedInstallment = [MDOptionManager shared].installmentOption.value;
-    CC_CONFIG.preauthEnabled = [[MDOptionManager shared].preauthOption.value boolValue];
-    CC_CONFIG.promoEnabled = [[MDOptionManager shared].promoOption.value boolValue];
+    UICONFIG.hideStatusPage = NO;
+    [[MidtransCreditCardConfig shared] setPaymentType:MTCreditCardPaymentTypeTwoclick];
+    [MidtransCreditCardConfig shared].setDefaultCreditSaveCardEnabled = YES;
+    [[MidtransCreditCardConfig shared] setSaveCardEnabled:TRUE];
+    [[MidtransCreditCardConfig shared] setSecure3DEnabled:TRUE];
+    [[MidtransCreditCardConfig shared] setTokenStorageEnabled:TRUE];
+    [[MidtransUIConfiguration shared] setHideStatusPage:FALSE];
+    [[MidtransNetworkLogger shared] startLogging];
     //CC_CONFIG.showFormCredentialsUser = YES;
     
     /*set custom free text for bca*/
@@ -92,7 +88,7 @@ - (void)viewDidLoad {
     
     NSDictionary *freeText = @{@"inquiry":@[inquiryConstructor,inquiryConstructor2],@"payment":@[paymentConstructor]};
     CONFIG.customFreeText = freeText;
-    UICONFIG.hideStatusPage = YES;
+    UICONFIG.hideStatusPage = NO;
     CONFIG.customPaymentChannels = [[MDOptionManager shared].paymentChannel.value valueForKey:@"type"];
     CONFIG.customBCAVANumber = [MDOptionManager shared].bcaVAOption.value;
     CONFIG.customBNIVANumber = [MDOptionManager shared].bniVAOption.value;
@@ -129,11 +125,11 @@ - (IBAction)bayarPressed:(id)sender {
     cst.customerIdentifier = @"3A8788CE-B96F-449C-8180-B5901A08B50A";
     MidtransItemDetail *itm = [[MidtransItemDetail alloc] initWithItemID:[NSString randomWithLength:20]
                                                                     name:@"Midtrans Pillow"
-                                                                   price:@255000
+                                                                   price:@200000
                                                                 quantity:@1];
     
     MidtransTransactionDetails *trx = [[MidtransTransactionDetails alloc] initWithOrderID:[NSString randomWithLength:20]
-                                                                           andGrossAmount:@255000];
+                                                                           andGrossAmount:@200000];
     
     //configure theme
     MidtransUIFontSource *font = [[MidtransUIFontSource alloc] initWithFontNameBold:@"SourceSansPro-Bold"
@@ -145,47 +141,71 @@ - (IBAction)bayarPressed:(id)sender {
     NSArray *binFilter = @[];
     NSArray *blacklistBin = @[];
     
-
+    
     binFilter = @[@"4"];
     //configure expire time
     [[MidtransNetworkLogger shared] startLogging];
     
-    NSDate *mydate = [NSDate date];
-    NSTimeInterval secondsInEightHours = 1 * 60 * 60;
-    NSDate *dateEightHoursAhead = [mydate dateByAddingTimeInterval:secondsInEightHours];
-    MidtransTransactionExpire *expireTime = [[MidtransTransactionExpire alloc] initWithExpireTime:nil expireDuration:1 withUnitTime:MindtransTimeUnitTypeHour];
+    MidtransTransactionExpire * optExpireTime = [[[MDOptionManager shared] expireTimeOption] value];
+    MindtransTimeUnitType unit;
+    if ([optExpireTime.unit isEqualToString:@"MINUTE"]) {
+        unit = MindtransTimeUnitTypeMinute;
+    }
+    else if ([optExpireTime.unit isEqualToString:@"MINUTES"]) {
+        unit = MindtransTimeUnitTypeMinutes;
+    }
+    else if ([optExpireTime.unit isEqualToString:@"HOUR"]) {
+        unit = MindtransTimeUnitTypeHour;
+    }
+    else if ([optExpireTime.unit isEqualToString:@"HOURS"]) {
+        unit = MindtransTimeUnitTypeHours;
+    }
+    else if ([optExpireTime.unit isEqualToString:@"DAY"]) {
+        unit = MindtransTimeUnitTypeDay;
+    }
+    else if ([optExpireTime.unit isEqualToString:@"DAYS"]) {
+        unit = MindtransTimeUnitTypeDays;
+    }
+    else {
+        unit = MindtransTimeUnitTypeHour;
+    }
+    MidtransTransactionExpire *expireTime = [[MidtransTransactionExpire alloc] initWithExpireTime:[NSDate date] expireDuration:optExpireTime.duration withUnitTime:unit];
     //show hud
     [self.progressHUD showInView:self.navigationController.view];
     
-    //NSArray *cf = @[MIDTRANS_CUSTOMFIELD_1:@{@"voucher_code":@"123",@"amount":@"123"}];
     NSMutableArray *arrayOfCustomField = [NSMutableArray new];
-    [arrayOfCustomField addObject:@{MIDTRANS_CUSTOMFIELD_2:@"VN00000015-sw4g4o0cws"}];
-    [arrayOfCustomField addObject:@{MIDTRANS_CUSTOMFIELD_3:@"0--14"}];
-    
-    NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:@{@"voucher":@"123",@"code":@"data"} // Here you can pass array or dictionary
-                                                       options:NSJSONWritingPrettyPrinted // Pass 0 if you don't care about the readability of the generated string
-                                                         error:&error];
-    NSString *jsonString;
-    if (jsonData) {
-        jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        //This is your JSON String
-        //NSUTF8StringEncoding encodes special characters using an escaping scheme
-    } else {
-        NSLog(@"Got an error: %@", error);
-        jsonString = @"";
+    NSArray *value = [[[MDOptionManager shared] customFieldOption] value];
+    if (value[0]) {
+        [arrayOfCustomField addObject:@{MIDTRANS_CUSTOMFIELD_1:value[0]}];
     }
-
+    if (value[1]) {
+        [arrayOfCustomField addObject:@{MIDTRANS_CUSTOMFIELD_2:value[1]}];
+    }
+    if (value[2]) {
+        [arrayOfCustomField addObject:@{MIDTRANS_CUSTOMFIELD_3:value[2]}];
+    }
+//    NSError *error;
+//    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:@{@"voucher":@"123",@"code":@"data"} // Here you can pass array or dictionary
+//                                                       options:NSJSONWritingPrettyPrinted // Pass 0 if you don't care about the readability of the generated string
+//                                                         error:&error];
+//    NSString *jsonString;
+//    if (jsonData) {
+//        jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+//        //This is your JSON String
+//        //NSUTF8StringEncoding encodes special characters using an escaping scheme
+//    } else {
+//        NSLog(@"Got an error: %@", error);
+//        jsonString = @"";
+//    }
+//    [arrayOfCustomField addObject:@{MIDTRANS_CUSTOMFIELD_1:jsonString}];
     
-    [arrayOfCustomField addObject:@{MIDTRANS_CUSTOMFIELD_1:jsonString}];
-
     [[MidtransMerchantClient shared] requestTransactionTokenWithTransactionDetails:trx
                                                                        itemDetails:@[itm]
                                                                    customerDetails:cst
                                                                        customField:arrayOfCustomField
                                                                          binFilter:binFilter
                                                                 blacklistBinFilter:blacklistBin
-                                                             transactionExpireTime:nil
+                                                             transactionExpireTime:expireTime
                                                                         completion:^(MidtransTransactionTokenResponse * _Nullable token, NSError * _Nullable error)
      
      {
@@ -200,7 +220,7 @@ - (IBAction)bayarPressed:(id)sender {
              [alert show];
          }
          else {
-
+             
              MidtransUIPaymentViewController *paymentVC = [[MidtransUIPaymentViewController alloc] initWithToken:token];
              paymentVC.paymentDelegate = self;
              [self.navigationController presentViewController:paymentVC animated:YES completion:nil];
diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.xib b/MidtransDemo/MidtransDemo/MDOrderViewController.xib
index 45c4dbfa6..c13fa8387 100644
--- a/MidtransDemo/MidtransDemo/MDOrderViewController.xib
+++ b/MidtransDemo/MidtransDemo/MDOrderViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -39,14 +39,14 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eeh-aL-78U">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp 20.000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uFk-Qv-i9H">
-                            <rect key="frame" x="265" y="13" width="97" height="24.5"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp 10.000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uFk-Qv-i9H">
+                            <rect key="frame" x="279.5" y="12" width="82.5" height="26.5"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Light" family="Source Sans Pro" pointSize="21"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TOTAL AMOUNT" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kng-bg-OON">
-                            <rect key="frame" x="13" y="20.5" width="61" height="9.5"/>
+                            <rect key="frame" x="13" y="20" width="55.5" height="10.5"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Bold" family="Source Sans Pro" pointSize="8"/>
                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
@@ -150,16 +150,16 @@ Indonesia</string>
                                             </constraints>
                                         </imageView>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wqq-fw-pzR">
-                                            <rect key="frame" x="48" y="27.5" width="237.5" height="35"/>
+                                            <rect key="frame" x="48" y="26" width="245.5" height="38"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Midtrans Pillow" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vsM-HU-HbE">
-                                                    <rect key="frame" x="0.0" y="0.0" width="237.5" height="19"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="245.5" height="20.5"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
                                                     <color key="textColor" red="0.37647058823529411" green="0.38039215686274508" blue="0.38823529411764707" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Qty 1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1eZ-RL-n9D">
-                                                    <rect key="frame" x="0.0" y="18.5" width="237.5" height="16.5"/>
+                                                    <rect key="frame" x="0.0" y="20" width="245.5" height="18"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Light" family="Source Sans Pro" pointSize="14"/>
                                                     <color key="textColor" red="0.30196078431372547" green="0.30588235294117649" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -176,8 +176,8 @@ Indonesia</string>
                                                 <constraint firstItem="vsM-HU-HbE" firstAttribute="leading" secondItem="wqq-fw-pzR" secondAttribute="leading" id="uF5-pC-9nY"/>
                                             </constraints>
                                         </view>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="251" text="Rp 20,000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="08Q-dj-7dZ">
-                                            <rect key="frame" x="293.5" y="39" width="55.5" height="14"/>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="251" text="Rp 10,000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="08Q-dj-7dZ">
+                                            <rect key="frame" x="301.5" y="37.5" width="47.5" height="15.5"/>
                                             <fontDescription key="fontDescription" name="SourceSansPro-Light" family="Source Sans Pro" pointSize="12"/>
                                             <color key="textColor" red="0.027450980392156862" green="0.67843137254901964" blue="0.86274509803921573" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
@@ -320,7 +320,7 @@ Indonesia</string>
                         <constraint firstAttribute="height" constant="55" id="xgj-lU-UBn"/>
                     </constraints>
                     <fontDescription key="fontDescription" name="SourceSansPro-Light" family="Source Sans Pro" pointSize="20"/>
-                    <state key="normal" title="Pay Rp 20,000" image="arrow_right_white"/>
+                    <state key="normal" title="Pay Rp 10,000" image="arrow_right_white"/>
                     <connections>
                         <action selector="bayarPressed:" destination="-1" eventType="touchUpInside" id="qPS-lM-ORE"/>
                     </connections>
diff --git a/MidtransDemo/MidtransDemo/MDProductViewController.xib b/MidtransDemo/MidtransDemo/MDProductViewController.xib
index f8cf020a7..7fa0c9b10 100644
--- a/MidtransDemo/MidtransDemo/MDProductViewController.xib
+++ b/MidtransDemo/MidtransDemo/MDProductViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -54,7 +54,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ina-Mn-e4U">
                     <rect key="frame" x="63" y="266" width="250" height="164.5"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp 20,000" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FKd-vY-21Z">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp 10,000" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FKd-vY-21Z">
                             <rect key="frame" x="0.0" y="0.0" width="250" height="43"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Light" family="Source Sans Pro" pointSize="34"/>
                             <color key="textColor" red="0.027450980392156862" green="0.67843137254901964" blue="0.86274509803921573" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/MidtransDemo/MidtransDemo/MDUtils.h b/MidtransDemo/MidtransDemo/MDUtils.h
index a7a99456e..507e0c310 100644
--- a/MidtransDemo/MidtransDemo/MDUtils.h
+++ b/MidtransDemo/MidtransDemo/MDUtils.h
@@ -42,6 +42,7 @@ static NSString *const OPTMandiriPoint = @"OPTMandiriPoint";
 static NSString *const OPTPermataVA = @"OPTPermataVA";
 static NSString *const OPTBCAVA = @"OPTBCAVA";
 static NSString *const OPTBNIVA = @"OPTBNIVA";
+static NSString *const OPTCustomField = @"OPTCustomField";
 static NSString *const OPTInstallment = @"OPTInstallment";
 static NSString *const OPTPaymanetChannel = @"OPTPaymanetChannel";
 
diff --git a/MidtransDemo/MidtransDemo/MDUtils.m b/MidtransDemo/MidtransDemo/MDUtils.m
index 820b1e60b..5ba0ce6a7 100644
--- a/MidtransDemo/MidtransDemo/MDUtils.m
+++ b/MidtransDemo/MidtransDemo/MDUtils.m
@@ -62,6 +62,9 @@ + (void)saveOptionWithView:(MDOptionView *)view option:(MDOption *)option {
     else if ([idf isEqualToString:OPTPermataVA]) {
         [MDOptionManager shared].permataVAOption = option;
     }
+    else if ([idf isEqualToString:OPTCustomField]) {
+        [MDOptionManager shared].customFieldOption = option;
+    }
     else if ([idf isEqualToString:OPTInstallment]) {
         [MDOptionManager shared].installmentOption = option;
     }
diff --git a/MidtransKit/MidtransKit/SNPPostPaymentGeneralView.h b/MidtransKit/MidtransKit/SNPPostPaymentGeneralView.h
index 3f43cc924..7804ce175 100644
--- a/MidtransKit/MidtransKit/SNPPostPaymentGeneralView.h
+++ b/MidtransKit/MidtransKit/SNPPostPaymentGeneralView.h
@@ -14,5 +14,6 @@
 @property (weak, nonatomic) IBOutlet MidtransUINextStepButton *finishPaymentButton;
 @property (weak, nonatomic) IBOutlet UILabel *totalAmountLabel;
 @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 
 @end
diff --git a/MidtransKit/MidtransKit/SNPPostPaymentGeneralViewController.m b/MidtransKit/MidtransKit/SNPPostPaymentGeneralViewController.m
index d8b457cd4..e3a102abe 100644
--- a/MidtransKit/MidtransKit/SNPPostPaymentGeneralViewController.m
+++ b/MidtransKit/MidtransKit/SNPPostPaymentGeneralViewController.m
@@ -73,6 +73,7 @@ - (void)viewDidLoad {
     self.instrunctions = [VTClassHelper instructionsFromFilePath:guidePath];
     
      self.totalAmountLabel.text = [self.token.itemDetails formattedPriceAmount];
+    self.view.orderIdLabel.text = self.token.transactionDetails.orderId;
     [self.headerView.vaCopyButton addTarget:self action:@selector(copyButtonDidTapped:) forControlEvents:UIControlEventTouchUpInside];
     [self.view.tableView reloadData];
     [self.view.totalAmountBorderedView addGestureRecognizer:
diff --git a/MidtransKit/MidtransKit/classes/MIDDanamonOnlineViewController.m b/MidtransKit/MidtransKit/classes/MIDDanamonOnlineViewController.m
index d8be7d2ae..355e67ced 100644
--- a/MidtransKit/MidtransKit/classes/MIDDanamonOnlineViewController.m
+++ b/MidtransKit/MidtransKit/classes/MIDDanamonOnlineViewController.m
@@ -23,6 +23,7 @@ @interface MIDDanamonOnlineViewController () <MidtransPaymentWebControllerDelega
 @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView;
 @property (weak, nonatomic) IBOutlet UILabel *amountLabel;
 @property (weak, nonatomic) IBOutlet UIView *instructionPage;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 
 @end
 
@@ -37,6 +38,7 @@ - (void)viewDidLoad {
     
     self.instructionHeaderLabel1.text = [VTClassHelper getTranslationFromAppBundleForString:@"danamon.instructions.header1"];
     self.instructionHeaderLabel2.text = [VTClassHelper getTranslationFromAppBundleForString:@"danamon.instructions.header2"];
+    self.orderIdLabel.text = self.token.transactionDetails.orderId;
     self.amountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber;
     self.danamonStepLabel.text = [NSString stringWithFormat:[VTClassHelper getTranslationFromAppBundleForString:@"%@ step by step"], self.paymentMethod.title];
     self.totalAmountLabel.text = [VTClassHelper getTranslationFromAppBundleForString:@"total.amount"];
diff --git a/MidtransKit/MidtransKit/classes/MIDGopayView.h b/MidtransKit/MidtransKit/classes/MIDGopayView.h
index 844894fa3..1d98cca65 100644
--- a/MidtransKit/MidtransKit/classes/MIDGopayView.h
+++ b/MidtransKit/MidtransKit/classes/MIDGopayView.h
@@ -21,5 +21,6 @@
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *transactionBottomDetailConstraints;
 @property (weak, nonatomic) IBOutlet UILabel *totalAmountLabel;
 @property (weak, nonatomic) IBOutlet UILabel *amountLabel;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 @property (weak, nonatomic) IBOutlet UIButton *installGojekButton;
 @end
diff --git a/MidtransKit/MidtransKit/classes/MIDPaymentIndomaretViewController.m b/MidtransKit/MidtransKit/classes/MIDPaymentIndomaretViewController.m
index 3e3912d7f..228cbf697 100644
--- a/MidtransKit/MidtransKit/classes/MIDPaymentIndomaretViewController.m
+++ b/MidtransKit/MidtransKit/classes/MIDPaymentIndomaretViewController.m
@@ -21,6 +21,7 @@ @interface MIDPaymentIndomaretViewController ()
 @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView;
 @property (weak, nonatomic) IBOutlet UILabel *totalAmountLabel;
 @property (weak, nonatomic) IBOutlet UILabel *amountLabel;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 @property (weak, nonatomic) IBOutlet UIButton *confirmPaymentButton;
 @end
 
@@ -41,6 +42,7 @@ - (void)viewDidLoad {
     [self addSubViewController:self.subGuide toView:self.instructionPage];
 
     self.amountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber;
+    self.orderIdLabel.text = self.token.transactionDetails.orderId;
     self.instructionLabel.text = [NSString stringWithFormat:[VTClassHelper getTranslationFromAppBundleForString:@"%@ step by step"], self.paymentMethod.title];
     [self.totalAmountBorderedView addGestureRecognizer:
      [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(totalAmountBorderedViewTapped:)]];
diff --git a/MidtransKit/MidtransKit/classes/MidGopayViewController.m b/MidtransKit/MidtransKit/classes/MidGopayViewController.m
index 8016f0201..f2f1e04a0 100644
--- a/MidtransKit/MidtransKit/classes/MidGopayViewController.m
+++ b/MidtransKit/MidtransKit/classes/MidGopayViewController.m
@@ -71,6 +71,7 @@ - (void)viewDidLoad {
     [self.view.tableView registerNib:[UINib nibWithNibName:@"VTGuideCell" bundle:VTBundle] forCellReuseIdentifier:@"VTGuideCell"];
     self.headerView = [self.view.tableView dequeueReusableCellWithIdentifier:@"MidtransDirectHeader"];
     self.view.amountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber;
+    self.view.orderIdLabel.text = self.token.transactionDetails.orderId;
     
 
    
diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.h b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.h
index b54019f48..7b77944d1 100644
--- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.h
+++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.h
@@ -33,6 +33,7 @@
 @property (weak, nonatomic) IBOutlet UILabel *totalAmountPrice;
 @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView;
 @property (weak, nonatomic) IBOutlet MidtransUITextField *contactEmailTextField;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdTextLabel;
 @property (weak, nonatomic) IBOutlet MidtransUITextField *contactPhoneNumberTextField;
 - (void)configureAmountTotal:(MidtransTransactionTokenResponse *)tokenResponse;
 - (BOOL)isViewableError:(NSError *)error;
diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.m b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.m
index a2ceaa049..e4da95d48 100644
--- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.m
+++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.m
@@ -54,6 +54,7 @@ - (UIImage *)templateImageNamed:(NSString *)imageName {
 
 - (void)configureAmountTotal:(MidtransTransactionTokenResponse *)tokenResponse {
     self.totalAmountPrice.text = tokenResponse.transactionDetails.grossAmount.formattedCurrencyNumber;
+    self.orderIdTextLabel.text = tokenResponse.transactionDetails.orderId;
 }
 - (UIImage *)iconWithBankName:(NSString *)bankName {
     return [UIImage imageNamed:[bankName lowercaseString] inBundle:VTBundle compatibleWithTraitCollection:nil];
diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m
index dbd487083..0fa7df11d 100644
--- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m
+++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m
@@ -127,6 +127,7 @@ - (void)viewDidLoad {
     else {
         self.maskedCards = [NSMutableArray new];
     }
+    NSLog(@"self.maskedCards-->%@",self.maskedCards);
     self.bniPointActive = NO;
     self.mandiriPointActive = NO;
     self.installmentCurrentIndex = 0;
@@ -200,7 +201,7 @@ - (void)viewDidLoad {
             AddOnConstructor *promoConstructor = [[AddOnConstructor alloc] initWithDictionary:@{
                                                                                                 @"addOnName":SNP_PROMO,
                                                                                                 @"addOnTitle":promos.name,
-                                                                                                @"addOnDescriptions":[NSString stringWithFormat:@"%0.f",promos.discountedGrossAmount],
+                                                                                                @"addOnDescriptions":[NSString stringWithFormat:@"%0.f",promos.calculatedDiscountAmount],
                                                                                                 @"addOnAdditional":[NSString stringWithFormat:@"%0.f",promos.promosIdentifier]
                              }];
           [self.promoArray addObject:promoConstructor];
@@ -429,15 +430,19 @@ - (void)updatePromoViewWithCreditCardNumber:(NSString *)number {
         self.currentPromoSelected = @"";
         self.currentPromoIndex = nil;
         self.prevPromoIndex = nil;
-       NSArray *filtered = [self.promos.promos filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"bins CONTAINS [cd] %@", number]];
+       NSArray *filtered = [self.promos.promos filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"bins CONTAINS [cd] %@", [NSString stringWithFormat:@"%@", number]]];
+        
         if (filtered.count) {
              [self.promoArray removeAllObjects];
+             [self updatePromoContent];
+        } else {
+             [self updatePromoContent];
         }
         for (MidtransPromoPromos *promos in filtered) {
             AddOnConstructor *promoConstructor = [[AddOnConstructor alloc] initWithDictionary:@{
                                                                                                 @"addOnName":SNP_PROMO,
                                                                                                 @"addOnTitle":promos.name,
-                                                                                                @"addOnDescriptions":[NSString stringWithFormat:@"%0.f",promos.discountedGrossAmount],
+                                                                                                @"addOnDescriptions":[NSString stringWithFormat:@"%0.f",promos.calculatedDiscountAmount],
                                                                                                 @"addOnAdditional":[NSString stringWithFormat:@"%0.f",promos.promosIdentifier]
                                                                                                 }];
             [self.promoArray addObject:promoConstructor];
@@ -739,12 +744,14 @@ - (void)matchBINNumberWithInstallment:(NSString *)binNumber {
             }
             
             if (self.installmentAvailable) {
+                
                 if (!isDebitCard) {
                     self.installmentBankName = self.filteredBinObject.bank;
                     [self.installmentValueObject setArray:@[@"0"]];
                     [self.installmentValueObject addObjectsFromArray:[self.installment.terms objectForKey:self.installmentBankName]];
                     [self showInstallmentView:YES];
                 }
+                
             }
         }
         else {
@@ -773,11 +780,13 @@ - (void)matchBINNumberWithInstallment:(NSString *)binNumber {
         self.title = [VTClassHelper getTranslationFromAppBundleForString:@"creditcard.input.title"];
         self.filteredBinObject.bank = nil;
         self.view.creditCardNumberTextField.info2Icon = nil;
+        
         if (self.installmentValueObject.count > 0) {
             self.installmentCurrentIndex = 0;
             [self.installmentValueObject removeAllObjects];
             [self.installmentsContentView resetInstallmentIndex];
         }
+        
         [self showInstallmentView:NO];
         
     }
@@ -1043,16 +1052,18 @@ - (void)payWithToken:(NSString *)token {
          else {
              if ([CC_CONFIG tokenStorageEnabled] && result.maskedCreditCard) {
                  NSUInteger index = [self.maskedCards indexOfObjectPassingTest:^BOOL(MidtransMaskedCreditCard *obj, NSUInteger idx, BOOL * _Nonnull stop) {
-                     return [result.maskedCreditCard.maskedNumber isEqualToString:obj.maskedNumber];
+                     NSString *masked = [result.additionalData objectForKey:@"masked_card"];
+                     return [masked isEqualToString:obj.maskedNumber];
                  }];
                  if (index == NSNotFound) {
-                    [self.maskedCards addObject:result.maskedCreditCard];
+                     MidtransMaskedCreditCard *constructMaskedCard = [[MidtransMaskedCreditCard alloc] initWithSavedTokenId:[result.additionalData valueForKey:@"saved_token_id"] maskedNumber:[result.additionalData valueForKey:@"masked_card"] tokenType:@"" expiresAt:@""];
+                     [self.maskedCards addObject:constructMaskedCard];
                  }
                  
                  [[MidtransMerchantClient shared] saveMaskedCards:self.maskedCards
                                                          customer:self.token.customerDetails
                                                        completion:^(id  _Nullable result, NSError * _Nullable error) {
-                                                           
+
                                                        }];
              }
              if ([[result.additionalData objectForKey:@"fraud_status"] isEqualToString:@"challenge"]) {
diff --git a/MidtransKit/MidtransKit/classes/MidtransSavedCardController.m b/MidtransKit/MidtransKit/classes/MidtransSavedCardController.m
index 1434fda61..615a94931 100644
--- a/MidtransKit/MidtransKit/classes/MidtransSavedCardController.m
+++ b/MidtransKit/MidtransKit/classes/MidtransSavedCardController.m
@@ -27,6 +27,7 @@ @interface MidtransSavedCardController () <UITableViewDelegate, UITableViewDataS
 @property (weak, nonatomic) IBOutlet UILabel *totalAmountLabel;
 @property (weak, nonatomic) IBOutlet UILabel *totalAmountText;
 @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 @end
 
 @implementation MidtransSavedCardController
@@ -40,7 +41,9 @@ - (instancetype)initWithToken:(MidtransTransactionTokenResponse *)token
         self.paymentMethod = paymentMethod;
         self.responsePayment = responsePayment;
         self.creditCard = creditCard;
-        self.bankBinList = [NSJSONSerialization JSONObjectWithData:[[NSData alloc] initWithContentsOfFile:[VTBundle pathForResource:@"bin" ofType:@"json"]] options:kNilOptions error:nil];
+        self.bankBinList = [NSJSONSerialization JSONObjectWithData:[[NSData alloc]
+                                                                    initWithContentsOfFile:[VTBundle pathForResource:@"bin" ofType:@"json"]]
+                                                           options:kNilOptions error:nil];
     }
     return self;
 }
@@ -63,6 +66,7 @@ - (void)viewDidLoad {
     self.footerView = [[VTBundle loadNibNamed:@"MidtransSavedCardFooter" owner:self options:nil] lastObject];
     [self.footerView.addCardButton addTarget:self action:@selector(addCardPressed:) forControlEvents:UIControlEventTouchUpInside];
       self.totalAmountLabel.text = [self.token.itemDetails formattedPriceAmount];
+    self.orderIdLabel.text = self.token.transactionDetails.orderId;
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.tableFooterView = [UIView new];
@@ -150,8 +154,10 @@ - (void)addCardPressed:(id)sender {
 
 - (void)performOneClickWithCard:(MidtransMaskedCreditCard *)card {
     if (self.responsePayment.transactionDetails.orderId) {
-        [[SNPUITrackingManager shared] trackEventName:@"btn confirm payment" additionalParameters:@{@"order id":self.responsePayment.transactionDetails.orderId}];
+        [[SNPUITrackingManager shared] trackEventName:@"btn confirm payment"
+                                 additionalParameters:@{@"order id":self.responsePayment.transactionDetails.orderId}];
     }
+    
     [[SNPUITrackingManager shared] trackEventName:@"btn confirm payment"];
     VTConfirmPaymentController *vc = [[VTConfirmPaymentController alloc] initWithCardNumber:card.maskedNumber
                                                grossAmount:self.token.transactionDetails.grossAmount];
@@ -200,14 +206,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     MidtransSavedCardCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MidtransSavedCardCell"];
     MidtransMaskedCreditCard *card = self.cards[indexPath.row];
     cell.maskedCard = card;
-//    NSUInteger index = [self.promos indexOfObjectPassingTest:^BOOL(MidtransPromo * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-//        for (NSString *bin in obj.bins) {
-//            return [card.maskedNumber containsString:bin];
-//        }
-//        return NO;
-//    }];
-//    cell.havePromo = index != NSNotFound;
-//    cell.bankName = [self bankNameFromNumber:card.maskedNumber];
+    cell.bankName = [self bankNameFromNumber:card.maskedNumber];
     return cell;
 }
 
@@ -240,6 +239,7 @@ - (void)totalAmountBorderedViewTapped:(id) sender {
     MidtransTransactionDetailViewController *transactionViewController = [[MidtransTransactionDetailViewController alloc] initWithNibName:@"MidtransTransactionDetailViewController" bundle:VTBundle];
     [transactionViewController presentAtPositionOfView:self.totalAmountBorderedView items:self.token.itemDetails];
 }
+
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     return 55;
 }
diff --git a/MidtransKit/MidtransKit/classes/MidtransUIPaymentDirectView.h b/MidtransKit/MidtransKit/classes/MidtransUIPaymentDirectView.h
index 9199f0b47..20a10bdf4 100644
--- a/MidtransKit/MidtransKit/classes/MidtransUIPaymentDirectView.h
+++ b/MidtransKit/MidtransKit/classes/MidtransUIPaymentDirectView.h
@@ -22,6 +22,7 @@
 @property (weak, nonatomic) IBOutlet UILabel *totalAmountTextLabel;
 @property (weak, nonatomic) IBOutlet UILabel *topLabelText;
 @property (weak, nonatomic) IBOutlet UIImageView *disclosureButtonImage;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 
 - (void)initViewWithPaymentID:(NSString *)paymentMethodID email:(NSString *)email;
 - (MidtransVAType)paymentTypeWithID:(NSString *)paymentMethodID ;
diff --git a/MidtransKit/MidtransKit/classes/MidtransUIPaymentDirectViewController.m b/MidtransKit/MidtransKit/classes/MidtransUIPaymentDirectViewController.m
index 12b0c24f3..aad3f0964 100644
--- a/MidtransKit/MidtransKit/classes/MidtransUIPaymentDirectViewController.m
+++ b/MidtransKit/MidtransKit/classes/MidtransUIPaymentDirectViewController.m
@@ -47,6 +47,7 @@ - (void)viewDidLoad {
     [[SNPUITrackingManager shared] trackEventName:[NSString stringWithFormat:@"pg %@",self.paymentMethod.shortName]];
     [self addNavigationToTextFields:@[self.view.emailTextField]];
     self.view.totalAmountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber;
+    self.view.orderIdLabel.text = self.token.transactionDetails.orderId;
     self.view.instructionTitleLabel.text = [NSString stringWithFormat:[VTClassHelper getTranslationFromAppBundleForString:@"%@ step by step"], self.paymentMethod.title];
     if ([[MidtransDeviceHelper deviceCurrentLanguage] isEqualToString:@"id"]) {
         self.view.instructionTitleLabel.text = [NSString stringWithFormat:@" Panduan pembayaran melalui %@", self.paymentMethod.title];
diff --git a/MidtransKit/MidtransKit/classes/MidtransVAViewController.m b/MidtransKit/MidtransKit/classes/MidtransVAViewController.m
index 814d74f4d..86c6e9c62 100644
--- a/MidtransKit/MidtransKit/classes/MidtransVAViewController.m
+++ b/MidtransKit/MidtransKit/classes/MidtransVAViewController.m
@@ -36,6 +36,7 @@ @interface MidtransVAViewController () <UITableViewDelegate, UITableViewDataSour
 @property (nonatomic) BOOL isShowInstruction;
 @property (nonatomic) CGFloat currentTableViewHieght;
 @property (nonatomic) MidtransVAType paymentType;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 @end
 
 @implementation MidtransVAViewController
@@ -58,6 +59,7 @@ - (void)viewDidLoad {
     [self.tableView registerNib:[UINib nibWithNibName:@"VTGuideCell" bundle:VTBundle] forCellReuseIdentifier:@"VTGuideCell"];
     
     self.amountLabel.text = [self.token.itemDetails formattedPriceAmount];
+    self.orderIdLabel.text = self.token.transactionDetails.orderId;
     
     self.headerView = [self.tableView dequeueReusableCellWithIdentifier:@"MidtransVAHeader"];
     [self.headerView.tabSwitch addTarget:self action:@selector(tabChanged:) forControlEvents:UIControlEventValueChanged];
diff --git a/MidtransKit/MidtransKit/classes/SNPPostPaymentVAViewController.m b/MidtransKit/MidtransKit/classes/SNPPostPaymentVAViewController.m
index 373de1001..73e31ad9a 100644
--- a/MidtransKit/MidtransKit/classes/SNPPostPaymentVAViewController.m
+++ b/MidtransKit/MidtransKit/classes/SNPPostPaymentVAViewController.m
@@ -28,6 +28,7 @@ @interface SNPPostPaymentVAViewController ()<UITableViewDataSource,UITableViewDe
 @property (nonatomic) SNPPostPaymentHeader *headerView;
 @property (nonatomic) SNPPostPaymentHeaderBillPay *headerViewBillPay;
 @property (nonatomic) SNPPostPaymentFooter *footerView;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView;
 @end
 
@@ -58,6 +59,7 @@ - (void)viewDidLoad {
     }
     [self.tableView registerNib:[UINib nibWithNibName:@"SNPPostPaymentFooter" bundle:VTBundle] forCellReuseIdentifier:@"SNPPostPaymentFooter"];
     self.totalAmountLabel.text = [self.token.itemDetails formattedPriceAmount];
+    self.orderIdLabel.text = self.token.transactionDetails.orderId;
     [self.tableView registerNib:[UINib nibWithNibName:@"VTGuideCell" bundle:VTBundle] forCellReuseIdentifier:@"VTGuideCell"];
     
     self.footerView = [self.tableView dequeueReusableCellWithIdentifier:@"SNPPostPaymentFooter"];
diff --git a/MidtransKit/MidtransKit/classes/VTMandiriClickpayController.m b/MidtransKit/MidtransKit/classes/VTMandiriClickpayController.m
index e40b3452a..846c0853b 100755
--- a/MidtransKit/MidtransKit/classes/VTMandiriClickpayController.m
+++ b/MidtransKit/MidtransKit/classes/VTMandiriClickpayController.m
@@ -33,6 +33,7 @@ @interface VTMandiriClickpayController () <MidtransUITextFieldDelegate>
 @property (weak, nonatomic) IBOutlet UIView *instructionPage;
 @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *instructionviewHeightConstraints;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 
 @property (nonatomic) MidtransUICardFormatter *ccFormatter;
 
@@ -75,7 +76,7 @@ - (void)viewDidLoad {
     self.input1Label.text = [MidtransMandiriClickpayHelper generateInput1FromCardNumber:self.debitNumberTextField.text];
     self.input2Label.text = [MidtransMandiriClickpayHelper generateInput2FromGrossAmount:self.token.transactionDetails.grossAmount];
     self.input3Label.text = [MidtransMandiriClickpayHelper generateInput3];
-    
+    self.orderIdLabel.text = self.token.transactionDetails.orderId;
     self.amountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber;
     self.mandiriClickpayStepLabel.text = [NSString stringWithFormat:[VTClassHelper getTranslationFromAppBundleForString:@"%@ step by step"], self.paymentMethod.title];
     self.keyTokenLabel.text = [VTClassHelper getTranslationFromAppBundleForString:@"Key token device is required for this payment method"];
diff --git a/MidtransKit/MidtransKit/classes/VTPaymentListController.m b/MidtransKit/MidtransKit/classes/VTPaymentListController.m
index 34daeead4..4edf5757b 100644
--- a/MidtransKit/MidtransKit/classes/VTPaymentListController.m
+++ b/MidtransKit/MidtransKit/classes/VTPaymentListController.m
@@ -354,7 +354,7 @@ - (void)redirectToPaymentMethodAtIndex:(NSInteger)index {
         [self.navigationController pushViewController:vc animated:!self.singlePayment];
     }
     else if ([paymentMethod.internalBaseClassIdentifier isEqualToString:MIDTRANS_PAYMENT_DANAMON_ONLINE]) {
-        MIDDanamonOnlineViewController* vc = [[MIDDanamonOnlineViewController alloc] initWithToken:self.token paymentMethodName:paymentMethod];
+        MIDDanamonOnlineViewController *vc = [[MIDDanamonOnlineViewController alloc] initWithToken:self.token paymentMethodName:paymentMethod];
         [vc showDismissButton:self.singlePayment];
         [self.navigationController pushViewController:vc animated:YES];
     }
diff --git a/MidtransKit/MidtransKit/classes/VTVAListController.m b/MidtransKit/MidtransKit/classes/VTVAListController.m
index 00fad08f5..bc2b85d5f 100644
--- a/MidtransKit/MidtransKit/classes/VTVAListController.m
+++ b/MidtransKit/MidtransKit/classes/VTVAListController.m
@@ -22,6 +22,7 @@ @interface VTVAListController ()<UITableViewDelegate,UITableViewDataSource>
 @property (weak, nonatomic) IBOutlet UILabel *totalAmountTextLabel;
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
 @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView;
+@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel;
 @property (nonatomic) NSArray *vaList;
 @end
 
@@ -60,8 +61,10 @@ - (void)viewDidLoad {
     }
 
     self.vaList = vaListM;
+    
     self.tableView.tableFooterView = [UIView new];
     self.totalAmountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber;
+    self.orderIdLabel.text = self.token.transactionDetails.orderId;
     if (self.vaList.count == 1) {
         [self redirectToIndex:0];
     }
diff --git a/MidtransKit/MidtransKit/resources/MidGopayViewController.xib b/MidtransKit/MidtransKit/resources/MidGopayViewController.xib
index aab6b26ee..c69546fdf 100644
--- a/MidtransKit/MidtransKit/resources/MidGopayViewController.xib
+++ b/MidtransKit/MidtransKit/resources/MidGopayViewController.xib
@@ -16,6 +16,9 @@
         <array key="SourceSansPro-Regular.ttf">
             <string>SourceSansPro-Regular</string>
         </array>
+        <array key="SourceSansPro-Semibold.ttf">
+            <string>SourceSansPro-Semibold</string>
+        </array>
     </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MidGopayViewController">
@@ -25,20 +28,20 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="Yam-FI-530" customClass="MIDGopayView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="822"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Y5U-NC-hLV">
                     <rect key="frame" x="0.0" y="0.0" width="414" height="40"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GO-JEK app is required for this payment method" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QNo-dZ-Mle">
-                            <rect key="frame" x="76.666666666666657" y="13.333333333333336" width="262.66666666666674" height="14"/>
+                            <rect key="frame" x="76.333333333333343" y="13.333333333333336" width="262.66666666666663" height="14"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="12"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="gojek_icon.png" translatesAutoresizingMaskIntoConstraints="NO" id="sJe-hw-1CB">
-                            <rect key="frame" x="52.333333333333336" y="12" width="20.333333333333336" height="20"/>
+                            <rect key="frame" x="52" y="12" width="20.333333333333329" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="JeF-50-S9Z"/>
                                 <constraint firstAttribute="height" constant="20" id="cvj-9D-J8J"/>
@@ -56,7 +59,7 @@
                     </constraints>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s8x-V1-Alg" customClass="MidtransUINextStepButton">
-                    <rect key="frame" x="8" y="687" width="398" height="40"/>
+                    <rect key="frame" x="8" y="773" width="398" height="40"/>
                     <color key="backgroundColor" red="0.098039215690000001" green="0.63921568630000003" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="GD5-FD-qrL"/>
@@ -67,48 +70,12 @@
                         <action selector="finishPaymentButtonDidTapped:" destination="-1" eventType="touchUpInside" id="cPT-B4-RHQ"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eVB-ga-8OO" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="629" width="414" height="50"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yqh-z1-Bc9">
-                            <rect key="frame" x="15" y="17.666666666666629" width="76.666666666666671" height="15.333333333333336"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
-                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hhk-VJ-mVw">
-                            <rect key="frame" x="358.33333333333331" y="0.0" width="40.666666666666686" height="50"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                    </subviews>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    <constraints>
-                        <constraint firstItem="hhk-VJ-mVw" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="yqh-z1-Bc9" secondAttribute="trailing" constant="8" id="CJi-kF-09C"/>
-                        <constraint firstAttribute="bottom" secondItem="hhk-VJ-mVw" secondAttribute="bottom" id="QVv-l0-IsD"/>
-                        <constraint firstAttribute="height" constant="50" id="TEe-pg-THU"/>
-                        <constraint firstAttribute="trailing" secondItem="hhk-VJ-mVw" secondAttribute="trailing" constant="15" id="ln6-th-EhX"/>
-                        <constraint firstItem="hhk-VJ-mVw" firstAttribute="top" secondItem="eVB-ga-8OO" secondAttribute="top" id="o70-cP-bwd"/>
-                        <constraint firstItem="yqh-z1-Bc9" firstAttribute="leading" secondItem="eVB-ga-8OO" secondAttribute="leading" constant="15" id="ox7-Ih-jGc"/>
-                        <constraint firstItem="yqh-z1-Bc9" firstAttribute="centerY" secondItem="hhk-VJ-mVw" secondAttribute="centerY" id="qud-5q-EeR"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
-                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
-                            <integer key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="pX0-Tu-wuZ">
-                    <rect key="frame" x="0.0" y="40" width="414" height="589"/>
+                    <rect key="frame" x="0.0" y="40" width="414" height="659"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </tableView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QS6-Er-iLj">
-                    <rect key="frame" x="0.0" y="40" width="414" height="589"/>
+                    <rect key="frame" x="0.0" y="40" width="414" height="659"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_no_gopay.png" translatesAutoresizingMaskIntoConstraints="NO" id="AMa-cV-OCw">
                             <rect key="frame" x="67" y="120" width="279" height="80"/>
@@ -132,7 +99,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Are-Z5-Oob">
-                            <rect key="frame" x="8" y="551" width="398" height="30"/>
+                            <rect key="frame" x="8" y="621" width="398" height="30"/>
                             <color key="tintColor" red="0.091509331753330828" green="0.60178134854116272" blue="0.89301327720207258" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <state key="normal" title="Install GO-JEK app from Appstore">
                                 <color key="titleColor" red="0.0063865571279999997" green="0.62833845619999995" blue="0.78163856269999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -156,6 +123,72 @@
                         <constraint firstItem="3Xg-Nq-qIQ" firstAttribute="centerX" secondItem="QS6-Er-iLj" secondAttribute="centerX" id="xHv-1C-aG3"/>
                     </constraints>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cJu-Zb-7tT" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="699" width="414" height="74"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SFi-JX-Qb1">
+                            <rect key="frame" x="15" y="17.666666666666629" width="76.666666666666671" height="16.333333333333329"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2m5-VU-zGm">
+                            <rect key="frame" x="338" y="0.0" width="36" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="vwp-GH-UiH">
+                            <rect key="frame" x="379" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="4CP-jS-kzx"/>
+                                <constraint firstAttribute="width" constant="20" id="G1k-ww-Mve"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ejS-ph-qSL">
+                            <rect key="frame" x="15" y="49" width="166" height="15.333333333333329"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oqx-ek-yHO">
+                            <rect key="frame" x="212" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="17" id="2wq-98-VgO"/>
+                                <constraint firstAttribute="width" constant="178" id="kcT-gS-zTX"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="11"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="vwp-GH-UiH" firstAttribute="centerY" secondItem="cJu-Zb-7tT" secondAttribute="centerY" constant="-12" id="1pS-fM-IoU"/>
+                        <constraint firstAttribute="trailing" secondItem="vwp-GH-UiH" secondAttribute="trailing" constant="15" id="5gr-wt-KaV"/>
+                        <constraint firstItem="SFi-JX-Qb1" firstAttribute="leading" secondItem="cJu-Zb-7tT" secondAttribute="leading" constant="15" id="94t-VS-v50"/>
+                        <constraint firstAttribute="bottom" secondItem="2m5-VU-zGm" secondAttribute="bottom" constant="24" id="Cm2-a9-m8s"/>
+                        <constraint firstItem="SFi-JX-Qb1" firstAttribute="centerY" secondItem="2m5-VU-zGm" secondAttribute="centerY" id="FqF-GZ-Kd6"/>
+                        <constraint firstItem="2m5-VU-zGm" firstAttribute="top" secondItem="cJu-Zb-7tT" secondAttribute="top" id="Nv2-VF-FSR"/>
+                        <constraint firstAttribute="trailing" secondItem="Oqx-ek-yHO" secondAttribute="trailing" constant="24" id="VxT-A9-I2K"/>
+                        <constraint firstItem="Oqx-ek-yHO" firstAttribute="leading" secondItem="ejS-ph-qSL" secondAttribute="trailing" constant="31" id="Xb0-7f-I7r"/>
+                        <constraint firstItem="ejS-ph-qSL" firstAttribute="top" secondItem="cJu-Zb-7tT" secondAttribute="top" constant="49" id="azS-4q-OxX"/>
+                        <constraint firstItem="Oqx-ek-yHO" firstAttribute="top" secondItem="cJu-Zb-7tT" secondAttribute="top" constant="49" id="cYA-4U-jdN"/>
+                        <constraint firstItem="ejS-ph-qSL" firstAttribute="leading" secondItem="cJu-Zb-7tT" secondAttribute="leading" constant="15" id="ey2-Mc-51d"/>
+                        <constraint firstAttribute="height" constant="74" id="m07-5J-GsC"/>
+                        <constraint firstItem="2m5-VU-zGm" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="SFi-JX-Qb1" secondAttribute="trailing" constant="8" id="qUS-a6-4JT"/>
+                        <constraint firstAttribute="trailing" secondItem="2m5-VU-zGm" secondAttribute="trailing" constant="40" id="zdR-Qi-qdT"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
+                            <integer key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
+                    </userDefinedRuntimeAttributes>
+                </view>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
             <constraints>
@@ -165,40 +198,40 @@
                 <constraint firstItem="QS6-Er-iLj" firstAttribute="leading" secondItem="Yam-FI-530" secondAttribute="leading" id="B2P-yI-upg"/>
                 <constraint firstAttribute="bottom" secondItem="s8x-V1-Alg" secondAttribute="bottom" constant="9" id="CXx-s5-xYc"/>
                 <constraint firstAttribute="trailing" secondItem="s8x-V1-Alg" secondAttribute="trailing" constant="8" id="Cze-u7-tbc"/>
-                <constraint firstItem="eVB-ga-8OO" firstAttribute="top" secondItem="QS6-Er-iLj" secondAttribute="bottom" id="JLk-L7-Qqj"/>
                 <constraint firstItem="QS6-Er-iLj" firstAttribute="top" secondItem="Y5U-NC-hLV" secondAttribute="bottom" id="L3E-88-FsP"/>
                 <constraint firstAttribute="trailing" secondItem="QS6-Er-iLj" secondAttribute="trailing" id="Lcq-nN-ZDO"/>
                 <constraint firstItem="Y5U-NC-hLV" firstAttribute="top" secondItem="Yam-FI-530" secondAttribute="top" id="NPG-sQ-hpH"/>
                 <constraint firstItem="pX0-Tu-wuZ" firstAttribute="leading" secondItem="Yam-FI-530" secondAttribute="leading" id="PBF-Ej-zsU"/>
+                <constraint firstItem="cJu-Zb-7tT" firstAttribute="top" secondItem="pX0-Tu-wuZ" secondAttribute="bottom" id="SU3-U9-vZ0"/>
                 <constraint firstAttribute="trailing" secondItem="Y5U-NC-hLV" secondAttribute="trailing" id="Shb-2N-82d"/>
                 <constraint firstItem="s8x-V1-Alg" firstAttribute="leading" secondItem="Yam-FI-530" secondAttribute="leading" constant="8" id="Tbh-QI-70i"/>
-                <constraint firstItem="eVB-ga-8OO" firstAttribute="leading" secondItem="Yam-FI-530" secondAttribute="leading" id="Ujg-Ma-8ec"/>
+                <constraint firstAttribute="trailing" secondItem="cJu-Zb-7tT" secondAttribute="trailing" id="a0Y-3K-aSj"/>
                 <constraint firstItem="Y5U-NC-hLV" firstAttribute="leading" secondItem="Yam-FI-530" secondAttribute="leading" id="dqP-3V-pkt"/>
-                <constraint firstItem="s8x-V1-Alg" firstAttribute="top" secondItem="eVB-ga-8OO" secondAttribute="bottom" constant="8" id="ju5-Zm-bLf"/>
-                <constraint firstAttribute="bottom" secondItem="eVB-ga-8OO" secondAttribute="bottom" constant="57" id="lCv-qi-uzQ"/>
-                <constraint firstAttribute="trailing" secondItem="eVB-ga-8OO" secondAttribute="trailing" id="lGy-XU-R5U"/>
-                <constraint firstItem="eVB-ga-8OO" firstAttribute="top" secondItem="pX0-Tu-wuZ" secondAttribute="bottom" id="nbR-Od-cEe"/>
+                <constraint firstItem="s8x-V1-Alg" firstAttribute="top" secondItem="cJu-Zb-7tT" secondAttribute="bottom" id="qAT-Pc-DUD"/>
+                <constraint firstItem="cJu-Zb-7tT" firstAttribute="top" secondItem="QS6-Er-iLj" secondAttribute="bottom" id="ssx-ww-F00"/>
+                <constraint firstItem="cJu-Zb-7tT" firstAttribute="leading" secondItem="Yam-FI-530" secondAttribute="leading" id="zoh-02-Oul"/>
             </constraints>
             <connections>
-                <outlet property="amountLabel" destination="hhk-VJ-mVw" id="F7o-Wj-uuh"/>
+                <outlet property="amountLabel" destination="2m5-VU-zGm" id="Fh6-bg-jG7"/>
                 <outlet property="finishPaymentButton" destination="s8x-V1-Alg" id="3Z1-Hx-gLf"/>
                 <outlet property="finishPaymentHeightConstraints" destination="GD5-FD-qrL" id="gFK-Zh-8T7"/>
                 <outlet property="gopayTopViewHeightConstraints" destination="Y1T-XL-9vW" id="Lkj-FY-zbo"/>
                 <outlet property="gopayTopViewWrapper" destination="Y5U-NC-hLV" id="OVX-Hs-xIz"/>
                 <outlet property="installGojekButton" destination="Are-Z5-Oob" id="sFg-3d-xXM"/>
+                <outlet property="orderIdLabel" destination="Oqx-ek-yHO" id="ezY-MD-5UJ"/>
                 <outlet property="tableView" destination="pX0-Tu-wuZ" id="uYi-hH-MFa"/>
                 <outlet property="topNoticeLabel" destination="QNo-dZ-Mle" id="pYr-bc-GSv"/>
                 <outlet property="topNoticeLogo" destination="sJe-hw-1CB" id="ocv-FZ-ZYz"/>
                 <outlet property="topWrapperView" destination="QS6-Er-iLj" id="av8-Cj-H4S"/>
-                <outlet property="totalAmountLabel" destination="yqh-z1-Bc9" id="2Wv-sT-HTw"/>
-                <outlet property="transactionBottomDetailConstraints" destination="lCv-qi-uzQ" id="Qeq-Hv-wsP"/>
-                <outlet property="transactionDetailWrapper" destination="eVB-ga-8OO" id="rE6-Yj-VwF"/>
+                <outlet property="totalAmountLabel" destination="SFi-JX-Qb1" id="M83-UK-eYg"/>
+                <outlet property="transactionDetailWrapper" destination="cJu-Zb-7tT" id="K6e-Ss-9vI"/>
             </connections>
-            <point key="canvasLocation" x="-175" y="-1292"/>
+            <point key="canvasLocation" x="-175" y="-1249"/>
         </view>
     </objects>
     <resources>
         <image name="gojek_icon.png" width="14" height="16"/>
         <image name="ic_no_gopay.png" width="73" height="79"/>
+        <image name="icon-help.png" width="12" height="12"/>
     </resources>
 </document>
diff --git a/MidtransKit/MidtransKit/resources/MidtransNewCreditCardViewController.xib b/MidtransKit/MidtransKit/resources/MidtransNewCreditCardViewController.xib
index 72c8ef4bc..a03d3b3ff 100644
--- a/MidtransKit/MidtransKit/resources/MidtransNewCreditCardViewController.xib
+++ b/MidtransKit/MidtransKit/resources/MidtransNewCreditCardViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -44,17 +44,17 @@
                     </connections>
                 </button>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K39-0u-IJj" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="630" width="414" height="50"/>
+                    <rect key="frame" x="0.0" y="606" width="414" height="74"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l67-Ku-WeL">
-                            <rect key="frame" x="15" y="17.333333333333371" width="73.666666666666671" height="16.666666666666671"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <rect key="frame" x="15" y="18" width="76.666666666666671" height="15.333333333333336"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Xe-08-1kx">
-                            <rect key="frame" x="336.66666666666669" y="0.0" width="37.333333333333314" height="50"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
+                            <rect key="frame" x="338" y="0.0" width="36" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="XOO-e2-kal">
@@ -64,18 +64,39 @@
                                 <constraint firstAttribute="width" constant="20" id="c9l-1f-P5r"/>
                             </constraints>
                         </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gQ9-MU-rFI">
+                            <rect key="frame" x="15" y="49" width="166" height="15.333333333333329"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rBp-NV-YCD">
+                            <rect key="frame" x="212" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="17" id="HdC-qq-BVr"/>
+                                <constraint firstAttribute="width" constant="178" id="ZSJ-Fe-JR1"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="11"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstItem="XOO-e2-kal" firstAttribute="centerY" secondItem="K39-0u-IJj" secondAttribute="centerY" id="5Jd-eh-CLv"/>
+                        <constraint firstItem="XOO-e2-kal" firstAttribute="centerY" secondItem="K39-0u-IJj" secondAttribute="centerY" constant="-12" id="5Jd-eh-CLv"/>
                         <constraint firstAttribute="trailing" secondItem="XOO-e2-kal" secondAttribute="trailing" constant="15" id="82V-0q-TTF"/>
                         <constraint firstItem="l67-Ku-WeL" firstAttribute="centerY" secondItem="9Xe-08-1kx" secondAttribute="centerY" id="Pwa-7l-a6P"/>
+                        <constraint firstItem="rBp-NV-YCD" firstAttribute="leading" secondItem="gQ9-MU-rFI" secondAttribute="trailing" constant="31" id="SQb-W4-u4P"/>
                         <constraint firstAttribute="trailing" secondItem="9Xe-08-1kx" secondAttribute="trailing" constant="40" id="TGE-sZ-ZdU"/>
-                        <constraint firstAttribute="bottom" secondItem="9Xe-08-1kx" secondAttribute="bottom" id="gFc-zv-2Qn"/>
+                        <constraint firstItem="gQ9-MU-rFI" firstAttribute="leading" secondItem="K39-0u-IJj" secondAttribute="leading" constant="15" id="UpF-4H-Qvt"/>
+                        <constraint firstAttribute="bottom" secondItem="9Xe-08-1kx" secondAttribute="bottom" constant="24" id="gFc-zv-2Qn"/>
+                        <constraint firstItem="gQ9-MU-rFI" firstAttribute="top" secondItem="K39-0u-IJj" secondAttribute="top" constant="49" id="hnZ-GM-IZr"/>
                         <constraint firstItem="l67-Ku-WeL" firstAttribute="leading" secondItem="K39-0u-IJj" secondAttribute="leading" constant="15" id="lew-RP-kdq"/>
+                        <constraint firstItem="rBp-NV-YCD" firstAttribute="top" secondItem="K39-0u-IJj" secondAttribute="top" constant="49" id="lxF-sN-v4g"/>
                         <constraint firstItem="9Xe-08-1kx" firstAttribute="top" secondItem="K39-0u-IJj" secondAttribute="top" id="mOU-1f-WZe"/>
                         <constraint firstItem="9Xe-08-1kx" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="l67-Ku-WeL" secondAttribute="trailing" constant="8" id="pJN-Cz-OiM"/>
-                        <constraint firstAttribute="height" constant="50" id="sDC-EK-i1s"/>
+                        <constraint firstAttribute="trailing" secondItem="rBp-NV-YCD" secondAttribute="trailing" constant="24" id="qhl-XF-cei"/>
+                        <constraint firstAttribute="height" constant="74" id="sDC-EK-i1s"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
@@ -89,7 +110,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ACd-RD-scv">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="633"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="606"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nkU-qA-ZcM">
                             <rect key="frame" x="0.0" y="0.0" width="414" height="497"/>
@@ -307,12 +328,12 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstItem="K39-0u-IJj" firstAttribute="top" secondItem="ACd-RD-scv" secondAttribute="bottom" id="6Kv-QN-H1k"/>
                 <constraint firstItem="7l5-VJ-9Eb" firstAttribute="top" secondItem="K39-0u-IJj" secondAttribute="bottom" constant="8" id="DkS-ej-YHt"/>
                 <constraint firstItem="ACd-RD-scv" firstAttribute="top" secondItem="HhS-r6-FLV" secondAttribute="top" id="I95-wd-7kg"/>
                 <constraint firstAttribute="trailing" secondItem="7l5-VJ-9Eb" secondAttribute="trailing" constant="8" id="JYC-Uk-GD8"/>
                 <constraint firstItem="ACd-RD-scv" firstAttribute="leading" secondItem="HhS-r6-FLV" secondAttribute="leading" id="Jac-gk-BDd"/>
                 <constraint firstAttribute="trailing" secondItem="K39-0u-IJj" secondAttribute="trailing" id="RNm-HW-aHZ"/>
-                <constraint firstItem="K39-0u-IJj" firstAttribute="top" secondItem="ACd-RD-scv" secondAttribute="bottom" constant="-3" id="Sah-kW-q73"/>
                 <constraint firstItem="7l5-VJ-9Eb" firstAttribute="leading" secondItem="HhS-r6-FLV" secondAttribute="leading" constant="8" id="Vql-vr-LJX"/>
                 <constraint firstItem="ACd-RD-scv" firstAttribute="width" secondItem="HhS-r6-FLV" secondAttribute="width" id="cwZ-fi-E30"/>
                 <constraint firstAttribute="bottom" secondItem="7l5-VJ-9Eb" secondAttribute="bottom" constant="8" id="kwq-if-PS5"/>
@@ -333,6 +354,7 @@
                 <outlet property="finishPaymentButton" destination="7l5-VJ-9Eb" id="c2f-k4-DeS"/>
                 <outlet property="installmentView" destination="Lfj-Hs-yBs" id="DUG-Ih-LO1"/>
                 <outlet property="installmentWrapperViewConstraints" destination="24o-px-pgN" id="44U-Ga-HGI"/>
+                <outlet property="orderIdTextLabel" destination="rBp-NV-YCD" id="bdq-I1-a5P"/>
                 <outlet property="promoTableView" destination="TK4-U5-dCK" id="tCS-Bd-bLq"/>
                 <outlet property="promoTableViewHeightConstraints" destination="8fJ-VY-pHA" id="WgT-nI-tV4"/>
                 <outlet property="scrollView" destination="ACd-RD-scv" id="bKZ-Wf-ov6"/>
diff --git a/MidtransKit/MidtransKit/resources/MidtransPaymentGCIViewController.xib b/MidtransKit/MidtransKit/resources/MidtransPaymentGCIViewController.xib
index 2d3cc1d02..dff7008de 100644
--- a/MidtransKit/MidtransKit/resources/MidtransPaymentGCIViewController.xib
+++ b/MidtransKit/MidtransKit/resources/MidtransPaymentGCIViewController.xib
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_0" orientation="portrait">
+    <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -27,17 +27,17 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT" customClass="MidtransPaymentGCIView">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wcX-hG-shX">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="422"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="598"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rDh-U7-L1q">
-                            <rect key="frame" x="0.0" y="0.0" width="320" height="141"/>
+                            <rect key="frame" x="0.0" y="0.0" width="414" height="141"/>
                             <subviews>
                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Your gift card number" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wvs-u7-GxZ" customClass="MidtransUITextField">
-                                    <rect key="frame" x="8" y="21" width="304" height="50"/>
+                                    <rect key="frame" x="8" y="21" width="398" height="50"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="50" id="K02-rY-qBy"/>
                                     </constraints>
@@ -54,7 +54,7 @@
                                     </connections>
                                 </textField>
                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="PIN" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bJK-h8-j7b" customClass="MidtransUITextField">
-                                    <rect key="frame" x="8" y="81" width="304" height="50"/>
+                                    <rect key="frame" x="8" y="81" width="398" height="50"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="50" id="r1b-H0-KcU"/>
                                     </constraints>
@@ -90,7 +90,7 @@
                     </constraints>
                 </scrollView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Dm-zH-Vuz" customClass="MidtransUINextStepButton">
-                    <rect key="frame" x="8" y="520" width="304" height="40"/>
+                    <rect key="frame" x="8" y="688" width="398" height="40"/>
                     <color key="backgroundColor" red="0.098039215690000001" green="0.63921568630000003" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="Pgn-o2-BsX"/>
@@ -101,81 +101,69 @@
                         <action selector="confirmPaymentButtonDidTapped:" destination="-1" eventType="touchUpInside" id="OYx-5R-db3"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gCd-AT-Gu2" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="422" width="320" height="45"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WQi-FL-s23" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="606" width="414" height="74"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Kl-VV-TBV">
-                            <rect key="frame" x="220" y="13" width="60" height="20"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ceq-gF-pUn">
-                            <rect key="frame" x="15" y="15" width="77" height="15.5"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jYX-ug-7Ph">
+                            <rect key="frame" x="15" y="18" width="76.666666666666671" height="15.333333333333336"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="dVu-rL-Fd1">
-                            <rect key="frame" x="290" y="14.5" width="15" height="15"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ar1-2H-egb">
+                            <rect key="frame" x="330.66666666666669" y="0.0" width="43.333333333333314" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="kwI-Za-vbe">
+                            <rect key="frame" x="379" y="15" width="20" height="20"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="15" id="I6e-cM-Gel"/>
-                                <constraint firstAttribute="width" constant="15" id="oI0-Lm-3S8"/>
+                                <constraint firstAttribute="width" constant="20" id="N2l-CP-9Dh"/>
+                                <constraint firstAttribute="height" constant="20" id="qJv-a4-VNT"/>
                             </constraints>
                         </imageView>
-                    </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstAttribute="trailing" secondItem="1Kl-VV-TBV" secondAttribute="trailing" constant="40" id="0BN-gv-DyI"/>
-                        <constraint firstAttribute="height" constant="45" id="W7Z-PB-Ebe"/>
-                        <constraint firstItem="ceq-gF-pUn" firstAttribute="centerY" secondItem="gCd-AT-Gu2" secondAttribute="centerY" id="WN8-BE-Nya"/>
-                        <constraint firstItem="ceq-gF-pUn" firstAttribute="leading" secondItem="gCd-AT-Gu2" secondAttribute="leading" constant="15" id="d2a-tl-iVp"/>
-                        <constraint firstItem="1Kl-VV-TBV" firstAttribute="centerY" secondItem="gCd-AT-Gu2" secondAttribute="centerY" id="fKU-hb-umN"/>
-                        <constraint firstAttribute="trailing" secondItem="dVu-rL-Fd1" secondAttribute="trailing" constant="15" id="uN5-4M-veP"/>
-                        <constraint firstItem="dVu-rL-Fd1" firstAttribute="centerY" secondItem="gCd-AT-Gu2" secondAttribute="centerY" id="yRg-XO-AkB"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
-                            <integer key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="77U-Ay-SE0" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="467" width="320" height="45"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i0D-3I-196">
-                            <rect key="frame" x="245.5" y="13" width="59.5" height="20"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gO0-VM-1c3">
+                            <rect key="frame" x="15" y="49" width="166" height="15.333333333333329"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TnD-3w-eWR">
-                            <rect key="frame" x="15" y="15" width="49.5" height="15.5"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OzQ-7l-zhi">
+                            <rect key="frame" x="221" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="178" id="YaS-fY-3dh"/>
+                                <constraint firstAttribute="height" constant="17" id="Zyt-aA-QK2"/>
+                            </constraints>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="trailing" secondItem="i0D-3I-196" secondAttribute="trailing" constant="15" id="2Kd-FE-Sic"/>
-                        <constraint firstItem="TnD-3w-eWR" firstAttribute="centerY" secondItem="77U-Ay-SE0" secondAttribute="centerY" id="B51-tY-kGB"/>
-                        <constraint firstAttribute="height" constant="45" id="X8Y-Ip-Una"/>
-                        <constraint firstItem="i0D-3I-196" firstAttribute="centerY" secondItem="77U-Ay-SE0" secondAttribute="centerY" id="dTb-oH-F8G"/>
-                        <constraint firstItem="TnD-3w-eWR" firstAttribute="leading" secondItem="77U-Ay-SE0" secondAttribute="leading" constant="15" id="tKq-pd-9x5"/>
+                        <constraint firstItem="ar1-2H-egb" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="jYX-ug-7Ph" secondAttribute="trailing" constant="8" id="6d8-ku-xQw"/>
+                        <constraint firstAttribute="bottom" secondItem="ar1-2H-egb" secondAttribute="bottom" constant="24" id="APg-pr-4Us"/>
+                        <constraint firstItem="jYX-ug-7Ph" firstAttribute="leading" secondItem="WQi-FL-s23" secondAttribute="leading" constant="15" id="AYV-B5-EI3"/>
+                        <constraint firstAttribute="trailing" secondItem="ar1-2H-egb" secondAttribute="trailing" constant="40" id="B2M-Dh-JEt"/>
+                        <constraint firstItem="gO0-VM-1c3" firstAttribute="top" secondItem="WQi-FL-s23" secondAttribute="top" constant="49" id="BJL-EO-wf8"/>
+                        <constraint firstItem="jYX-ug-7Ph" firstAttribute="centerY" secondItem="ar1-2H-egb" secondAttribute="centerY" id="E5X-Wc-e8D"/>
+                        <constraint firstItem="ar1-2H-egb" firstAttribute="top" secondItem="WQi-FL-s23" secondAttribute="top" id="H6H-0V-Uku"/>
+                        <constraint firstAttribute="trailing" secondItem="kwI-Za-vbe" secondAttribute="trailing" constant="15" id="Kg8-F0-CaO"/>
+                        <constraint firstItem="OzQ-7l-zhi" firstAttribute="top" secondItem="WQi-FL-s23" secondAttribute="top" constant="49" id="QXh-jI-KzE"/>
+                        <constraint firstAttribute="trailing" secondItem="OzQ-7l-zhi" secondAttribute="trailing" constant="15" id="eWS-eO-HtG"/>
+                        <constraint firstItem="gO0-VM-1c3" firstAttribute="leading" secondItem="WQi-FL-s23" secondAttribute="leading" constant="15" id="fcZ-0u-1ku"/>
+                        <constraint firstItem="OzQ-7l-zhi" firstAttribute="leading" secondItem="gO0-VM-1c3" secondAttribute="trailing" constant="40" id="jxh-mZ-vrb"/>
+                        <constraint firstAttribute="height" constant="74" id="pcx-If-IH0"/>
+                        <constraint firstItem="kwI-Za-vbe" firstAttribute="centerY" secondItem="WQi-FL-s23" secondAttribute="centerY" constant="-12" id="twM-6s-5gi"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
                         <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
                             <integer key="value" value="1"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
                     </userDefinedRuntimeAttributes>
                 </view>
@@ -184,27 +172,25 @@
             <constraints>
                 <constraint firstItem="wcX-hG-shX" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" id="2R8-al-xTb"/>
                 <constraint firstItem="wcX-hG-shX" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="7ij-x9-v6b"/>
-                <constraint firstItem="gCd-AT-Gu2" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="ESM-U3-yHo"/>
+                <constraint firstItem="WQi-FL-s23" firstAttribute="top" secondItem="wcX-hG-shX" secondAttribute="bottom" constant="8" id="DPM-VZ-DZj"/>
                 <constraint firstItem="wcX-hG-shX" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="H3H-ox-Uzk"/>
+                <constraint firstItem="WQi-FL-s23" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Jvw-Oo-TPS"/>
                 <constraint firstAttribute="trailing" secondItem="wcX-hG-shX" secondAttribute="trailing" id="LKY-We-D1W"/>
-                <constraint firstItem="0Dm-zH-Vuz" firstAttribute="top" secondItem="77U-Ay-SE0" secondAttribute="bottom" constant="8" id="Lm3-Dl-3WL"/>
+                <constraint firstItem="WQi-FL-s23" firstAttribute="width" secondItem="i5M-Pr-FkT" secondAttribute="width" id="MA6-kO-YEs"/>
                 <constraint firstAttribute="trailing" secondItem="0Dm-zH-Vuz" secondAttribute="trailing" constant="8" id="RDI-yy-dnh"/>
                 <constraint firstItem="0Dm-zH-Vuz" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="Rgx-we-UXZ"/>
-                <constraint firstAttribute="trailing" secondItem="77U-Ay-SE0" secondAttribute="trailing" id="Z9S-zO-Yma"/>
-                <constraint firstItem="gCd-AT-Gu2" firstAttribute="top" secondItem="wcX-hG-shX" secondAttribute="bottom" id="lNF-xL-crB"/>
+                <constraint firstItem="0Dm-zH-Vuz" firstAttribute="top" secondItem="WQi-FL-s23" secondAttribute="bottom" constant="8" id="bJO-IM-BwZ"/>
+                <constraint firstAttribute="trailing" secondItem="WQi-FL-s23" secondAttribute="trailing" id="jc2-dk-NIA"/>
                 <constraint firstAttribute="bottom" secondItem="0Dm-zH-Vuz" secondAttribute="bottom" constant="8" id="nUe-Sn-XbD"/>
-                <constraint firstItem="77U-Ay-SE0" firstAttribute="top" secondItem="gCd-AT-Gu2" secondAttribute="bottom" id="omj-NW-M7H"/>
-                <constraint firstItem="77U-Ay-SE0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="rk4-or-I1t"/>
-                <constraint firstAttribute="trailing" secondItem="gCd-AT-Gu2" secondAttribute="trailing" id="vYi-4M-cFj"/>
             </constraints>
             <connections>
-                <outlet property="amountTotalLabel" destination="1Kl-VV-TBV" id="I7n-rz-Gkp"/>
+                <outlet property="amountTotalLabel" destination="ar1-2H-egb" id="lNH-Kv-NJ2"/>
                 <outlet property="confirmButton" destination="0Dm-zH-Vuz" id="xbz-b9-EGg"/>
                 <outlet property="gciCardTextField" destination="wvs-u7-GxZ" id="kQw-5U-X5f"/>
-                <outlet property="orderIdLabel" destination="i0D-3I-196" id="29b-ZW-sdf"/>
+                <outlet property="orderIdLabel" destination="OzQ-7l-zhi" id="1P4-4h-bWx"/>
                 <outlet property="passwordTextField" destination="bJK-h8-j7b" id="RK8-Bj-GC9"/>
-                <outlet property="totalAmountBorderedView" destination="gCd-AT-Gu2" id="efr-eL-CMT"/>
-                <outlet property="totalAmountLabel" destination="ceq-gF-pUn" id="cE0-G9-fji"/>
+                <outlet property="totalAmountBorderedView" destination="WQi-FL-s23" id="5a6-pn-ymf"/>
+                <outlet property="totalAmountLabel" destination="jYX-ug-7Ph" id="aY2-vx-Bxb"/>
             </connections>
             <point key="canvasLocation" x="-193" y="-27"/>
         </view>
diff --git a/MidtransKit/MidtransKit/resources/MidtransSavedCardController.xib b/MidtransKit/MidtransKit/resources/MidtransSavedCardController.xib
index e742dc0e1..c0c24126b 100644
--- a/MidtransKit/MidtransKit/resources/MidtransSavedCardController.xib
+++ b/MidtransKit/MidtransKit/resources/MidtransSavedCardController.xib
@@ -12,14 +12,18 @@
         <array key="SourceSansPro-Regular.ttf">
             <string>SourceSansPro-Regular</string>
         </array>
+        <array key="SourceSansPro-Semibold.ttf">
+            <string>SourceSansPro-Semibold</string>
+        </array>
     </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MidtransSavedCardController">
             <connections>
+                <outlet property="orderIdLabel" destination="LzQ-W1-x1f" id="DTn-Lo-92e"/>
                 <outlet property="tableView" destination="sRF-eW-0qL" id="Ib8-Ov-OMe"/>
-                <outlet property="totalAmountBorderedView" destination="ejL-LW-yzS" id="UDG-ut-ZLj"/>
-                <outlet property="totalAmountLabel" destination="nSR-Al-hih" id="1zU-fb-v0G"/>
-                <outlet property="totalAmountText" destination="O34-3Z-pCh" id="tD9-Pb-ba9"/>
+                <outlet property="totalAmountBorderedView" destination="41S-wL-GSQ" id="E8V-f4-3hv"/>
+                <outlet property="totalAmountLabel" destination="Nht-Vy-c8E" id="koq-VY-MLB"/>
+                <outlet property="totalAmountText" destination="KqQ-b5-M8v" id="KXf-Wa-RlX"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
@@ -29,42 +33,63 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="sRF-eW-0qL">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="617"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="593"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </tableView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ejL-LW-yzS" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="617" width="375" height="50"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="41S-wL-GSQ" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="593" width="375" height="74"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O34-3Z-pCh">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KqQ-b5-M8v">
                             <rect key="frame" x="15" y="18" width="77" height="15.5"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nSR-Al-hih">
-                            <rect key="frame" x="291.5" y="0.0" width="43.5" height="50"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nht-Vy-c8E">
+                            <rect key="frame" x="299" y="0.0" width="36" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="1nC-lU-4YK">
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="bRm-MX-Bva">
                             <rect key="frame" x="340" y="15" width="20" height="20"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="20" id="LOv-Ef-Bsn"/>
-                                <constraint firstAttribute="height" constant="20" id="WIw-3O-KW4"/>
+                                <constraint firstAttribute="height" constant="20" id="LGe-fr-joe"/>
+                                <constraint firstAttribute="width" constant="20" id="cfD-l5-ZUk"/>
                             </constraints>
                         </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9RG-tE-2Ln">
+                            <rect key="frame" x="15" y="49" width="127" height="15.5"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LzQ-W1-x1f">
+                            <rect key="frame" x="173" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="178" id="9hk-QL-y8f"/>
+                                <constraint firstAttribute="height" constant="17" id="rKf-Az-V0H"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="11"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="trailing" secondItem="1nC-lU-4YK" secondAttribute="trailing" constant="15" id="2xx-90-qLI"/>
-                        <constraint firstItem="1nC-lU-4YK" firstAttribute="centerY" secondItem="ejL-LW-yzS" secondAttribute="centerY" id="Auj-vQ-7it"/>
-                        <constraint firstItem="nSR-Al-hih" firstAttribute="top" secondItem="ejL-LW-yzS" secondAttribute="top" id="HsY-0m-VXu"/>
-                        <constraint firstItem="O34-3Z-pCh" firstAttribute="centerY" secondItem="nSR-Al-hih" secondAttribute="centerY" id="JW1-Yj-0LX"/>
-                        <constraint firstAttribute="trailing" secondItem="nSR-Al-hih" secondAttribute="trailing" constant="40" id="PGd-fo-LW6"/>
-                        <constraint firstAttribute="bottom" secondItem="nSR-Al-hih" secondAttribute="bottom" id="RbO-fy-fqN"/>
-                        <constraint firstItem="nSR-Al-hih" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="O34-3Z-pCh" secondAttribute="trailing" constant="8" id="Sh8-a8-qRB"/>
-                        <constraint firstAttribute="height" constant="50" id="a5s-iH-RD5"/>
-                        <constraint firstItem="O34-3Z-pCh" firstAttribute="leading" secondItem="ejL-LW-yzS" secondAttribute="leading" constant="15" id="jDX-vU-8LD"/>
+                        <constraint firstItem="Nht-Vy-c8E" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="KqQ-b5-M8v" secondAttribute="trailing" constant="8" id="86b-TL-lPb"/>
+                        <constraint firstItem="KqQ-b5-M8v" firstAttribute="centerY" secondItem="Nht-Vy-c8E" secondAttribute="centerY" id="CM5-Az-E1a"/>
+                        <constraint firstAttribute="height" constant="74" id="Dor-dW-jgp"/>
+                        <constraint firstAttribute="bottom" secondItem="Nht-Vy-c8E" secondAttribute="bottom" constant="24" id="IfH-x7-NzP"/>
+                        <constraint firstItem="KqQ-b5-M8v" firstAttribute="leading" secondItem="41S-wL-GSQ" secondAttribute="leading" constant="15" id="Ixj-3f-gvA"/>
+                        <constraint firstItem="Nht-Vy-c8E" firstAttribute="top" secondItem="41S-wL-GSQ" secondAttribute="top" id="Oeo-b0-ZXU"/>
+                        <constraint firstItem="LzQ-W1-x1f" firstAttribute="leading" secondItem="9RG-tE-2Ln" secondAttribute="trailing" constant="31" id="aZK-A7-B5Z"/>
+                        <constraint firstAttribute="trailing" secondItem="LzQ-W1-x1f" secondAttribute="trailing" constant="24" id="chO-pX-IQ0"/>
+                        <constraint firstItem="9RG-tE-2Ln" firstAttribute="leading" secondItem="41S-wL-GSQ" secondAttribute="leading" constant="15" id="d1O-B8-Luo"/>
+                        <constraint firstAttribute="trailing" secondItem="Nht-Vy-c8E" secondAttribute="trailing" constant="40" id="eAU-cI-RhN"/>
+                        <constraint firstAttribute="trailing" secondItem="bRm-MX-Bva" secondAttribute="trailing" constant="15" id="hrU-0G-m1c"/>
+                        <constraint firstItem="bRm-MX-Bva" firstAttribute="centerY" secondItem="41S-wL-GSQ" secondAttribute="centerY" constant="-12" id="q1Y-Ez-cKj"/>
+                        <constraint firstItem="LzQ-W1-x1f" firstAttribute="top" secondItem="41S-wL-GSQ" secondAttribute="top" constant="49" id="viW-6x-4ef"/>
+                        <constraint firstItem="9RG-tE-2Ln" firstAttribute="top" secondItem="41S-wL-GSQ" secondAttribute="top" constant="49" id="wPU-UH-fZM"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
@@ -80,13 +105,13 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="ejL-LW-yzS" secondAttribute="trailing" id="M7U-RC-0mv"/>
-                <constraint firstItem="ejL-LW-yzS" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Wln-Gi-x7p"/>
+                <constraint firstAttribute="trailing" secondItem="41S-wL-GSQ" secondAttribute="trailing" id="9ro-XX-Lxd"/>
                 <constraint firstItem="sRF-eW-0qL" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="b4g-eg-Uc2"/>
-                <constraint firstAttribute="bottom" secondItem="ejL-LW-yzS" secondAttribute="bottom" id="i3I-1y-WNQ"/>
+                <constraint firstItem="41S-wL-GSQ" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="hg5-Wg-8I6"/>
                 <constraint firstItem="sRF-eW-0qL" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="joz-vs-Oik"/>
+                <constraint firstItem="41S-wL-GSQ" firstAttribute="top" secondItem="sRF-eW-0qL" secondAttribute="bottom" id="kQh-hI-Pql"/>
                 <constraint firstAttribute="trailing" secondItem="sRF-eW-0qL" secondAttribute="trailing" id="llF-wz-GkY"/>
-                <constraint firstItem="ejL-LW-yzS" firstAttribute="top" secondItem="sRF-eW-0qL" secondAttribute="bottom" id="z0h-6I-47y"/>
+                <constraint firstAttribute="bottom" secondItem="41S-wL-GSQ" secondAttribute="bottom" id="vcz-Ij-kD3"/>
             </constraints>
             <point key="canvasLocation" x="24.5" y="52.5"/>
         </view>
diff --git a/MidtransKit/MidtransKit/resources/MidtransUIPaymentDirectViewController.xib b/MidtransKit/MidtransKit/resources/MidtransUIPaymentDirectViewController.xib
index 1b0e10ae9..06a84e925 100644
--- a/MidtransKit/MidtransKit/resources/MidtransUIPaymentDirectViewController.xib
+++ b/MidtransKit/MidtransKit/resources/MidtransUIPaymentDirectViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_0" orientation="portrait">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -25,11 +25,11 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="wPm-rL-6ps" customClass="MidtransUIPaymentDirectView">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2AF-lH-6ld" customClass="MidtransUINextStepButton">
-                    <rect key="frame" x="8" y="520" width="304" height="40"/>
+                    <rect key="frame" x="8" y="619" width="359" height="40"/>
                     <color key="backgroundColor" red="0.098039215690000001" green="0.63921568630000003" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="ObZ-O5-11d"/>
@@ -58,63 +58,17 @@
                         <action selector="confirmPaymentDidTapped:" destination="-1" eventType="touchUpInside" id="gkj-Ot-TMq"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xlP-9r-rzc" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="467" width="320" height="45"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BCL-Uh-jUh">
-                            <rect key="frame" x="238.5" y="0.0" width="41.5" height="45"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6aQ-Jk-lYW">
-                            <rect key="frame" x="15" y="14.5" width="73.5" height="16.5"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
-                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="b2O-ra-xsT">
-                            <rect key="frame" x="290" y="15" width="15" height="15"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="15" id="GMG-Bb-gPW"/>
-                                <constraint firstAttribute="height" constant="15" id="qD1-wc-Uig"/>
-                            </constraints>
-                        </imageView>
-                    </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="45" id="10m-IP-loL"/>
-                        <constraint firstAttribute="trailing" secondItem="BCL-Uh-jUh" secondAttribute="trailing" constant="40" id="Ff8-W8-1I2"/>
-                        <constraint firstItem="b2O-ra-xsT" firstAttribute="centerY" secondItem="xlP-9r-rzc" secondAttribute="centerY" id="Mh9-Fl-osD"/>
-                        <constraint firstItem="6aQ-Jk-lYW" firstAttribute="centerY" secondItem="xlP-9r-rzc" secondAttribute="centerY" id="S7t-Mb-bPh"/>
-                        <constraint firstItem="6aQ-Jk-lYW" firstAttribute="leading" secondItem="xlP-9r-rzc" secondAttribute="leading" constant="15" id="g9K-aF-DAE"/>
-                        <constraint firstItem="BCL-Uh-jUh" firstAttribute="centerY" secondItem="xlP-9r-rzc" secondAttribute="centerY" id="hbv-Ma-8D2"/>
-                        <constraint firstAttribute="bottom" secondItem="BCL-Uh-jUh" secondAttribute="bottom" id="rbd-Xx-8rI"/>
-                        <constraint firstAttribute="trailing" secondItem="b2O-ra-xsT" secondAttribute="trailing" constant="15" id="w67-PW-JGS"/>
-                        <constraint firstItem="BCL-Uh-jUh" firstAttribute="top" secondItem="xlP-9r-rzc" secondAttribute="top" id="yjc-3R-92H"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
-                            <integer key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                </view>
                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xne-tQ-wBL">
-                    <rect key="frame" x="0.0" y="1" width="320" height="40"/>
+                    <rect key="frame" x="0.0" y="1" width="375" height="40"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Key token device is required for this payment method" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GMc-iO-nQV">
-                            <rect key="frame" x="26.5" y="12.5" width="267" height="15.5"/>
+                            <rect key="frame" x="44.5" y="13.5" width="286.5" height="14"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="12"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="token_key.png" translatesAutoresizingMaskIntoConstraints="NO" id="qYX-YA-Won">
-                            <rect key="frame" x="2" y="12" width="20.5" height="20"/>
+                            <rect key="frame" x="20.5" y="12" width="20" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="20" id="9TN-Of-Pds"/>
                                 <constraint firstAttribute="height" constant="20" id="JZ6-DM-QvE"/>
@@ -132,41 +86,108 @@
                     </constraints>
                 </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="PEl-TJ-zof">
-                    <rect key="frame" x="0.0" y="40" width="320" height="427"/>
+                    <rect key="frame" x="0.0" y="40" width="375" height="497"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </tableView>
                 <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="DisclosureIndicator.png" translatesAutoresizingMaskIntoConstraints="NO" id="r8K-v7-2pO">
-                    <rect key="frame" x="297" y="533.5" width="8" height="13"/>
+                    <rect key="frame" x="352" y="632.5" width="8" height="13"/>
                 </imageView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6xd-QL-aq9" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="537" width="375" height="74"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nfw-ov-zVb">
+                            <rect key="frame" x="15" y="18" width="77" height="15.5"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hUL-bY-bxG">
+                            <rect key="frame" x="299" y="0.0" width="36" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="NY4-bS-n7W">
+                            <rect key="frame" x="340" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="Yi1-uM-v0g"/>
+                                <constraint firstAttribute="width" constant="20" id="awP-gI-5bR"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7hf-Q0-SXl">
+                            <rect key="frame" x="15" y="49" width="127" height="15.5"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tPj-Av-MfK">
+                            <rect key="frame" x="173" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="17" id="NtC-IL-UVb"/>
+                                <constraint firstAttribute="width" constant="178" id="kIh-Dz-tOk"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="11"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="tPj-Av-MfK" secondAttribute="trailing" constant="24" id="2BG-lU-sp2"/>
+                        <constraint firstAttribute="trailing" secondItem="NY4-bS-n7W" secondAttribute="trailing" constant="15" id="6DI-fC-EC5"/>
+                        <constraint firstItem="hUL-bY-bxG" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Nfw-ov-zVb" secondAttribute="trailing" constant="8" id="AfN-eP-3iV"/>
+                        <constraint firstItem="tPj-Av-MfK" firstAttribute="top" secondItem="6xd-QL-aq9" secondAttribute="top" constant="49" id="HtQ-3J-Lku"/>
+                        <constraint firstItem="Nfw-ov-zVb" firstAttribute="centerY" secondItem="hUL-bY-bxG" secondAttribute="centerY" id="Ki9-Nd-OS0"/>
+                        <constraint firstItem="7hf-Q0-SXl" firstAttribute="leading" secondItem="6xd-QL-aq9" secondAttribute="leading" constant="15" id="PlP-23-SlX"/>
+                        <constraint firstItem="7hf-Q0-SXl" firstAttribute="top" secondItem="6xd-QL-aq9" secondAttribute="top" constant="49" id="QgY-a0-cKG"/>
+                        <constraint firstItem="tPj-Av-MfK" firstAttribute="leading" secondItem="7hf-Q0-SXl" secondAttribute="trailing" constant="31" id="RHa-e7-VgZ"/>
+                        <constraint firstAttribute="height" constant="74" id="TbJ-jM-DMd"/>
+                        <constraint firstItem="hUL-bY-bxG" firstAttribute="top" secondItem="6xd-QL-aq9" secondAttribute="top" id="U7f-hq-6sV"/>
+                        <constraint firstItem="NY4-bS-n7W" firstAttribute="centerY" secondItem="6xd-QL-aq9" secondAttribute="centerY" constant="-12" id="lg7-qD-efb"/>
+                        <constraint firstAttribute="trailing" secondItem="hUL-bY-bxG" secondAttribute="trailing" constant="40" id="tJZ-y4-HQ5"/>
+                        <constraint firstAttribute="bottom" secondItem="hUL-bY-bxG" secondAttribute="bottom" constant="24" id="xJw-yO-L7F"/>
+                        <constraint firstItem="Nfw-ov-zVb" firstAttribute="leading" secondItem="6xd-QL-aq9" secondAttribute="leading" constant="15" id="zvK-Ff-5hP"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
+                            <integer key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
+                    </userDefinedRuntimeAttributes>
+                </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstItem="6xd-QL-aq9" firstAttribute="top" secondItem="PEl-TJ-zof" secondAttribute="bottom" id="1bo-WK-vWq"/>
+                <constraint firstItem="6xd-QL-aq9" firstAttribute="leading" secondItem="wPm-rL-6ps" secondAttribute="leading" id="2Fh-ld-42b"/>
                 <constraint firstItem="r8K-v7-2pO" firstAttribute="centerY" secondItem="2AF-lH-6ld" secondAttribute="centerY" id="Hg8-WR-oWc"/>
                 <constraint firstAttribute="trailing" secondItem="xne-tQ-wBL" secondAttribute="trailing" id="KqC-nf-wdW"/>
+                <constraint firstItem="2AF-lH-6ld" firstAttribute="top" secondItem="6xd-QL-aq9" secondAttribute="bottom" constant="8" id="WVD-e7-yo7"/>
                 <constraint firstItem="PEl-TJ-zof" firstAttribute="top" secondItem="wPm-rL-6ps" secondAttribute="top" constant="40" id="Xpt-SO-RUI"/>
-                <constraint firstItem="xlP-9r-rzc" firstAttribute="leading" secondItem="wPm-rL-6ps" secondAttribute="leading" id="aCo-qI-ZqQ"/>
+                <constraint firstAttribute="trailing" secondItem="6xd-QL-aq9" secondAttribute="trailing" id="cgY-xp-n9g"/>
                 <constraint firstItem="2AF-lH-6ld" firstAttribute="leading" secondItem="wPm-rL-6ps" secondAttribute="leading" constant="8" id="eSX-Ee-AWh"/>
-                <constraint firstItem="xlP-9r-rzc" firstAttribute="top" secondItem="PEl-TJ-zof" secondAttribute="bottom" id="hEn-h7-cVU"/>
                 <constraint firstItem="PEl-TJ-zof" firstAttribute="leading" secondItem="wPm-rL-6ps" secondAttribute="leading" id="igk-oJ-Za9"/>
-                <constraint firstAttribute="trailing" secondItem="xlP-9r-rzc" secondAttribute="trailing" id="jOm-xf-TyH"/>
                 <constraint firstAttribute="trailing" secondItem="PEl-TJ-zof" secondAttribute="trailing" id="jV8-Pw-fUE"/>
                 <constraint firstItem="xne-tQ-wBL" firstAttribute="leading" secondItem="wPm-rL-6ps" secondAttribute="leading" id="kTH-2B-7Ke"/>
                 <constraint firstAttribute="trailing" secondItem="2AF-lH-6ld" secondAttribute="trailing" constant="8" id="owe-WM-vpB"/>
                 <constraint firstItem="xne-tQ-wBL" firstAttribute="top" secondItem="wPm-rL-6ps" secondAttribute="top" constant="1" id="qHi-w2-n5P"/>
                 <constraint firstAttribute="trailing" secondItem="r8K-v7-2pO" secondAttribute="trailing" constant="15" id="qh0-YU-Z2X"/>
-                <constraint firstItem="2AF-lH-6ld" firstAttribute="top" secondItem="xlP-9r-rzc" secondAttribute="bottom" constant="8" id="tfu-tF-dqx"/>
                 <constraint firstAttribute="bottom" secondItem="2AF-lH-6ld" secondAttribute="bottom" constant="8" id="vdO-KV-Jm7"/>
             </constraints>
             <connections>
                 <outlet property="confirmPaymentButton" destination="2AF-lH-6ld" id="E4L-OC-ega"/>
                 <outlet property="disclosureButtonImage" destination="r8K-v7-2pO" id="rkL-J0-zLe"/>
+                <outlet property="orderIdLabel" destination="tPj-Av-MfK" id="CTZ-ST-4Jw"/>
                 <outlet property="tableView" destination="PEl-TJ-zof" id="zm3-OG-oEf"/>
                 <outlet property="topConstraints" destination="Xpt-SO-RUI" id="xsw-aa-xh2"/>
                 <outlet property="topLabelText" destination="GMc-iO-nQV" id="5m7-Uz-e3q"/>
                 <outlet property="topViewConstraints" destination="0Qu-gg-ihE" id="6Ng-g9-1Ry"/>
-                <outlet property="totalAmountBorderedView" destination="xlP-9r-rzc" id="G4i-Cx-MCZ"/>
-                <outlet property="totalAmountLabel" destination="BCL-Uh-jUh" id="sAG-jF-A48"/>
-                <outlet property="totalAmountTextLabel" destination="6aQ-Jk-lYW" id="HY5-9Y-rEF"/>
+                <outlet property="totalAmountBorderedView" destination="6xd-QL-aq9" id="gzo-ph-Q2i"/>
+                <outlet property="totalAmountLabel" destination="hUL-bY-bxG" id="06R-9L-qtj"/>
+                <outlet property="totalAmountTextLabel" destination="Nfw-ov-zVb" id="X8X-a0-8tp"/>
             </connections>
             <point key="canvasLocation" x="-99" y="179"/>
         </view>
diff --git a/MidtransKit/MidtransKit/resources/MidtransUIPaymentGeneralViewController.xib b/MidtransKit/MidtransKit/resources/MidtransUIPaymentGeneralViewController.xib
index c8354e13c..8dde4d4cc 100644
--- a/MidtransKit/MidtransKit/resources/MidtransUIPaymentGeneralViewController.xib
+++ b/MidtransKit/MidtransKit/resources/MidtransUIPaymentGeneralViewController.xib
@@ -65,86 +65,8 @@
                         <constraint firstAttribute="width" constant="8" id="hlb-Um-eOc"/>
                     </constraints>
                 </imageView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qr2-Lo-cXi" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="521" width="375" height="45"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kwn-Q0-eSx">
-                            <rect key="frame" x="293" y="13" width="42" height="20"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bFb-1I-nvz">
-                            <rect key="frame" x="15" y="15" width="77" height="15.5"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
-                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="eMh-fA-VtA">
-                            <rect key="frame" x="345" y="14.5" width="15" height="15"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="15" id="4MD-d3-O04"/>
-                                <constraint firstAttribute="width" constant="15" id="AHc-AY-oac"/>
-                            </constraints>
-                        </imageView>
-                    </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstItem="bFb-1I-nvz" firstAttribute="leading" secondItem="qr2-Lo-cXi" secondAttribute="leading" constant="15" id="5ME-pK-tkZ"/>
-                        <constraint firstAttribute="height" constant="45" id="Cno-Xk-t5J"/>
-                        <constraint firstItem="eMh-fA-VtA" firstAttribute="centerY" secondItem="qr2-Lo-cXi" secondAttribute="centerY" id="Fjh-BV-XHL"/>
-                        <constraint firstAttribute="trailing" secondItem="eMh-fA-VtA" secondAttribute="trailing" constant="15" id="Kdp-7j-Ndd"/>
-                        <constraint firstItem="bFb-1I-nvz" firstAttribute="centerY" secondItem="qr2-Lo-cXi" secondAttribute="centerY" id="SXz-UA-q0x"/>
-                        <constraint firstAttribute="trailing" secondItem="Kwn-Q0-eSx" secondAttribute="trailing" constant="40" id="TrP-Gg-U8I"/>
-                        <constraint firstItem="Kwn-Q0-eSx" firstAttribute="centerY" secondItem="qr2-Lo-cXi" secondAttribute="centerY" id="aWO-vz-r6v"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
-                            <integer key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qMY-Ax-9OI" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="566" width="375" height="45"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jVf-Gi-8eJ">
-                            <rect key="frame" x="318" y="13" width="42" height="20"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ci1-eF-r93">
-                            <rect key="frame" x="15" y="15" width="49.5" height="15.5"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
-                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                    </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstItem="Ci1-eF-r93" firstAttribute="leading" secondItem="qMY-Ax-9OI" secondAttribute="leading" constant="15" id="Mkz-G7-8Pr"/>
-                        <constraint firstItem="Ci1-eF-r93" firstAttribute="centerY" secondItem="qMY-Ax-9OI" secondAttribute="centerY" id="P6s-X4-uBO"/>
-                        <constraint firstAttribute="trailing" secondItem="jVf-Gi-8eJ" secondAttribute="trailing" constant="15" id="QMW-xv-Q2g"/>
-                        <constraint firstItem="jVf-Gi-8eJ" firstAttribute="centerY" secondItem="qMY-Ax-9OI" secondAttribute="centerY" id="Y8u-0r-2Tb"/>
-                        <constraint firstAttribute="height" constant="45" id="zbR-PZ-sfI"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
-                            <integer key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HhN-9s-kLY" customClass="VTGuideView">
-                    <rect key="frame" x="0.0" y="40" width="375" height="481"/>
+                    <rect key="frame" x="0.0" y="40" width="375" height="505"/>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LgO-G4-U0Y">
@@ -174,40 +96,103 @@
                         <constraint firstItem="uvS-gN-gch" firstAttribute="leading" secondItem="YcC-5e-PBF" secondAttribute="trailing" constant="4" id="fc3-xf-DtZ"/>
                     </constraints>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9lM-Cg-QkR" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="545" width="375" height="74"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sFL-tK-2Xi">
+                            <rect key="frame" x="15" y="18" width="77" height="15.5"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yz9-NX-FBx">
+                            <rect key="frame" x="299" y="0.0" width="36" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="GlK-6h-rYe">
+                            <rect key="frame" x="340" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="20" id="kk2-wn-P1a"/>
+                                <constraint firstAttribute="height" constant="20" id="lSq-8T-jcK"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZIK-CF-9M9">
+                            <rect key="frame" x="15" y="49" width="127" height="15.5"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DcV-5D-hcb">
+                            <rect key="frame" x="173" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="178" id="P95-Lh-tbu"/>
+                                <constraint firstAttribute="height" constant="17" id="Wik-Px-qr7"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="11"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="bottom" secondItem="yz9-NX-FBx" secondAttribute="bottom" constant="24" id="1hP-jL-swq"/>
+                        <constraint firstItem="sFL-tK-2Xi" firstAttribute="leading" secondItem="9lM-Cg-QkR" secondAttribute="leading" constant="15" id="3Vk-Ez-qDb"/>
+                        <constraint firstAttribute="trailing" secondItem="yz9-NX-FBx" secondAttribute="trailing" constant="40" id="7EJ-Kv-hKZ"/>
+                        <constraint firstItem="yz9-NX-FBx" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="sFL-tK-2Xi" secondAttribute="trailing" constant="8" id="AaP-w6-Soz"/>
+                        <constraint firstItem="ZIK-CF-9M9" firstAttribute="top" secondItem="9lM-Cg-QkR" secondAttribute="top" constant="49" id="HCw-oU-VXb"/>
+                        <constraint firstAttribute="trailing" secondItem="DcV-5D-hcb" secondAttribute="trailing" constant="24" id="PtD-bQ-7Mv"/>
+                        <constraint firstAttribute="height" constant="74" id="dTE-Bu-so5"/>
+                        <constraint firstItem="DcV-5D-hcb" firstAttribute="leading" secondItem="ZIK-CF-9M9" secondAttribute="trailing" constant="31" id="fmf-zv-lXJ"/>
+                        <constraint firstItem="DcV-5D-hcb" firstAttribute="top" secondItem="9lM-Cg-QkR" secondAttribute="top" constant="49" id="gg7-4q-tcY"/>
+                        <constraint firstAttribute="trailing" secondItem="GlK-6h-rYe" secondAttribute="trailing" constant="15" id="hH5-PB-KMs"/>
+                        <constraint firstItem="ZIK-CF-9M9" firstAttribute="leading" secondItem="9lM-Cg-QkR" secondAttribute="leading" constant="15" id="hYh-tC-sKL"/>
+                        <constraint firstItem="GlK-6h-rYe" firstAttribute="centerY" secondItem="9lM-Cg-QkR" secondAttribute="centerY" constant="-12" id="sQa-xp-Zl0"/>
+                        <constraint firstItem="sFL-tK-2Xi" firstAttribute="centerY" secondItem="yz9-NX-FBx" secondAttribute="centerY" id="v2W-ge-g3P"/>
+                        <constraint firstItem="yz9-NX-FBx" firstAttribute="top" secondItem="9lM-Cg-QkR" secondAttribute="top" id="yG1-Kb-Qf2"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
+                            <integer key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
+                    </userDefinedRuntimeAttributes>
+                </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="sZp-ii-eEw" firstAttribute="top" secondItem="qMY-Ax-9OI" secondAttribute="bottom" constant="8" id="4Wv-L0-Kvl"/>
+                <constraint firstItem="sZp-ii-eEw" firstAttribute="top" secondItem="9lM-Cg-QkR" secondAttribute="bottom" id="07H-rn-Mr0"/>
+                <constraint firstAttribute="trailing" secondItem="9lM-Cg-QkR" secondAttribute="trailing" id="1db-in-WbN"/>
                 <constraint firstAttribute="trailing" secondItem="HhN-9s-kLY" secondAttribute="trailing" id="7mj-hO-akh"/>
                 <constraint firstItem="caE-g5-XQM" firstAttribute="centerY" secondItem="sZp-ii-eEw" secondAttribute="centerY" id="98G-q7-MXI"/>
                 <constraint firstItem="caE-g5-XQM" firstAttribute="trailing" secondItem="sZp-ii-eEw" secondAttribute="trailing" constant="-15" id="C7V-lo-L6a"/>
                 <constraint firstItem="HhN-9s-kLY" firstAttribute="top" secondItem="Fth-eH-mzp" secondAttribute="top" constant="40" id="ExC-va-0O5"/>
-                <constraint firstAttribute="trailing" secondItem="qMY-Ax-9OI" secondAttribute="trailing" id="L48-OK-MVq"/>
                 <constraint firstItem="sZp-ii-eEw" firstAttribute="leading" secondItem="Fth-eH-mzp" secondAttribute="leading" constant="8" id="Lnq-Ak-mLy"/>
                 <constraint firstItem="LgO-G4-U0Y" firstAttribute="top" secondItem="Fth-eH-mzp" secondAttribute="top" id="OFJ-zn-cpg"/>
+                <constraint firstItem="9lM-Cg-QkR" firstAttribute="leading" secondItem="Fth-eH-mzp" secondAttribute="leading" id="RWS-AD-qOb"/>
                 <constraint firstItem="HhN-9s-kLY" firstAttribute="leading" secondItem="Fth-eH-mzp" secondAttribute="leading" id="Uww-Xr-uWK"/>
-                <constraint firstAttribute="trailing" secondItem="qr2-Lo-cXi" secondAttribute="trailing" id="b6R-sz-dSe"/>
                 <constraint firstAttribute="trailing" secondItem="LgO-G4-U0Y" secondAttribute="trailing" id="e6K-LS-eO3"/>
-                <constraint firstItem="qr2-Lo-cXi" firstAttribute="top" secondItem="HhN-9s-kLY" secondAttribute="bottom" id="gft-Rf-cB3"/>
                 <constraint firstItem="LgO-G4-U0Y" firstAttribute="leading" secondItem="Fth-eH-mzp" secondAttribute="leading" id="haC-WR-U7Q"/>
-                <constraint firstItem="qMY-Ax-9OI" firstAttribute="top" secondItem="qr2-Lo-cXi" secondAttribute="bottom" id="pE3-AM-0jm"/>
-                <constraint firstItem="qr2-Lo-cXi" firstAttribute="leading" secondItem="Fth-eH-mzp" secondAttribute="leading" id="t0Q-WT-kgr"/>
-                <constraint firstItem="qMY-Ax-9OI" firstAttribute="leading" secondItem="Fth-eH-mzp" secondAttribute="leading" id="utU-Ih-wel"/>
+                <constraint firstItem="9lM-Cg-QkR" firstAttribute="top" secondItem="HhN-9s-kLY" secondAttribute="bottom" id="mnC-xO-JBC"/>
                 <constraint firstAttribute="trailing" secondItem="sZp-ii-eEw" secondAttribute="trailing" constant="8" id="xBh-PN-TcB"/>
                 <constraint firstAttribute="bottom" secondItem="sZp-ii-eEw" secondAttribute="bottom" constant="8" id="zmS-Dt-fGE"/>
             </constraints>
             <connections>
                 <outlet property="confirmPaymentButton" destination="sZp-ii-eEw" id="qQj-db-u0I"/>
                 <outlet property="guideView" destination="HhN-9s-kLY" id="RjU-dG-swV"/>
-                <outlet property="orderIdLabel" destination="jVf-Gi-8eJ" id="HaP-Uh-n8J"/>
+                <outlet property="orderIdLabel" destination="DcV-5D-hcb" id="XU3-tr-AT3"/>
                 <outlet property="tokenView" destination="LgO-G4-U0Y" id="JZd-um-3Re"/>
                 <outlet property="tokenViewConstraints" destination="cfB-9E-uy4" id="3kV-9T-Vxr"/>
                 <outlet property="tokenViewIcon" destination="YcC-5e-PBF" id="kL6-gY-KE2"/>
                 <outlet property="tokenViewLabel" destination="uvS-gN-gch" id="P3W-Jg-ibJ"/>
                 <outlet property="topConstraints" destination="ExC-va-0O5" id="IRA-Ev-gOD"/>
-                <outlet property="totalAmountBorderedView" destination="qr2-Lo-cXi" id="dGK-UR-0uM"/>
-                <outlet property="totalAmountLabel" destination="Kwn-Q0-eSx" id="RRm-tx-GQ8"/>
-                <outlet property="totalAmountLabelText" destination="bFb-1I-nvz" id="bIG-yW-mDH"/>
+                <outlet property="totalAmountBorderedView" destination="9lM-Cg-QkR" id="eri-fu-cwj"/>
+                <outlet property="totalAmountLabel" destination="yz9-NX-FBx" id="axN-Hd-9yr"/>
+                <outlet property="totalAmountLabelText" destination="sFL-tK-2Xi" id="dG5-nI-Xih"/>
             </connections>
             <point key="canvasLocation" x="24.5" y="51.5"/>
         </view>
diff --git a/MidtransKit/MidtransKit/resources/MidtransVAViewController.xib b/MidtransKit/MidtransKit/resources/MidtransVAViewController.xib
index 83d41de42..552d0f8a4 100644
--- a/MidtransKit/MidtransKit/resources/MidtransVAViewController.xib
+++ b/MidtransKit/MidtransKit/resources/MidtransVAViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -19,22 +19,22 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MidtransVAViewController">
             <connections>
-                <outlet property="amountLabel" destination="cZV-8u-zU8" id="aXP-o1-TPG"/>
+                <outlet property="amountLabel" destination="Lg8-Nr-kXc" id="yp1-Zp-GR1"/>
+                <outlet property="orderIdLabel" destination="wOf-Zo-A5E" id="bUo-yW-bxp"/>
                 <outlet property="payButton" destination="f0E-ny-Zs0" id="dsa-vz-Xbx"/>
                 <outlet property="tableView" destination="xxN-vw-CNQ" id="X5f-wb-coT"/>
-                <outlet property="tableViewHeightConstraints" destination="K2Z-0s-eVA" id="XJY-5f-Z2w"/>
-                <outlet property="totalAmountBorderedView" destination="erp-2z-2Fc" id="Ahz-4O-pwp"/>
-                <outlet property="totalAmountLabel" destination="QBs-HF-cHt" id="b1F-A4-EwO"/>
+                <outlet property="totalAmountBorderedView" destination="jGS-wi-do7" id="ibo-GN-CkI"/>
+                <outlet property="totalAmountLabel" destination="WX5-0b-wNM" id="FMs-U0-C6x"/>
                 <outlet property="view" destination="1gO-fv-cPn" id="7rL-Kl-zYL"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="1gO-fv-cPn">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f0E-ny-Zs0" customClass="MidtransUINextStepButton">
-                    <rect key="frame" x="8" y="619" width="359" height="40"/>
+                    <rect key="frame" x="8" y="683" width="398" height="40"/>
                     <color key="backgroundColor" red="0.098039215690000001" green="0.63921568630000003" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="YfF-GY-5MI"/>
@@ -45,81 +45,102 @@
                         <action selector="payPressed:" destination="-1" eventType="touchUpInside" id="nby-N1-dpt"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="erp-2z-2Fc" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="566" width="375" height="45"/>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="xxN-vw-CNQ">
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="601"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                </tableView>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="DisclosureIndicator.png" translatesAutoresizingMaskIntoConstraints="NO" id="9uX-Fq-Xtj">
+                    <rect key="frame" x="391" y="697" width="8" height="13"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="13" id="NGI-UR-g0L"/>
+                        <constraint firstAttribute="width" constant="8" id="tqQ-ah-qng"/>
+                    </constraints>
+                </imageView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jGS-wi-do7" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="601" width="414" height="74"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cZV-8u-zU8">
-                            <rect key="frame" x="295.5" y="12" width="39.5" height="21.5"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WX5-0b-wNM">
+                            <rect key="frame" x="15" y="18" width="76.666666666666671" height="15.333333333333336"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QBs-HF-cHt">
-                            <rect key="frame" x="15" y="14.5" width="73.5" height="16.5"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lg8-Nr-kXc">
+                            <rect key="frame" x="330.66666666666669" y="0.0" width="43.333333333333314" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="4GI-li-WTG">
+                            <rect key="frame" x="379" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="20" id="dbn-51-aee"/>
+                                <constraint firstAttribute="height" constant="20" id="zLQ-ka-5RY"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="f7b-TR-kFe">
+                            <rect key="frame" x="15" y="49" width="166" height="15.333333333333329"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="Gpe-Dq-rTQ">
-                            <rect key="frame" x="345" y="15" width="15" height="15"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wOf-Zo-A5E">
+                            <rect key="frame" x="221" y="49" width="178" height="17"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="15" id="PPZ-9s-SC2"/>
-                                <constraint firstAttribute="height" constant="15" id="v4Q-BX-GnM"/>
+                                <constraint firstAttribute="width" constant="178" id="1d4-Ro-YJK"/>
+                                <constraint firstAttribute="height" constant="17" id="GbP-qc-qMr"/>
                             </constraints>
-                        </imageView>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="trailing" secondItem="Gpe-Dq-rTQ" secondAttribute="trailing" constant="15" id="Hy6-br-Tqd"/>
-                        <constraint firstAttribute="height" constant="45" id="dQo-bt-Ydk"/>
-                        <constraint firstAttribute="trailing" secondItem="cZV-8u-zU8" secondAttribute="trailing" constant="40" id="noY-pV-ffJ"/>
-                        <constraint firstItem="QBs-HF-cHt" firstAttribute="leading" secondItem="erp-2z-2Fc" secondAttribute="leading" constant="15" id="pAe-2M-8HM"/>
-                        <constraint firstItem="QBs-HF-cHt" firstAttribute="centerY" secondItem="erp-2z-2Fc" secondAttribute="centerY" id="rsG-MS-0eT"/>
-                        <constraint firstItem="cZV-8u-zU8" firstAttribute="centerY" secondItem="erp-2z-2Fc" secondAttribute="centerY" id="wq5-cJ-WYF"/>
-                        <constraint firstItem="Gpe-Dq-rTQ" firstAttribute="centerY" secondItem="erp-2z-2Fc" secondAttribute="centerY" id="zUR-yJ-si1"/>
+                        <constraint firstAttribute="trailing" secondItem="Lg8-Nr-kXc" secondAttribute="trailing" constant="40" id="7uh-ji-Uex"/>
+                        <constraint firstItem="f7b-TR-kFe" firstAttribute="leading" secondItem="jGS-wi-do7" secondAttribute="leading" constant="15" id="CPv-gv-TXh"/>
+                        <constraint firstItem="f7b-TR-kFe" firstAttribute="top" secondItem="jGS-wi-do7" secondAttribute="top" constant="49" id="SWH-yI-deT"/>
+                        <constraint firstAttribute="trailing" secondItem="4GI-li-WTG" secondAttribute="trailing" constant="15" id="WEE-cy-Va5"/>
+                        <constraint firstItem="WX5-0b-wNM" firstAttribute="leading" secondItem="jGS-wi-do7" secondAttribute="leading" constant="15" id="baP-mX-zML"/>
+                        <constraint firstItem="Lg8-Nr-kXc" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="WX5-0b-wNM" secondAttribute="trailing" constant="8" id="cav-lz-PxA"/>
+                        <constraint firstItem="wOf-Zo-A5E" firstAttribute="leading" secondItem="f7b-TR-kFe" secondAttribute="trailing" constant="40" id="emD-lo-9ib"/>
+                        <constraint firstItem="wOf-Zo-A5E" firstAttribute="top" secondItem="jGS-wi-do7" secondAttribute="top" constant="49" id="gBI-mu-rwt"/>
+                        <constraint firstItem="Lg8-Nr-kXc" firstAttribute="top" secondItem="jGS-wi-do7" secondAttribute="top" id="jI9-7Y-03t"/>
+                        <constraint firstItem="WX5-0b-wNM" firstAttribute="centerY" secondItem="Lg8-Nr-kXc" secondAttribute="centerY" id="k84-2s-30h"/>
+                        <constraint firstItem="4GI-li-WTG" firstAttribute="centerY" secondItem="jGS-wi-do7" secondAttribute="centerY" constant="-12" id="pob-QX-ufo"/>
+                        <constraint firstAttribute="trailing" secondItem="wOf-Zo-A5E" secondAttribute="trailing" constant="15" id="qjX-eU-tt8"/>
+                        <constraint firstAttribute="bottom" secondItem="Lg8-Nr-kXc" secondAttribute="bottom" constant="24" id="r9U-34-mus"/>
+                        <constraint firstAttribute="height" constant="74" id="rAR-5c-H6a"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
                         <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
                             <integer key="value" value="1"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="xxN-vw-CNQ">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="566"/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="566" id="K2Z-0s-eVA"/>
-                    </constraints>
-                </tableView>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="DisclosureIndicator.png" translatesAutoresizingMaskIntoConstraints="NO" id="9uX-Fq-Xtj">
-                    <rect key="frame" x="352" y="633" width="8" height="13"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="13" id="NGI-UR-g0L"/>
-                        <constraint firstAttribute="width" constant="8" id="tqQ-ah-qng"/>
-                    </constraints>
-                </imageView>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="f0E-ny-Zs0" firstAttribute="top" secondItem="erp-2z-2Fc" secondAttribute="bottom" constant="8" id="DgL-AP-P46"/>
-                <constraint firstItem="erp-2z-2Fc" firstAttribute="leading" secondItem="1gO-fv-cPn" secondAttribute="leading" id="LDP-kV-SEA"/>
-                <constraint firstAttribute="bottom" secondItem="f0E-ny-Zs0" secondAttribute="bottom" constant="8" id="MgY-1t-rJt"/>
+                <constraint firstItem="f0E-ny-Zs0" firstAttribute="top" secondItem="jGS-wi-do7" secondAttribute="bottom" constant="8" id="JER-2s-2Oa"/>
                 <constraint firstAttribute="trailing" secondItem="9uX-Fq-Xtj" secondAttribute="trailing" constant="15" id="Obu-3i-nzg"/>
-                <constraint firstItem="xxN-vw-CNQ" firstAttribute="top" secondItem="1gO-fv-cPn" secondAttribute="top" id="Toi-jP-1QK"/>
+                <constraint firstItem="xxN-vw-CNQ" firstAttribute="leading" secondItem="1gO-fv-cPn" secondAttribute="leading" id="VVV-fg-buX"/>
+                <constraint firstItem="xxN-vw-CNQ" firstAttribute="width" secondItem="1gO-fv-cPn" secondAttribute="width" id="VoU-Ry-0st"/>
+                <constraint firstAttribute="trailing" secondItem="jGS-wi-do7" secondAttribute="trailing" id="Wvq-mB-Jgi"/>
+                <constraint firstItem="xxN-vw-CNQ" firstAttribute="top" secondItem="1gO-fv-cPn" secondAttribute="top" id="Yc9-dW-Umk"/>
+                <constraint firstAttribute="trailing" secondItem="xxN-vw-CNQ" secondAttribute="trailing" id="aIG-vO-87S"/>
+                <constraint firstItem="jGS-wi-do7" firstAttribute="width" secondItem="1gO-fv-cPn" secondAttribute="width" id="aOD-Kv-dWB"/>
                 <constraint firstAttribute="trailing" secondItem="f0E-ny-Zs0" secondAttribute="trailing" constant="8" id="cBw-ID-Qws"/>
-                <constraint firstItem="xxN-vw-CNQ" firstAttribute="leading" secondItem="1gO-fv-cPn" secondAttribute="leading" id="fOK-sl-bw4"/>
-                <constraint firstAttribute="trailing" secondItem="xxN-vw-CNQ" secondAttribute="trailing" id="gE7-Ce-lAL"/>
-                <constraint firstItem="erp-2z-2Fc" firstAttribute="top" secondItem="xxN-vw-CNQ" secondAttribute="bottom" id="hWt-sx-s64"/>
+                <constraint firstAttribute="bottom" secondItem="f0E-ny-Zs0" secondAttribute="bottom" constant="13" id="cYh-CJ-dTq"/>
                 <constraint firstItem="f0E-ny-Zs0" firstAttribute="leading" secondItem="1gO-fv-cPn" secondAttribute="leading" constant="8" id="jj5-Ue-UPj"/>
-                <constraint firstAttribute="trailing" secondItem="erp-2z-2Fc" secondAttribute="trailing" id="vSh-J5-IW5"/>
+                <constraint firstItem="jGS-wi-do7" firstAttribute="leading" secondItem="1gO-fv-cPn" secondAttribute="leading" id="lX8-Wo-U3h"/>
+                <constraint firstItem="jGS-wi-do7" firstAttribute="top" secondItem="xxN-vw-CNQ" secondAttribute="bottom" id="sCH-NP-yet"/>
                 <constraint firstItem="9uX-Fq-Xtj" firstAttribute="centerY" secondItem="f0E-ny-Zs0" secondAttribute="centerY" id="wxf-Oa-tGg"/>
             </constraints>
-            <point key="canvasLocation" x="-104.5" y="173.5"/>
+            <point key="canvasLocation" x="-105" y="173"/>
         </view>
     </objects>
     <resources>
diff --git a/MidtransKit/MidtransKit/resources/SNPPostPaymentGeneralViewController.xib b/MidtransKit/MidtransKit/resources/SNPPostPaymentGeneralViewController.xib
index 5b465e8dd..07c378421 100644
--- a/MidtransKit/MidtransKit/resources/SNPPostPaymentGeneralViewController.xib
+++ b/MidtransKit/MidtransKit/resources/SNPPostPaymentGeneralViewController.xib
@@ -19,7 +19,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SNPPostPaymentGeneralViewController">
             <connections>
-                <outlet property="totalAmountLabel" destination="bXg-rB-5CU" id="4dE-Mt-N3G"/>
+                <outlet property="totalAmountLabel" destination="1Tp-c6-kOJ" id="6eB-pw-HZv"/>
                 <outlet property="view" destination="Bok-Rm-EbP" id="Z5U-bH-bXO"/>
             </connections>
         </placeholder>
@@ -29,7 +29,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="QLe-sD-jYO">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="537"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="mMO-tb-b20"/>
@@ -48,70 +48,92 @@
                         <action selector="finishPaymentDidtapped:" destination="-1" eventType="touchUpInside" id="FpB-CC-QYU"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="s4F-bM-mvq" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="566" width="375" height="45"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pMa-w0-5ca" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="537" width="375" height="74"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bXg-rB-5CU">
-                            <rect key="frame" x="293" y="13.5" width="42" height="20"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eYM-Xg-Dvs">
+                            <rect key="frame" x="15" y="18" width="77" height="15.5"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Tp-c6-kOJ">
+                            <rect key="frame" x="299" y="0.0" width="36" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y3N-5x-Vzl">
-                            <rect key="frame" x="15" y="15" width="77" height="15.5"/>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="M1v-i9-BEz">
+                            <rect key="frame" x="340" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="20" id="107-It-Z7h"/>
+                                <constraint firstAttribute="height" constant="20" id="a8z-ir-Xgx"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5as-bn-kGp">
+                            <rect key="frame" x="15" y="49" width="127" height="15.5"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="gg1-eE-MNx">
-                            <rect key="frame" x="345" y="15.5" width="15" height="15"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JCi-RX-o3d">
+                            <rect key="frame" x="173" y="49" width="178" height="17"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="15" id="ae8-Ai-AUK"/>
-                                <constraint firstAttribute="height" constant="15" id="c6I-Tn-hWA"/>
+                                <constraint firstAttribute="width" constant="178" id="C8m-78-cOb"/>
+                                <constraint firstAttribute="height" constant="17" id="CVC-Fm-5N8"/>
                             </constraints>
-                        </imageView>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="11"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="trailing" secondItem="bXg-rB-5CU" secondAttribute="trailing" constant="40" id="2Ed-1E-KXV"/>
-                        <constraint firstItem="bXg-rB-5CU" firstAttribute="centerY" secondItem="s4F-bM-mvq" secondAttribute="centerY" id="Cua-RY-ief"/>
-                        <constraint firstItem="Y3N-5x-Vzl" firstAttribute="centerY" secondItem="s4F-bM-mvq" secondAttribute="centerY" id="F0k-2p-zie"/>
-                        <constraint firstAttribute="trailing" secondItem="gg1-eE-MNx" secondAttribute="trailing" constant="15" id="FR3-lE-xxK"/>
-                        <constraint firstItem="Y3N-5x-Vzl" firstAttribute="leading" secondItem="s4F-bM-mvq" secondAttribute="leading" constant="15" id="GmP-W9-aHt"/>
-                        <constraint firstAttribute="height" constant="45" id="e7X-nA-GvD"/>
-                        <constraint firstItem="gg1-eE-MNx" firstAttribute="centerY" secondItem="bXg-rB-5CU" secondAttribute="centerY" id="uly-F9-JT7"/>
+                        <constraint firstAttribute="height" constant="74" id="0YK-yJ-NoH"/>
+                        <constraint firstAttribute="trailing" secondItem="1Tp-c6-kOJ" secondAttribute="trailing" constant="40" id="MJf-dN-7Pe"/>
+                        <constraint firstAttribute="trailing" secondItem="JCi-RX-o3d" secondAttribute="trailing" constant="24" id="PWv-gg-Fff"/>
+                        <constraint firstItem="5as-bn-kGp" firstAttribute="leading" secondItem="pMa-w0-5ca" secondAttribute="leading" constant="15" id="XGI-Om-Sr6"/>
+                        <constraint firstAttribute="bottom" secondItem="1Tp-c6-kOJ" secondAttribute="bottom" constant="24" id="ZNg-AA-mJn"/>
+                        <constraint firstItem="1Tp-c6-kOJ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="eYM-Xg-Dvs" secondAttribute="trailing" constant="8" id="ePF-ST-wps"/>
+                        <constraint firstItem="eYM-Xg-Dvs" firstAttribute="leading" secondItem="pMa-w0-5ca" secondAttribute="leading" constant="15" id="jlz-Hb-vaw"/>
+                        <constraint firstItem="eYM-Xg-Dvs" firstAttribute="centerY" secondItem="1Tp-c6-kOJ" secondAttribute="centerY" id="kDg-wP-6JR"/>
+                        <constraint firstAttribute="trailing" secondItem="M1v-i9-BEz" secondAttribute="trailing" constant="15" id="oje-Hg-NZ2"/>
+                        <constraint firstItem="JCi-RX-o3d" firstAttribute="top" secondItem="pMa-w0-5ca" secondAttribute="top" constant="49" id="pbW-v4-itL"/>
+                        <constraint firstItem="M1v-i9-BEz" firstAttribute="centerY" secondItem="pMa-w0-5ca" secondAttribute="centerY" constant="-12" id="pgg-ci-MMi"/>
+                        <constraint firstItem="1Tp-c6-kOJ" firstAttribute="top" secondItem="pMa-w0-5ca" secondAttribute="top" id="qSs-PQ-zRV"/>
+                        <constraint firstItem="JCi-RX-o3d" firstAttribute="leading" secondItem="5as-bn-kGp" secondAttribute="trailing" constant="31" id="rv1-WX-GYX"/>
+                        <constraint firstItem="5as-bn-kGp" firstAttribute="top" secondItem="pMa-w0-5ca" secondAttribute="top" constant="49" id="vqX-v2-vc5"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
                         <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
                             <integer key="value" value="1"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
                     </userDefinedRuntimeAttributes>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="cav-Dr-p3x" firstAttribute="top" secondItem="s4F-bM-mvq" secondAttribute="bottom" constant="8" id="97u-2W-ngq"/>
-                <constraint firstItem="s4F-bM-mvq" firstAttribute="leading" secondItem="Bok-Rm-EbP" secondAttribute="leading" id="A4B-XU-akP"/>
                 <constraint firstItem="QLe-sD-jYO" firstAttribute="width" secondItem="Bok-Rm-EbP" secondAttribute="width" id="AcS-61-M6Z"/>
+                <constraint firstItem="pMa-w0-5ca" firstAttribute="leading" secondItem="Bok-Rm-EbP" secondAttribute="leading" id="DOe-js-4It"/>
                 <constraint firstItem="QLe-sD-jYO" firstAttribute="leading" secondItem="Bok-Rm-EbP" secondAttribute="leading" id="IQH-fi-R1x"/>
                 <constraint firstItem="cav-Dr-p3x" firstAttribute="leading" secondItem="Bok-Rm-EbP" secondAttribute="leading" constant="8" id="K5b-k0-t2S"/>
+                <constraint firstAttribute="trailing" secondItem="pMa-w0-5ca" secondAttribute="trailing" id="Nhe-Wc-3h1"/>
                 <constraint firstAttribute="trailing" secondItem="QLe-sD-jYO" secondAttribute="trailing" id="PHJ-24-iDY"/>
+                <constraint firstItem="pMa-w0-5ca" firstAttribute="top" secondItem="QLe-sD-jYO" secondAttribute="bottom" id="Sc4-N6-bBy"/>
                 <constraint firstAttribute="trailing" secondItem="cav-Dr-p3x" secondAttribute="trailing" constant="8" id="TbT-Q8-J4N"/>
                 <constraint firstItem="QLe-sD-jYO" firstAttribute="top" secondItem="Bok-Rm-EbP" secondAttribute="top" id="axs-ib-cbv"/>
                 <constraint firstAttribute="bottom" secondItem="cav-Dr-p3x" secondAttribute="bottom" constant="8" id="m9f-HH-Xix"/>
-                <constraint firstAttribute="trailing" secondItem="s4F-bM-mvq" secondAttribute="trailing" id="uRV-e5-HVi"/>
-                <constraint firstItem="s4F-bM-mvq" firstAttribute="top" secondItem="QLe-sD-jYO" secondAttribute="bottom" constant="7" id="w5M-vs-8nO"/>
+                <constraint firstItem="cav-Dr-p3x" firstAttribute="top" secondItem="pMa-w0-5ca" secondAttribute="bottom" constant="8" id="ujX-zk-aee"/>
             </constraints>
             <connections>
                 <outlet property="finishPaymentButton" destination="cav-Dr-p3x" id="vEe-IE-tVL"/>
+                <outlet property="orderIdLabel" destination="JCi-RX-o3d" id="mkS-4O-CEx"/>
                 <outlet property="tableView" destination="QLe-sD-jYO" id="8jR-oV-fcq"/>
-                <outlet property="totalAmountBorderedView" destination="s4F-bM-mvq" id="uYF-7r-qpg"/>
-                <outlet property="totalAmountLabel" destination="bXg-rB-5CU" id="Ixh-Mo-6r9"/>
+                <outlet property="totalAmountBorderedView" destination="pMa-w0-5ca" id="haE-hF-NAp"/>
             </connections>
             <point key="canvasLocation" x="34.5" y="53.5"/>
         </view>
diff --git a/MidtransKit/MidtransKit/resources/SNPPostPaymentVAViewController.xib b/MidtransKit/MidtransKit/resources/SNPPostPaymentVAViewController.xib
index f2ce66377..0c2d026ed 100644
--- a/MidtransKit/MidtransKit/resources/SNPPostPaymentVAViewController.xib
+++ b/MidtransKit/MidtransKit/resources/SNPPostPaymentVAViewController.xib
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
+    <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -20,27 +20,24 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SNPPostPaymentVAViewController">
             <connections>
                 <outlet property="finishPaymentButton" destination="sgi-C0-gbw" id="cJY-fV-1lv"/>
-                <outlet property="tableVIewConstraints" destination="GHK-YM-9AN" id="jFC-sJ-Rav"/>
+                <outlet property="orderIdLabel" destination="isA-B2-VNL" id="ZIc-pF-ap1"/>
                 <outlet property="tableView" destination="aZJ-84-F0O" id="gUd-py-47X"/>
-                <outlet property="totalAmountBorderedView" destination="cJb-M5-yYW" id="gn7-EA-iJ2"/>
-                <outlet property="totalAmountLabel" destination="MQT-JC-0iG" id="OzX-fB-SAn"/>
+                <outlet property="totalAmountBorderedView" destination="qME-Cx-xOT" id="KAx-cB-5TP"/>
+                <outlet property="totalAmountLabel" destination="ryu-0d-Yi1" id="HrK-gO-U3V"/>
                 <outlet property="view" destination="iN0-l3-epB" id="CaS-PL-UJ2"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="aZJ-84-F0O">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="606"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="559" id="GHK-YM-9AN"/>
-                    </constraints>
                 </tableView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sgi-C0-gbw" customClass="MidtransUINextStepButton">
-                    <rect key="frame" x="8" y="619" width="359" height="40"/>
+                    <rect key="frame" x="8" y="688" width="398" height="40"/>
                     <color key="backgroundColor" red="0.098039215690000001" green="0.63921568630000003" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="khV-dQ-c1H"/>
@@ -51,68 +48,89 @@
                         <action selector="finishPaymentDidtapped:" destination="-1" eventType="touchUpInside" id="Ewd-2Z-rqX"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cJb-M5-yYW" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="566" width="375" height="45"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qME-Cx-xOT" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="606" width="414" height="74"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MQT-JC-0iG">
-                            <rect key="frame" x="293" y="0.0" width="42" height="45"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AdA-ai-aya">
+                            <rect key="frame" x="15" y="18" width="76.666666666666671" height="15.333333333333336"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ryu-0d-Yi1">
+                            <rect key="frame" x="330.66666666666669" y="0.0" width="43.333333333333314" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kdv-xP-PuC">
-                            <rect key="frame" x="15" y="15" width="77" height="15.5"/>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="z1N-w8-jUJ">
+                            <rect key="frame" x="379" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="8tW-Up-A4S"/>
+                                <constraint firstAttribute="width" constant="20" id="wAL-gB-s1O"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vSA-rL-oXH">
+                            <rect key="frame" x="15" y="49" width="166" height="15.333333333333329"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="I3b-5K-vdc">
-                            <rect key="frame" x="345" y="14.5" width="15" height="15"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="isA-B2-VNL">
+                            <rect key="frame" x="221" y="49" width="178" height="17"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="15" id="78s-JM-E3L"/>
-                                <constraint firstAttribute="width" constant="15" id="dMu-k5-w3v"/>
+                                <constraint firstAttribute="height" constant="17" id="Uam-RL-usz"/>
+                                <constraint firstAttribute="width" constant="178" id="aAl-2y-l2X"/>
                             </constraints>
-                        </imageView>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="bottom" secondItem="MQT-JC-0iG" secondAttribute="bottom" id="7zH-7l-yje"/>
-                        <constraint firstItem="MQT-JC-0iG" firstAttribute="top" secondItem="cJb-M5-yYW" secondAttribute="top" id="DH9-nQ-hSO"/>
-                        <constraint firstItem="Kdv-xP-PuC" firstAttribute="leading" secondItem="cJb-M5-yYW" secondAttribute="leading" constant="15" id="Fns-q3-Y54"/>
-                        <constraint firstItem="Kdv-xP-PuC" firstAttribute="centerY" secondItem="cJb-M5-yYW" secondAttribute="centerY" id="Rzj-o8-QMF"/>
-                        <constraint firstAttribute="trailing" secondItem="I3b-5K-vdc" secondAttribute="trailing" constant="15" id="g1g-oy-QAV"/>
-                        <constraint firstAttribute="height" constant="45" id="rc6-BX-R73"/>
-                        <constraint firstItem="I3b-5K-vdc" firstAttribute="centerY" secondItem="cJb-M5-yYW" secondAttribute="centerY" id="uW3-ro-402"/>
-                        <constraint firstItem="MQT-JC-0iG" firstAttribute="centerY" secondItem="cJb-M5-yYW" secondAttribute="centerY" id="wrl-HV-CeF"/>
-                        <constraint firstAttribute="trailing" secondItem="MQT-JC-0iG" secondAttribute="trailing" constant="40" id="xXh-1N-TKK"/>
+                        <constraint firstItem="ryu-0d-Yi1" firstAttribute="top" secondItem="qME-Cx-xOT" secondAttribute="top" id="55H-eZ-m5u"/>
+                        <constraint firstAttribute="height" constant="74" id="8Q0-fY-B3P"/>
+                        <constraint firstItem="isA-B2-VNL" firstAttribute="top" secondItem="qME-Cx-xOT" secondAttribute="top" constant="49" id="9H1-hZ-tde"/>
+                        <constraint firstAttribute="trailing" secondItem="ryu-0d-Yi1" secondAttribute="trailing" constant="40" id="A9g-fM-03x"/>
+                        <constraint firstAttribute="bottom" secondItem="ryu-0d-Yi1" secondAttribute="bottom" constant="24" id="N5a-vQ-gCj"/>
+                        <constraint firstItem="AdA-ai-aya" firstAttribute="leading" secondItem="qME-Cx-xOT" secondAttribute="leading" constant="15" id="PaQ-TO-D3g"/>
+                        <constraint firstAttribute="trailing" secondItem="z1N-w8-jUJ" secondAttribute="trailing" constant="15" id="YJ3-UV-UNV"/>
+                        <constraint firstItem="z1N-w8-jUJ" firstAttribute="centerY" secondItem="qME-Cx-xOT" secondAttribute="centerY" constant="-12" id="h7u-AO-PrK"/>
+                        <constraint firstItem="ryu-0d-Yi1" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="AdA-ai-aya" secondAttribute="trailing" constant="8" id="kGH-dl-6eV"/>
+                        <constraint firstItem="isA-B2-VNL" firstAttribute="leading" secondItem="vSA-rL-oXH" secondAttribute="trailing" constant="40" id="lgf-uR-Sb8"/>
+                        <constraint firstItem="vSA-rL-oXH" firstAttribute="top" secondItem="qME-Cx-xOT" secondAttribute="top" constant="49" id="nLD-Th-rB7"/>
+                        <constraint firstAttribute="trailing" secondItem="isA-B2-VNL" secondAttribute="trailing" constant="15" id="p8n-Xy-vaw"/>
+                        <constraint firstItem="AdA-ai-aya" firstAttribute="centerY" secondItem="ryu-0d-Yi1" secondAttribute="centerY" id="yxh-wl-6Vi"/>
+                        <constraint firstItem="vSA-rL-oXH" firstAttribute="leading" secondItem="qME-Cx-xOT" secondAttribute="leading" constant="15" id="z9N-2y-iQI"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
                         <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
                             <integer key="value" value="1"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
                     </userDefinedRuntimeAttributes>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="sgi-C0-gbw" firstAttribute="top" secondItem="cJb-M5-yYW" secondAttribute="bottom" constant="8" id="0Rn-Tv-oVT"/>
+                <constraint firstAttribute="trailing" secondItem="qME-Cx-xOT" secondAttribute="trailing" id="1Im-Yh-2X2"/>
+                <constraint firstItem="qME-Cx-xOT" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" id="6Qm-QV-Scx"/>
+                <constraint firstItem="qME-Cx-xOT" firstAttribute="top" secondItem="aZJ-84-F0O" secondAttribute="bottom" id="IeB-s2-3Uy"/>
+                <constraint firstItem="sgi-C0-gbw" firstAttribute="top" secondItem="qME-Cx-xOT" secondAttribute="bottom" constant="8" id="KwT-MH-l0l"/>
                 <constraint firstAttribute="trailing" secondItem="sgi-C0-gbw" secondAttribute="trailing" constant="8" id="Mek-t0-WoE"/>
-                <constraint firstAttribute="trailing" secondItem="aZJ-84-F0O" secondAttribute="trailing" id="ScQ-Sq-vqm"/>
                 <constraint firstItem="aZJ-84-F0O" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Ssy-YE-adr"/>
                 <constraint firstItem="aZJ-84-F0O" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Wos-bo-L77"/>
-                <constraint firstAttribute="trailing" secondItem="cJb-M5-yYW" secondAttribute="trailing" id="cEr-9U-nbn"/>
-                <constraint firstItem="cJb-M5-yYW" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="dPQ-HY-IiA"/>
+                <constraint firstAttribute="trailing" secondItem="aZJ-84-F0O" secondAttribute="trailing" id="eJq-Zy-580"/>
                 <constraint firstItem="aZJ-84-F0O" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" id="fPk-W1-GkG"/>
-                <constraint firstItem="cJb-M5-yYW" firstAttribute="top" secondItem="aZJ-84-F0O" secondAttribute="bottom" constant="7" id="jVO-bf-cgX"/>
                 <constraint firstItem="sgi-C0-gbw" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="l1i-Qq-iny"/>
                 <constraint firstAttribute="bottom" secondItem="sgi-C0-gbw" secondAttribute="bottom" constant="8" id="qlE-2O-hhS"/>
+                <constraint firstItem="qME-Cx-xOT" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="tV0-xS-V3k"/>
             </constraints>
-            <point key="canvasLocation" x="34.5" y="53.5"/>
+            <point key="canvasLocation" x="34" y="53"/>
         </view>
     </objects>
     <resources>
diff --git a/MidtransKit/MidtransKit/resources/VTMandiriClickpayController.xib b/MidtransKit/MidtransKit/resources/VTMandiriClickpayController.xib
index 0076096e9..58a0a5888 100644
--- a/MidtransKit/MidtransKit/resources/VTMandiriClickpayController.xib
+++ b/MidtransKit/MidtransKit/resources/VTMandiriClickpayController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_9" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,7 +20,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="VTMandiriClickpayController">
             <connections>
-                <outlet property="amountLabel" destination="lOs-9y-6eQ" id="0Ig-yf-a96"/>
+                <outlet property="amountLabel" destination="7ut-QW-Zga" id="0wS-Hp-3QC"/>
                 <outlet property="appliLabel" destination="kZG-e7-2qJ" id="xTS-eQ-C1P"/>
                 <outlet property="confirmButton" destination="eY7-ae-Avo" id="K0h-uK-uE6"/>
                 <outlet property="debitNumberTextField" destination="rSq-te-9Ca" id="ncs-J8-zET"/>
@@ -33,15 +33,15 @@
                 <outlet property="keyTokenLabel" destination="BCY-vQ-GZi" id="Wh5-Xf-l4G"/>
                 <outlet property="keyTokenView" destination="43h-IM-N8l" id="Eni-LY-VW2"/>
                 <outlet property="mandiriClickpayStepLabel" destination="gIu-B6-sX6" id="8kJ-RR-ilO"/>
+                <outlet property="orderIdLabel" destination="xPC-gC-4Tk" id="DU2-cm-9hc"/>
                 <outlet property="tokenTextField" destination="vHu-0q-4bf" id="7HN-7C-n4a"/>
-                <outlet property="totalAmountBorderedView" destination="421-1G-YEy" id="5Nt-Jt-MxN"/>
-                <outlet property="totalAmountLabel" destination="MEt-wf-obH" id="6bV-AA-ysi"/>
+                <outlet property="totalAmountBorderedView" destination="r1w-vR-MM1" id="VOP-ji-uv0"/>
                 <outlet property="view" destination="3Zx-FN-k1P" id="aVZ-xg-aLb"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="3Zx-FN-k1P">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Challenge Token" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vHu-0q-4bf" customClass="MidtransUITextField">
@@ -56,7 +56,7 @@
                     </userDefinedRuntimeAttributes>
                 </textField>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eY7-ae-Avo" customClass="MidtransUINextStepButton">
-                    <rect key="frame" x="8" y="619" width="359" height="40"/>
+                    <rect key="frame" x="8" y="764" width="359" height="40"/>
                     <color key="backgroundColor" red="0.098039215690000001" green="0.63921568630000003" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="Ag4-ch-1VU"/>
@@ -68,7 +68,7 @@
                     </connections>
                 </button>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="DisclosureIndicator.png" translatesAutoresizingMaskIntoConstraints="NO" id="WA5-E8-aSa">
-                    <rect key="frame" x="344" y="632" width="8" height="13"/>
+                    <rect key="frame" x="344" y="777" width="8" height="13"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="13" id="Y0R-FV-Ae6"/>
                         <constraint firstAttribute="width" constant="8" id="qWz-qu-B9t"/>
@@ -101,52 +101,8 @@
                         <userDefinedRuntimeAttribute type="boolean" keyPath="underlined" value="YES"/>
                     </userDefinedRuntimeAttributes>
                 </textField>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="421-1G-YEy" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="566" width="375" height="45"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lOs-9y-6eQ">
-                            <rect key="frame" x="295.5" y="12" width="39.5" height="21.5"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MEt-wf-obH">
-                            <rect key="frame" x="15" y="14.5" width="73.5" height="16.5"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
-                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="xLv-lQ-WlF">
-                            <rect key="frame" x="345" y="15" width="15" height="15"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="15" id="8uT-gQ-YAh"/>
-                                <constraint firstAttribute="width" constant="15" id="yDY-cr-Htd"/>
-                            </constraints>
-                        </imageView>
-                    </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstAttribute="trailing" secondItem="lOs-9y-6eQ" secondAttribute="trailing" constant="40" id="0Zr-Im-Fbx"/>
-                        <constraint firstItem="xLv-lQ-WlF" firstAttribute="centerY" secondItem="421-1G-YEy" secondAttribute="centerY" id="5PX-nb-wZq"/>
-                        <constraint firstAttribute="height" constant="45" id="Dgh-xq-hAm"/>
-                        <constraint firstAttribute="trailing" secondItem="xLv-lQ-WlF" secondAttribute="trailing" constant="15" id="Dhx-fl-76A"/>
-                        <constraint firstItem="lOs-9y-6eQ" firstAttribute="centerY" secondItem="421-1G-YEy" secondAttribute="centerY" id="LNM-f9-OhY"/>
-                        <constraint firstItem="MEt-wf-obH" firstAttribute="centerY" secondItem="421-1G-YEy" secondAttribute="centerY" id="izL-En-5cf"/>
-                        <constraint firstItem="MEt-wf-obH" firstAttribute="leading" secondItem="421-1G-YEy" secondAttribute="leading" constant="15" id="rXu-Zo-DaH"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
-                            <integer key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                </view>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vkx-Iy-OAU">
-                    <rect key="frame" x="0.0" y="151" width="375" height="415"/>
+                    <rect key="frame" x="0.0" y="151" width="375" height="531"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ftM-VH-efx">
                             <rect key="frame" x="0.0" y="0.0" width="375" height="281"/>
@@ -158,13 +114,13 @@
                                             <rect key="frame" x="0.0" y="135" width="375" height="45"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wvl-Ap-hMb">
-                                                    <rect key="frame" x="320.5" y="12" width="39.5" height="21.5"/>
+                                                    <rect key="frame" x="318.33333333333331" y="13" width="41.666666666666686" height="20"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Input 3" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fG3-Vd-okh">
-                                                    <rect key="frame" x="15" y="14.5" width="38.5" height="16.5"/>
+                                                    <rect key="frame" x="14.999999999999996" y="14.666666666666684" width="40.666666666666657" height="16.333333333333329"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                                                     <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -192,13 +148,13 @@
                                             <rect key="frame" x="0.0" y="90" width="375" height="45"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BnO-os-UUa">
-                                                    <rect key="frame" x="320.5" y="12" width="39.5" height="21.5"/>
+                                                    <rect key="frame" x="318.33333333333331" y="13" width="41.666666666666686" height="20"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Input 2" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xIQ-0o-0u3">
-                                                    <rect key="frame" x="15" y="14.5" width="38.5" height="16.5"/>
+                                                    <rect key="frame" x="14.999999999999996" y="14.666666666666655" width="40.666666666666657" height="16.333333333333329"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                                                     <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -226,13 +182,13 @@
                                             <rect key="frame" x="0.0" y="45" width="375" height="45"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8iY-nb-adT">
-                                                    <rect key="frame" x="320.5" y="12" width="39.5" height="21.5"/>
+                                                    <rect key="frame" x="318.33333333333331" y="13" width="41.666666666666686" height="20"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Input 1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNc-YO-85V">
-                                                    <rect key="frame" x="15" y="14.5" width="38.5" height="16.5"/>
+                                                    <rect key="frame" x="14.999999999999996" y="14.666666666666655" width="40.666666666666657" height="16.333333333333329"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                                                     <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -260,13 +216,13 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kZG-e7-2qJ">
-                                                    <rect key="frame" x="320.5" y="12" width="39.5" height="21.5"/>
+                                                    <rect key="frame" x="318.33333333333331" y="13" width="41.666666666666686" height="20"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="APPLI" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gqg-2j-B9G">
-                                                    <rect key="frame" x="15" y="14.5" width="32" height="16.5"/>
+                                                    <rect key="frame" x="15" y="14.666666666666655" width="36" height="16.333333333333329"/>
                                                     <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                                                     <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -377,13 +333,13 @@
                     <rect key="frame" x="0.0" y="2" width="375" height="40"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Key token device is required for this payment mehtod" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BCY-vQ-GZi">
-                            <rect key="frame" x="54.5" y="12.5" width="267" height="15.5"/>
+                            <rect key="frame" x="45" y="13.333333333333336" width="286.33333333333331" height="14"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="12"/>
                             <color key="textColor" red="0.36862745098039218" green="0.32156862745098036" blue="0.0039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="token_key.png" translatesAutoresizingMaskIntoConstraints="NO" id="ACq-Ci-H09">
-                            <rect key="frame" x="30.5" y="12" width="20" height="20"/>
+                            <rect key="frame" x="21" y="12" width="20" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="5jX-ag-X5f"/>
                                 <constraint firstAttribute="width" constant="20" id="NW0-Pd-yGc"/>
@@ -400,6 +356,72 @@
                         <constraint firstItem="BCY-vQ-GZi" firstAttribute="leading" secondItem="ACq-Ci-H09" secondAttribute="trailing" constant="4" id="Rwf-Au-JCs"/>
                     </constraints>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r1w-vR-MM1" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="682" width="375" height="74"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ec6-PT-6uC">
+                            <rect key="frame" x="15" y="17.666666666666629" width="76.666666666666671" height="16.333333333333329"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7ut-QW-Zga">
+                            <rect key="frame" x="299" y="0.0" width="36" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="7ZX-eU-dhh">
+                            <rect key="frame" x="340" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="20" id="FWZ-4U-D6B"/>
+                                <constraint firstAttribute="height" constant="20" id="zya-w0-hka"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zEk-EV-MBZ">
+                            <rect key="frame" x="15" y="49" width="127" height="15.333333333333329"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xPC-gC-4Tk">
+                            <rect key="frame" x="173" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="17" id="aX1-6n-0pW"/>
+                                <constraint firstAttribute="width" constant="178" id="jFz-L1-V7U"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="11"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="zEk-EV-MBZ" firstAttribute="leading" secondItem="r1w-vR-MM1" secondAttribute="leading" constant="15" id="1nT-gf-zZw"/>
+                        <constraint firstItem="ec6-PT-6uC" firstAttribute="leading" secondItem="r1w-vR-MM1" secondAttribute="leading" constant="15" id="7t3-0z-TdE"/>
+                        <constraint firstItem="xPC-gC-4Tk" firstAttribute="leading" secondItem="zEk-EV-MBZ" secondAttribute="trailing" constant="31" id="Bl4-JB-6Ff"/>
+                        <constraint firstItem="ec6-PT-6uC" firstAttribute="centerY" secondItem="7ut-QW-Zga" secondAttribute="centerY" id="LXc-TB-TQi"/>
+                        <constraint firstItem="7ut-QW-Zga" firstAttribute="top" secondItem="r1w-vR-MM1" secondAttribute="top" id="NYT-mL-Mil"/>
+                        <constraint firstItem="xPC-gC-4Tk" firstAttribute="top" secondItem="r1w-vR-MM1" secondAttribute="top" constant="49" id="Q9X-0V-0ly"/>
+                        <constraint firstAttribute="trailing" secondItem="7ZX-eU-dhh" secondAttribute="trailing" constant="15" id="ShA-lg-q2s"/>
+                        <constraint firstAttribute="height" constant="74" id="UwQ-5J-n5u"/>
+                        <constraint firstItem="7ut-QW-Zga" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ec6-PT-6uC" secondAttribute="trailing" constant="8" id="Ynu-bJ-bKN"/>
+                        <constraint firstAttribute="trailing" secondItem="7ut-QW-Zga" secondAttribute="trailing" constant="40" id="eCa-8O-xDS"/>
+                        <constraint firstAttribute="trailing" secondItem="xPC-gC-4Tk" secondAttribute="trailing" constant="24" id="hgy-bA-pbs"/>
+                        <constraint firstAttribute="bottom" secondItem="7ut-QW-Zga" secondAttribute="bottom" constant="24" id="kwj-d0-geE"/>
+                        <constraint firstItem="zEk-EV-MBZ" firstAttribute="top" secondItem="r1w-vR-MM1" secondAttribute="top" constant="49" id="nTj-mD-Gdx"/>
+                        <constraint firstItem="7ZX-eU-dhh" firstAttribute="centerY" secondItem="r1w-vR-MM1" secondAttribute="centerY" constant="-12" id="wiK-C4-mQ5"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
+                            <integer key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
+                    </userDefinedRuntimeAttributes>
+                </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
@@ -407,7 +429,7 @@
                 <constraint firstAttribute="bottom" secondItem="eY7-ae-Avo" secondAttribute="bottom" constant="8" id="2Dh-Bg-5uQ"/>
                 <constraint firstAttribute="trailing" secondItem="43h-IM-N8l" secondAttribute="trailing" id="3EQ-aJ-KjY"/>
                 <constraint firstItem="WA5-E8-aSa" firstAttribute="trailing" secondItem="eY7-ae-Avo" secondAttribute="trailing" constant="-15" id="4By-kP-hAO"/>
-                <constraint firstItem="eY7-ae-Avo" firstAttribute="top" secondItem="421-1G-YEy" secondAttribute="bottom" constant="8" id="A4h-yj-Vb9"/>
+                <constraint firstItem="r1w-vR-MM1" firstAttribute="top" secondItem="Vkx-Iy-OAU" secondAttribute="bottom" id="4Il-VK-WNh"/>
                 <constraint firstItem="43h-IM-N8l" firstAttribute="top" secondItem="3Zx-FN-k1P" secondAttribute="top" constant="2" id="Abn-iR-XSC"/>
                 <constraint firstItem="eY7-ae-Avo" firstAttribute="leading" secondItem="3Zx-FN-k1P" secondAttribute="leading" constant="8" id="Dz9-z7-KOu"/>
                 <constraint firstItem="rSq-te-9Ca" firstAttribute="leading" secondItem="3Zx-FN-k1P" secondAttribute="leading" constant="15" id="Hzr-Lm-Ra3"/>
@@ -416,17 +438,17 @@
                 <constraint firstAttribute="trailing" secondItem="9ln-H6-lf0" secondAttribute="trailing" id="MZa-11-zLi"/>
                 <constraint firstItem="43h-IM-N8l" firstAttribute="width" secondItem="3Zx-FN-k1P" secondAttribute="width" id="ODd-XE-2AJ"/>
                 <constraint firstItem="Vkx-Iy-OAU" firstAttribute="leading" secondItem="3Zx-FN-k1P" secondAttribute="leading" id="PNQ-wK-HV9"/>
+                <constraint firstItem="r1w-vR-MM1" firstAttribute="leading" secondItem="3Zx-FN-k1P" secondAttribute="leading" id="STa-Nd-ZQg"/>
                 <constraint firstItem="43h-IM-N8l" firstAttribute="leading" secondItem="3Zx-FN-k1P" secondAttribute="leading" id="Sql-i0-gIh"/>
                 <constraint firstAttribute="trailing" secondItem="rSq-te-9Ca" secondAttribute="trailing" constant="15" id="VTm-Pw-Tp1"/>
                 <constraint firstItem="rSq-te-9Ca" firstAttribute="top" secondItem="3Zx-FN-k1P" secondAttribute="top" constant="50" id="WZr-g1-cfk"/>
                 <constraint firstItem="vHu-0q-4bf" firstAttribute="top" secondItem="rSq-te-9Ca" secondAttribute="bottom" id="doK-sA-SXM"/>
                 <constraint firstItem="9ln-H6-lf0" firstAttribute="top" secondItem="vHu-0q-4bf" secondAttribute="bottom" id="gLb-jZ-PwV"/>
                 <constraint firstItem="WA5-E8-aSa" firstAttribute="centerY" secondItem="eY7-ae-Avo" secondAttribute="centerY" id="hRG-w5-doc"/>
-                <constraint firstAttribute="trailing" secondItem="421-1G-YEy" secondAttribute="trailing" id="jBd-TT-Fcy"/>
-                <constraint firstItem="421-1G-YEy" firstAttribute="leading" secondItem="3Zx-FN-k1P" secondAttribute="leading" id="p7m-gb-xuH"/>
                 <constraint firstAttribute="trailing" secondItem="Vkx-Iy-OAU" secondAttribute="trailing" id="qfc-ye-zGs"/>
+                <constraint firstItem="eY7-ae-Avo" firstAttribute="top" secondItem="r1w-vR-MM1" secondAttribute="bottom" constant="8" id="shP-ax-x8m"/>
                 <constraint firstAttribute="trailing" secondItem="vHu-0q-4bf" secondAttribute="trailing" constant="15" id="x9h-Y8-rvF"/>
-                <constraint firstItem="421-1G-YEy" firstAttribute="top" secondItem="Vkx-Iy-OAU" secondAttribute="bottom" id="yXb-mV-HZF"/>
+                <constraint firstAttribute="trailing" secondItem="r1w-vR-MM1" secondAttribute="trailing" id="y1J-rE-Vtc"/>
                 <constraint firstItem="9ln-H6-lf0" firstAttribute="leading" secondItem="3Zx-FN-k1P" secondAttribute="leading" id="zkc-TN-lFB"/>
             </constraints>
             <point key="canvasLocation" x="295.5" y="122.5"/>
diff --git a/MidtransKit/MidtransKit/resources/VTVAListController.xib b/MidtransKit/MidtransKit/resources/VTVAListController.xib
index 4c196f7e8..82cfb5d15 100644
--- a/MidtransKit/MidtransKit/resources/VTVAListController.xib
+++ b/MidtransKit/MidtransKit/resources/VTVAListController.xib
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_0" orientation="portrait">
+    <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -16,84 +16,109 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="VTVAListController">
             <connections>
+                <outlet property="orderIdLabel" destination="xGS-nl-G5O" id="OqP-4X-TED"/>
                 <outlet property="tableView" destination="QzD-tQ-HgG" id="LAT-8w-3g9"/>
-                <outlet property="totalAmountBorderedView" destination="qte-DI-uap" id="xgc-vp-LoZ"/>
-                <outlet property="totalAmountLabel" destination="B2h-AK-Sd3" id="Z9x-a2-gec"/>
-                <outlet property="totalAmountTextLabel" destination="Pk5-Ct-ZE0" id="aWZ-Kb-Dad"/>
+                <outlet property="totalAmountBorderedView" destination="Q86-di-Zrj" id="mRa-Dv-TiQ"/>
+                <outlet property="totalAmountLabel" destination="NLe-xT-dqj" id="ncl-vY-0sn"/>
+                <outlet property="totalAmountTextLabel" destination="5In-mU-7Wv" id="Mnm-2d-FwF"/>
                 <outlet property="view" destination="KiP-We-xFP" id="Go9-m2-geL"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="KiP-We-xFP">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="QzD-tQ-HgG">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="523"/>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <color key="separatorColor" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <inset key="separatorInset" minX="70" minY="0.0" maxX="0.0" maxY="0.0"/>
-                    <connections>
-                        <outlet property="dataSource" destination="-1" id="qMF-WN-Mxe"/>
-                        <outlet property="delegate" destination="-1" id="EOO-Yq-vAm"/>
-                    </connections>
-                </tableView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qte-DI-uap" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="523" width="320" height="45"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q86-di-Zrj" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="662" width="414" height="74"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pk5-Ct-ZE0">
-                            <rect key="frame" x="15" y="0.0" width="77" height="45"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5In-mU-7Wv">
+                            <rect key="frame" x="15" y="18" width="76.666666666666671" height="15.333333333333336"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B2h-AK-Sd3">
-                            <rect key="frame" x="238" y="0.0" width="42" height="45"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NLe-xT-dqj">
+                            <rect key="frame" x="330.66666666666669" y="0.0" width="43.333333333333314" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="ABc-FH-MPR">
-                            <rect key="frame" x="290" y="14.5" width="15" height="15"/>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="Rbo-kF-MPe">
+                            <rect key="frame" x="379" y="15" width="20" height="20"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="15" id="2B7-OQ-Pjy"/>
-                                <constraint firstAttribute="height" constant="15" id="KSA-mQ-7Ud"/>
+                                <constraint firstAttribute="width" constant="20" id="5Kf-O2-7Le"/>
+                                <constraint firstAttribute="height" constant="20" id="m6p-hM-BIz"/>
                             </constraints>
                         </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zpc-KD-Kif">
+                            <rect key="frame" x="15" y="49" width="166" height="15.333333333333329"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xGS-nl-G5O">
+                            <rect key="frame" x="221" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="17" id="jYF-of-yD8"/>
+                                <constraint firstAttribute="width" constant="178" id="mQw-Rq-g4f"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstAttribute="bottom" secondItem="Pk5-Ct-ZE0" secondAttribute="bottom" id="C1b-IL-lf5"/>
-                        <constraint firstItem="B2h-AK-Sd3" firstAttribute="top" secondItem="qte-DI-uap" secondAttribute="top" id="Fge-sw-lac"/>
-                        <constraint firstItem="Pk5-Ct-ZE0" firstAttribute="top" secondItem="qte-DI-uap" secondAttribute="top" id="Pml-sG-XcP"/>
-                        <constraint firstAttribute="trailing" secondItem="B2h-AK-Sd3" secondAttribute="trailing" constant="40" id="Zmg-nc-Luy"/>
-                        <constraint firstAttribute="trailing" secondItem="ABc-FH-MPR" secondAttribute="trailing" constant="15" id="cML-Iz-dUd"/>
-                        <constraint firstItem="ABc-FH-MPR" firstAttribute="centerY" secondItem="qte-DI-uap" secondAttribute="centerY" id="fDK-62-QMp"/>
-                        <constraint firstAttribute="bottom" secondItem="B2h-AK-Sd3" secondAttribute="bottom" id="gi3-eL-8am"/>
-                        <constraint firstItem="Pk5-Ct-ZE0" firstAttribute="leading" secondItem="qte-DI-uap" secondAttribute="leading" constant="15" id="qnu-7O-2DZ"/>
-                        <constraint firstAttribute="height" constant="45" id="quk-WX-xJS"/>
+                        <constraint firstItem="5In-mU-7Wv" firstAttribute="centerY" secondItem="NLe-xT-dqj" secondAttribute="centerY" id="5Od-AV-IIZ"/>
+                        <constraint firstItem="Zpc-KD-Kif" firstAttribute="leading" secondItem="Q86-di-Zrj" secondAttribute="leading" constant="15" id="80b-3I-Wsf"/>
+                        <constraint firstItem="Zpc-KD-Kif" firstAttribute="top" secondItem="Q86-di-Zrj" secondAttribute="top" constant="49" id="85t-lt-7tG"/>
+                        <constraint firstItem="Rbo-kF-MPe" firstAttribute="centerY" secondItem="Q86-di-Zrj" secondAttribute="centerY" constant="-12" id="Eag-Ft-rfR"/>
+                        <constraint firstItem="NLe-xT-dqj" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="5In-mU-7Wv" secondAttribute="trailing" constant="8" id="OvO-dT-0On"/>
+                        <constraint firstItem="5In-mU-7Wv" firstAttribute="leading" secondItem="Q86-di-Zrj" secondAttribute="leading" constant="15" id="T0D-Cl-0hH"/>
+                        <constraint firstAttribute="height" constant="74" id="b7J-4M-7fr"/>
+                        <constraint firstItem="NLe-xT-dqj" firstAttribute="top" secondItem="Q86-di-Zrj" secondAttribute="top" id="gC0-Tt-zPF"/>
+                        <constraint firstAttribute="trailing" secondItem="Rbo-kF-MPe" secondAttribute="trailing" constant="15" id="iqq-B2-kbD"/>
+                        <constraint firstAttribute="trailing" secondItem="NLe-xT-dqj" secondAttribute="trailing" constant="40" id="kap-Pv-1TD"/>
+                        <constraint firstItem="xGS-nl-G5O" firstAttribute="top" secondItem="Q86-di-Zrj" secondAttribute="top" constant="49" id="mfc-ky-fcs"/>
+                        <constraint firstItem="xGS-nl-G5O" firstAttribute="leading" secondItem="Zpc-KD-Kif" secondAttribute="trailing" constant="40" id="qrD-la-LuN"/>
+                        <constraint firstAttribute="trailing" secondItem="xGS-nl-G5O" secondAttribute="trailing" constant="15" id="rI4-r4-Eqv"/>
+                        <constraint firstAttribute="bottom" secondItem="NLe-xT-dqj" secondAttribute="bottom" constant="24" id="tNv-oy-FOX"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
                         <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
                             <integer key="value" value="1"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
                     </userDefinedRuntimeAttributes>
                 </view>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="QzD-tQ-HgG">
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="662"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="separatorColor" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <inset key="separatorInset" minX="70" minY="0.0" maxX="0.0" maxY="0.0"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="qMF-WN-Mxe"/>
+                        <outlet property="delegate" destination="-1" id="EOO-Yq-vAm"/>
+                    </connections>
+                </tableView>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="qte-DI-uap" secondAttribute="trailing" id="6i7-8G-thM"/>
-                <constraint firstItem="qte-DI-uap" firstAttribute="leading" secondItem="KiP-We-xFP" secondAttribute="leading" id="9Qj-Zv-xoI"/>
-                <constraint firstAttribute="trailing" secondItem="QzD-tQ-HgG" secondAttribute="trailing" id="L4x-Cu-Dzh"/>
-                <constraint firstItem="QzD-tQ-HgG" firstAttribute="leading" secondItem="KiP-We-xFP" secondAttribute="leading" id="SGg-GJ-D3H"/>
-                <constraint firstItem="qte-DI-uap" firstAttribute="top" secondItem="QzD-tQ-HgG" secondAttribute="bottom" id="V1Q-Sa-YUJ"/>
-                <constraint firstAttribute="bottom" secondItem="qte-DI-uap" secondAttribute="bottom" id="syz-x5-oER"/>
-                <constraint firstItem="QzD-tQ-HgG" firstAttribute="top" secondItem="KiP-We-xFP" secondAttribute="top" id="upM-73-uyh"/>
+                <constraint firstItem="Q86-di-Zrj" firstAttribute="width" secondItem="KiP-We-xFP" secondAttribute="width" id="0yJ-hr-9pZ"/>
+                <constraint firstAttribute="trailing" secondItem="Q86-di-Zrj" secondAttribute="trailing" id="AvC-cA-udh"/>
+                <constraint firstAttribute="bottom" secondItem="Q86-di-Zrj" secondAttribute="bottom" id="JHq-OW-N9n"/>
+                <constraint firstItem="QzD-tQ-HgG" firstAttribute="leading" secondItem="KiP-We-xFP" secondAttribute="leading" id="Rug-mm-c8W"/>
+                <constraint firstItem="QzD-tQ-HgG" firstAttribute="width" secondItem="KiP-We-xFP" secondAttribute="width" id="aOj-MV-CZ2"/>
+                <constraint firstAttribute="trailing" secondItem="QzD-tQ-HgG" secondAttribute="trailing" id="fWE-aB-v2s"/>
+                <constraint firstItem="QzD-tQ-HgG" firstAttribute="top" secondItem="KiP-We-xFP" secondAttribute="top" id="ldB-nl-ndn"/>
+                <constraint firstItem="Q86-di-Zrj" firstAttribute="top" secondItem="QzD-tQ-HgG" secondAttribute="bottom" id="s8Q-vS-1b5"/>
+                <constraint firstItem="Q86-di-Zrj" firstAttribute="leading" secondItem="KiP-We-xFP" secondAttribute="leading" id="xuB-L7-pZo"/>
             </constraints>
+            <point key="canvasLocation" x="-496" y="-175"/>
         </view>
     </objects>
     <resources>
diff --git a/MidtransKit/MidtransResources/MIDDanamonOnlineViewController.xib b/MidtransKit/MidtransResources/MIDDanamonOnlineViewController.xib
index 2e3288e19..006f903c9 100644
--- a/MidtransKit/MidtransResources/MIDDanamonOnlineViewController.xib
+++ b/MidtransKit/MidtransResources/MIDDanamonOnlineViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -19,15 +19,15 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MIDDanamonOnlineViewController">
             <connections>
-                <outlet property="amountLabel" destination="x0R-je-SeE" id="7Ef-5c-4jn"/>
+                <outlet property="amountLabel" destination="wyh-cR-Ytd" id="Ofp-H5-y4X"/>
                 <outlet property="confirmButton" destination="R3v-ga-00t" id="ufk-MQ-ia1"/>
                 <outlet property="danamonStepLabel" destination="MvZ-28-me0" id="Y6i-o3-av3"/>
                 <outlet property="indicatorButton" destination="7Sz-hv-PhK" id="Etj-Lc-Kg9"/>
                 <outlet property="instructionHeaderLabel1" destination="17m-rK-HHh" id="bsA-pe-rMa"/>
                 <outlet property="instructionHeaderLabel2" destination="X6E-5a-afy" id="HpN-17-g9P"/>
                 <outlet property="instructionPage" destination="2hk-Es-ZxA" id="Smg-uK-XhO"/>
-                <outlet property="totalAmountBorderedView" destination="MNz-TE-FOm" id="1Fk-Ym-EYI"/>
-                <outlet property="totalAmountLabel" destination="BEN-Fp-XyZ" id="TGE-vs-nCE"/>
+                <outlet property="orderIdLabel" destination="FkT-RK-01g" id="Ihk-u7-3Oa"/>
+                <outlet property="totalAmountBorderedView" destination="2f6-aS-mz8" id="fMh-pp-BpX"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
@@ -48,53 +48,10 @@
                         <action selector="confirmPaymentDidTapped:" destination="-1" eventType="touchUpInside" id="nmT-JL-xd7"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MNz-TE-FOm" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="566" width="375" height="45"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x0R-je-SeE">
-                            <rect key="frame" x="295.5" y="12" width="39.5" height="21.5"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="17"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BEN-Fp-XyZ">
-                            <rect key="frame" x="15" y="14.5" width="73.5" height="16.5"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
-                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="YOp-oL-4vv">
-                            <rect key="frame" x="345" y="15" width="15" height="15"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="15" id="WPc-MG-hQ6"/>
-                                <constraint firstAttribute="width" constant="15" id="jLV-2H-QwK"/>
-                            </constraints>
-                        </imageView>
-                    </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstItem="YOp-oL-4vv" firstAttribute="leading" secondItem="x0R-je-SeE" secondAttribute="trailing" constant="10" id="5D2-Bi-uCw"/>
-                        <constraint firstItem="YOp-oL-4vv" firstAttribute="centerY" secondItem="x0R-je-SeE" secondAttribute="centerY" id="6BE-bS-cLb"/>
-                        <constraint firstItem="x0R-je-SeE" firstAttribute="centerY" secondItem="MNz-TE-FOm" secondAttribute="centerY" id="ftJ-Li-yeB"/>
-                        <constraint firstAttribute="trailing" secondItem="YOp-oL-4vv" secondAttribute="trailing" constant="15" id="use-O4-HpV"/>
-                        <constraint firstAttribute="height" constant="45" id="ylr-Pc-rw6"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
-                            <integer key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
-                    </userDefinedRuntimeAttributes>
-                </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Danamon Online step by step" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MvZ-28-me0">
-                    <rect key="frame" x="8" y="98" width="189" height="22"/>
+                    <rect key="frame" x="8" y="98" width="199" height="22"/>
                     <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="15"/>
-                    <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7Sz-hv-PhK">
@@ -123,9 +80,75 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2hk-Es-ZxA">
-                    <rect key="frame" x="8" y="120" width="359" height="438"/>
+                    <rect key="frame" x="8" y="120" width="359" height="417"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2f6-aS-mz8" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="537" width="375" height="74"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Ua-82-ayA">
+                            <rect key="frame" x="15" y="18" width="77" height="15.5"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wyh-cR-Ytd">
+                            <rect key="frame" x="299" y="0.0" width="36" height="50"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="Xb9-vN-OX9">
+                            <rect key="frame" x="340" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="nzC-2M-5Zp"/>
+                                <constraint firstAttribute="width" constant="20" id="yzP-LF-PZc"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="leb-8m-TmP">
+                            <rect key="frame" x="15" y="49" width="127" height="15.5"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FkT-RK-01g">
+                            <rect key="frame" x="173" y="49" width="178" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="17" id="12I-x5-WRC"/>
+                                <constraint firstAttribute="width" constant="178" id="GZl-c4-0ZX"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="11"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="wyh-cR-Ytd" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="3Ua-82-ayA" secondAttribute="trailing" constant="8" id="9tn-cv-5B0"/>
+                        <constraint firstItem="leb-8m-TmP" firstAttribute="top" secondItem="2f6-aS-mz8" secondAttribute="top" constant="49" id="GZj-bU-xqz"/>
+                        <constraint firstAttribute="trailing" secondItem="FkT-RK-01g" secondAttribute="trailing" constant="24" id="I7O-vD-Qch"/>
+                        <constraint firstAttribute="trailing" secondItem="wyh-cR-Ytd" secondAttribute="trailing" constant="40" id="OAH-ZD-TRX"/>
+                        <constraint firstItem="FkT-RK-01g" firstAttribute="top" secondItem="2f6-aS-mz8" secondAttribute="top" constant="49" id="OLF-po-3p2"/>
+                        <constraint firstItem="FkT-RK-01g" firstAttribute="leading" secondItem="leb-8m-TmP" secondAttribute="trailing" constant="31" id="PdM-6g-ytS"/>
+                        <constraint firstAttribute="bottom" secondItem="wyh-cR-Ytd" secondAttribute="bottom" constant="24" id="TDz-eR-5sf"/>
+                        <constraint firstItem="Xb9-vN-OX9" firstAttribute="centerY" secondItem="2f6-aS-mz8" secondAttribute="centerY" constant="-12" id="UdQ-4a-yoU"/>
+                        <constraint firstItem="leb-8m-TmP" firstAttribute="leading" secondItem="2f6-aS-mz8" secondAttribute="leading" constant="15" id="XWN-3o-BvV"/>
+                        <constraint firstItem="3Ua-82-ayA" firstAttribute="leading" secondItem="2f6-aS-mz8" secondAttribute="leading" constant="15" id="hcR-N1-fad"/>
+                        <constraint firstAttribute="trailing" secondItem="Xb9-vN-OX9" secondAttribute="trailing" constant="15" id="jxI-vk-niA"/>
+                        <constraint firstItem="wyh-cR-Ytd" firstAttribute="top" secondItem="2f6-aS-mz8" secondAttribute="top" id="qnK-oU-ddd"/>
+                        <constraint firstAttribute="height" constant="74" id="qsS-ek-zc6"/>
+                        <constraint firstItem="3Ua-82-ayA" firstAttribute="centerY" secondItem="wyh-cR-Ytd" secondAttribute="centerY" id="sJm-Pl-Tum"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
+                            <integer key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
+                    </userDefinedRuntimeAttributes>
+                </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
@@ -136,21 +159,21 @@
                 <constraint firstItem="X6E-5a-afy" firstAttribute="leading" secondItem="17m-rK-HHh" secondAttribute="leading" id="4hH-Jx-Fcf"/>
                 <constraint firstItem="2hk-Es-ZxA" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="6j3-C5-nab"/>
                 <constraint firstAttribute="trailing" secondItem="R3v-ga-00t" secondAttribute="trailing" constant="8" id="6kx-wz-wdc"/>
-                <constraint firstItem="MNz-TE-FOm" firstAttribute="top" secondItem="2hk-Es-ZxA" secondAttribute="bottom" constant="8" id="9IS-si-rym"/>
-                <constraint firstAttribute="trailing" secondItem="MNz-TE-FOm" secondAttribute="trailing" id="9kN-9g-riV"/>
                 <constraint firstAttribute="trailing" secondItem="17m-rK-HHh" secondAttribute="trailing" constant="8" id="9s5-tf-L5L"/>
-                <constraint firstItem="R3v-ga-00t" firstAttribute="top" secondItem="MNz-TE-FOm" secondAttribute="bottom" constant="8" id="FWa-mA-7Zz"/>
+                <constraint firstItem="2f6-aS-mz8" firstAttribute="top" secondItem="2hk-Es-ZxA" secondAttribute="bottom" id="C9b-ei-yAr"/>
+                <constraint firstAttribute="trailing" secondItem="2f6-aS-mz8" secondAttribute="trailing" id="GK9-Gb-WJ9"/>
                 <constraint firstItem="MvZ-28-me0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="Gh6-Z0-g4u"/>
                 <constraint firstItem="2hk-Es-ZxA" firstAttribute="top" secondItem="MvZ-28-me0" secondAttribute="bottom" id="RAj-Ll-Nku"/>
-                <constraint firstItem="MNz-TE-FOm" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Xvr-Xl-kMw"/>
                 <constraint firstItem="MvZ-28-me0" firstAttribute="top" secondItem="X6E-5a-afy" secondAttribute="bottom" constant="16" id="aHd-gs-vO9"/>
                 <constraint firstItem="7Sz-hv-PhK" firstAttribute="centerY" secondItem="MvZ-28-me0" secondAttribute="centerY" id="b8r-yb-p0b"/>
                 <constraint firstItem="17m-rK-HHh" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="dcU-cd-MQN"/>
+                <constraint firstItem="2f6-aS-mz8" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="jZn-Gt-gGS"/>
                 <constraint firstItem="X6E-5a-afy" firstAttribute="height" secondItem="17m-rK-HHh" secondAttribute="height" id="lLv-f8-Y21"/>
                 <constraint firstItem="R3v-ga-00t" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="mCK-l1-ViR"/>
                 <constraint firstAttribute="bottom" secondItem="R3v-ga-00t" secondAttribute="bottom" constant="8" id="oqg-R8-BHK"/>
                 <constraint firstItem="7Sz-hv-PhK" firstAttribute="trailing" secondItem="X6E-5a-afy" secondAttribute="trailing" id="tlD-ky-rey"/>
                 <constraint firstAttribute="trailing" secondItem="2hk-Es-ZxA" secondAttribute="trailing" constant="8" id="ueL-pa-WOb"/>
+                <constraint firstItem="R3v-ga-00t" firstAttribute="top" secondItem="2f6-aS-mz8" secondAttribute="bottom" constant="8" id="y8O-hh-Ofa"/>
             </constraints>
             <point key="canvasLocation" x="41.5" y="54.5"/>
         </view>
diff --git a/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib b/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib
index 23a17fc9c..7df9b3118 100644
--- a/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib
+++ b/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -19,22 +19,23 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MIDPaymentIndomaretViewController">
             <connections>
-                <outlet property="amountLabel" destination="R5N-1g-nRK" id="zRO-MA-hqd"/>
+                <outlet property="amountLabel" destination="K03-hv-mzA" id="ATY-jt-U5z"/>
                 <outlet property="confirmPaymentButton" destination="giA-MC-o9d" id="CPq-aS-QCd"/>
                 <outlet property="instructionLabel" destination="hVp-7b-LaH" id="0yX-oe-Dmz"/>
                 <outlet property="instructionPage" destination="yP9-3c-Nsi" id="BDZ-b1-BXY"/>
-                <outlet property="totalAmountBorderedView" destination="6Q1-Xk-dy5" id="m15-Ca-OOB"/>
-                <outlet property="totalAmountLabel" destination="wTK-UF-0hG" id="urC-tl-tx5"/>
+                <outlet property="orderIdLabel" destination="0p6-Xj-dwl" id="b6k-Ux-8G3"/>
+                <outlet property="totalAmountBorderedView" destination="IR2-AV-hdI" id="zed-cK-di0"/>
+                <outlet property="totalAmountLabel" destination="kSW-zm-lI9" id="XRE-bh-TL5"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="giA-MC-o9d" customClass="MidtransUINextStepButton">
-                    <rect key="frame" x="8" y="619" width="359" height="40"/>
+                    <rect key="frame" x="8" y="688" width="398" height="40"/>
                     <color key="backgroundColor" red="0.098039215690000001" green="0.63921568630000003" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="LjZ-ga-H7q"/>
@@ -43,7 +44,7 @@
                     <state key="normal" title="Confirm Payment"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="value" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
                             <integer key="value" value="1"/>
@@ -63,79 +64,103 @@
                         <action selector="confirmPaymentDidTapped:" destination="-1" eventType="touchUpInside" id="BYL-II-coj"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Q1-Xk-dy5" customClass="MIdtransUIBorderedView">
-                    <rect key="frame" x="0.0" y="566" width="375" height="45"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yP9-3c-Nsi">
+                    <rect key="frame" x="0.0" y="33" width="414" height="573"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Instructions" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hVp-7b-LaH">
+                    <rect key="frame" x="8" y="0.0" width="406" height="33"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="33" id="ifp-BQ-89C"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="15"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IR2-AV-hdI" customClass="MIdtransUIBorderedView">
+                    <rect key="frame" x="0.0" y="606" width="414" height="74"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R5N-1g-nRK">
-                            <rect key="frame" x="295.5" y="11" width="41.5" height="23"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kSW-zm-lI9">
+                            <rect key="frame" x="15" y="18" width="76.666666666666671" height="15.333333333333336"/>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Rp. 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K03-hv-mzA">
+                            <rect key="frame" x="330.66666666666669" y="0.0" width="43.333333333333314" height="50"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
-                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Total Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wTK-UF-0hG">
-                            <rect key="frame" x="15" y="14.5" width="73.5" height="16.5"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="USZ-nz-l5t">
+                            <rect key="frame" x="379" y="15" width="20" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="Rqo-HU-iHj"/>
+                                <constraint firstAttribute="width" constant="20" id="w54-DS-AYI"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Order Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tuh-Lp-kv2">
+                            <rect key="frame" x="15" y="49" width="166" height="15.333333333333329"/>
                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
                             <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon-help.png" translatesAutoresizingMaskIntoConstraints="NO" id="oWw-tX-daM">
-                            <rect key="frame" x="345" y="15" width="15" height="15"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="{{order Id}}" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0p6-Xj-dwl">
+                            <rect key="frame" x="221" y="49" width="178" height="17"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="15" id="x4p-r6-rlM"/>
-                                <constraint firstAttribute="height" constant="15" id="xYK-1l-smB"/>
+                                <constraint firstAttribute="width" constant="178" id="5Cc-lX-UZT"/>
+                                <constraint firstAttribute="height" constant="17" id="hLF-fb-t1l"/>
                             </constraints>
-                        </imageView>
+                            <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="13"/>
+                            <color key="textColor" red="0.56078431370000004" green="0.5568627451" blue="0.58039215690000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstItem="oWw-tX-daM" firstAttribute="centerY" secondItem="6Q1-Xk-dy5" secondAttribute="centerY" id="JZJ-RC-EOQ"/>
-                        <constraint firstItem="oWw-tX-daM" firstAttribute="leading" secondItem="R5N-1g-nRK" secondAttribute="trailing" constant="8" id="bVa-0b-KCK"/>
-                        <constraint firstAttribute="trailing" secondItem="oWw-tX-daM" secondAttribute="trailing" constant="15" id="dKh-K9-aDh"/>
-                        <constraint firstAttribute="height" constant="45" id="mC7-aW-gqh"/>
-                        <constraint firstItem="R5N-1g-nRK" firstAttribute="centerY" secondItem="6Q1-Xk-dy5" secondAttribute="centerY" id="wYl-eP-Qe9"/>
+                        <constraint firstItem="USZ-nz-l5t" firstAttribute="centerY" secondItem="IR2-AV-hdI" secondAttribute="centerY" constant="-12" id="27i-bN-B4w"/>
+                        <constraint firstItem="tuh-Lp-kv2" firstAttribute="leading" secondItem="IR2-AV-hdI" secondAttribute="leading" constant="15" id="Efq-3J-lAu"/>
+                        <constraint firstAttribute="bottom" secondItem="K03-hv-mzA" secondAttribute="bottom" constant="24" id="GnE-i7-sWF"/>
+                        <constraint firstItem="K03-hv-mzA" firstAttribute="top" secondItem="IR2-AV-hdI" secondAttribute="top" id="HTt-eC-ZlU"/>
+                        <constraint firstItem="0p6-Xj-dwl" firstAttribute="top" secondItem="IR2-AV-hdI" secondAttribute="top" constant="49" id="PQP-S4-E6G"/>
+                        <constraint firstItem="K03-hv-mzA" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="kSW-zm-lI9" secondAttribute="trailing" constant="8" id="RbZ-dr-6Fo"/>
+                        <constraint firstItem="kSW-zm-lI9" firstAttribute="leading" secondItem="IR2-AV-hdI" secondAttribute="leading" constant="15" id="U3Z-pb-vMQ"/>
+                        <constraint firstAttribute="trailing" secondItem="0p6-Xj-dwl" secondAttribute="trailing" constant="15" id="WmL-Ef-lTW"/>
+                        <constraint firstAttribute="trailing" secondItem="K03-hv-mzA" secondAttribute="trailing" constant="40" id="amI-YD-T3R"/>
+                        <constraint firstItem="tuh-Lp-kv2" firstAttribute="top" secondItem="IR2-AV-hdI" secondAttribute="top" constant="49" id="bDO-B8-CAe"/>
+                        <constraint firstItem="0p6-Xj-dwl" firstAttribute="leading" secondItem="tuh-Lp-kv2" secondAttribute="trailing" constant="40" id="naK-th-orD"/>
+                        <constraint firstAttribute="height" constant="74" id="rCb-pY-bNH"/>
+                        <constraint firstItem="kSW-zm-lI9" firstAttribute="centerY" secondItem="K03-hv-mzA" secondAttribute="centerY" id="vCY-hO-hHn"/>
+                        <constraint firstAttribute="trailing" secondItem="USZ-nz-l5t" secondAttribute="trailing" constant="15" id="vOw-Ys-YJa"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
-                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
                         <userDefinedRuntimeAttribute type="number" keyPath="borderLineWidth">
                             <integer key="value" value="1"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="topLine" value="YES"/>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderLineColor">
+                            <color key="value" red="0.7843137255" green="0.78039215689999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="bottomLine" value="YES"/>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yP9-3c-Nsi">
-                    <rect key="frame" x="0.0" y="33" width="375" height="533"/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Instructions" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hVp-7b-LaH">
-                    <rect key="frame" x="8" y="0.0" width="367" height="33"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="33" id="ifp-BQ-89C"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" name="SourceSansPro-Semibold" family="Source Sans Pro" pointSize="15"/>
-                    <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="calibratedWhite"/>
-                    <nil key="highlightedColor"/>
-                </label>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstItem="IR2-AV-hdI" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="2jN-UG-XWT"/>
                 <constraint firstAttribute="trailing" secondItem="giA-MC-o9d" secondAttribute="trailing" constant="8" id="2rs-OR-D3f"/>
+                <constraint firstItem="IR2-AV-hdI" firstAttribute="top" secondItem="yP9-3c-Nsi" secondAttribute="bottom" id="EOd-9o-bb8"/>
                 <constraint firstAttribute="bottom" secondItem="giA-MC-o9d" secondAttribute="bottom" constant="8" id="GMg-QG-54F"/>
-                <constraint firstItem="giA-MC-o9d" firstAttribute="top" secondItem="6Q1-Xk-dy5" secondAttribute="bottom" constant="8" id="Svr-Fl-sB4"/>
-                <constraint firstItem="6Q1-Xk-dy5" firstAttribute="top" secondItem="yP9-3c-Nsi" secondAttribute="bottom" id="Vgd-Iy-WWa"/>
                 <constraint firstAttribute="trailing" secondItem="yP9-3c-Nsi" secondAttribute="trailing" id="WXx-Yi-jZ7"/>
                 <constraint firstItem="hVp-7b-LaH" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="cAS-jy-hk0"/>
+                <constraint firstAttribute="trailing" secondItem="IR2-AV-hdI" secondAttribute="trailing" id="eWV-Fo-4UW"/>
                 <constraint firstItem="yP9-3c-Nsi" firstAttribute="top" secondItem="hVp-7b-LaH" secondAttribute="bottom" id="fzG-Xk-3wX"/>
-                <constraint firstAttribute="trailing" secondItem="6Q1-Xk-dy5" secondAttribute="trailing" id="hVv-QK-UTn"/>
+                <constraint firstItem="giA-MC-o9d" firstAttribute="top" secondItem="IR2-AV-hdI" secondAttribute="bottom" constant="8" id="jTz-Tt-dwX"/>
                 <constraint firstItem="yP9-3c-Nsi" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="kgt-qT-2XA"/>
                 <constraint firstAttribute="trailing" secondItem="hVp-7b-LaH" secondAttribute="trailing" id="rGu-z2-JTM"/>
                 <constraint firstItem="hVp-7b-LaH" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="t71-tN-KDV"/>
-                <constraint firstItem="6Q1-Xk-dy5" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="tSu-gf-is5"/>
                 <constraint firstItem="giA-MC-o9d" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="8" id="trq-Cg-nXw"/>
             </constraints>
+            <point key="canvasLocation" x="24.5" y="51.5"/>
         </view>
     </objects>
     <resources>
diff --git a/MidtransSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MidtransSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 000000000..18d981003
--- /dev/null
+++ b/MidtransSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Podpecs/MidtransCoreKit.podspec b/Podpecs/MidtransCoreKit.podspec
index a79051f8e..8055fa08b 100644
--- a/Podpecs/MidtransCoreKit.podspec
+++ b/Podpecs/MidtransCoreKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name             = "MidtransCoreKit"
-s.version          = "1.12.0"
+s.version          = "1.12.1"
 s.summary          = "Veritrans mobile SDK beta version"
 s.homepage         = "https://veritrans.co.id/"
 s.license          = 'MIT'
diff --git a/Podpecs/MidtransKit.podspec b/Podpecs/MidtransKit.podspec
index c2bd7bf4b..e7d5892f8 100644
--- a/Podpecs/MidtransKit.podspec
+++ b/Podpecs/MidtransKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name             = "MidtransKit"
-s.version          = "1.12.0"
+s.version          = "1.12.1"
 s.summary          = "Veritrans mobile SDK beta version"
 s.homepage         = "https://veritrans.co.id/"
 s.license          = 'MIT'
@@ -17,7 +17,7 @@ s.source_files = 'MidtransKit/MidtransKit/**/*.{h,m}'
 s.resource_bundles = {
     'MidtransKit' => ['MidtransKit/MidtransKit/resources/*']
 }
-s.dependency 'MidtransCoreKit', '~>1.12.0'
+s.dependency 'MidtransCoreKit', '~>1.12.1'
 s.static_framework = true
 s.default_subspec = 'UI'