diff --git a/wallet/v1/msg.proto b/wallet/v1/msg.proto
index 50c3dc5..5b6f55f 100644
--- a/wallet/v1/msg.proto
+++ b/wallet/v1/msg.proto
@@ -9,9 +9,7 @@ import "base/v1/msg.proto";
    INTERNAL DATA
 */
 
-message InternalTransactionData {
-  int64 transaction_id = 1;
-}
+message InternalTransactionData { int64 transaction_id = 1; }
 
 /*
    Federation
@@ -157,7 +155,7 @@ message AssetList {
 
 message AssetFilter {
   repeated int64 ids = 1;
-  repeated AssetType type = 2; // AssetType
+  repeated AssetType type = 2;       // AssetType
   repeated AssetType token_type = 3; // AssetType
   repeated AssetStatus status = 4;
   repeated string name = 5;
@@ -183,7 +181,8 @@ message AssetDiscountRes {
   double static_amount = 4;
   double percentage = 5;
   double max_amount = 6;
-  double effective_amount = 7; // based of asset price and discount amount in req
+  double effective_amount =
+      7; // based of asset price and discount amount in req
   optional int64 supported_asset = 8;
 }
 
@@ -198,9 +197,7 @@ message GetAssetReq {
   optional string code = 3;
 }
 
-message AssetMeta {
-  PropertyMeta property = 1;
-}
+message AssetMeta { PropertyMeta property = 1; }
 
 message PropertyMeta {
   string description = 1;
@@ -222,7 +219,7 @@ message PropertyMeta {
 }
 
 message PropertyDetail {
-  repeated Content badge = 1; // 2>
+  repeated Content badge = 1;   // 2>
   repeated Content content = 2; // 4>
 }
 
@@ -295,7 +292,8 @@ message UserBNPLReq {
   optional float amount = 7;
   optional PaymentPeriodInfo payment_period = 8;
   optional bool has_agreed_contract = 9;
-  optional int32 current_step = 10; // Can be useful for admin to change the current step
+  optional int32 current_step =
+      10; // Can be useful for admin to change the current step
   optional int64 asset_id = 11;
 }
 
@@ -392,8 +390,8 @@ message Transaction {
 
 message TransactionListFilter {
   auth.v1.InternalIAM iam = 1;
-  optional int32 page_no = 2;
-  optional int32 page_size = 3;
+  optional uint32 page_no = 2;
+  optional uint32 page_size = 3;
   optional int64 id = 4;
   optional int64 asset_id = 5;
   optional int64 from_user_id = 6;
@@ -471,7 +469,7 @@ message RedeemTokenResList {
   repeated RedeemTokenRes list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-   uint32 total_count = 4;
+  uint32 total_count = 4;
 }
 
 /*
@@ -483,9 +481,7 @@ message NationalIDReq {
   string national_id = 2;
 }
 
-message PubKeyRes {
-  string pub_key = 1;
-}
+message PubKeyRes { string pub_key = 1; }
 
 /*
    Network Details
@@ -515,7 +511,7 @@ message NetworkList {
   repeated Network list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-   uint32 total_count = 4;
+  uint32 total_count = 4;
 }
 
 /*
@@ -549,7 +545,7 @@ message CommissionList {
   repeated Commission list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-   uint32 total_count = 4;
+  uint32 total_count = 4;
 }
 
 message EffectiveCommission {
@@ -613,9 +609,7 @@ message IPGConfirmReq {
   string final_amount = 7;
 }
 
-message IPGConfirmRes {
-  string receipt_link = 1;
-}
+message IPGConfirmRes { string receipt_link = 1; }
 
 message SaleManualReq {
   auth.v1.InternalIAM iam = 1;
@@ -664,7 +658,7 @@ message DeclineBuyContractReq {
 
 message ConfirmBuyAssetReq {
   auth.v1.InternalIAM iam = 1;
-  uint64 agreement_id = 2; // Only in asset that require agreement contract
+  uint64 agreement_id = 2;      // Only in asset that require agreement contract
   optional auth.v1.TFA tfa = 3; // This might be used in the future
 }