diff --git a/CHANGELOG.md b/CHANGELOG.md
index 934b0ebb..e4172b00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 
 - Added the "Not Mapped" status to the affiliate orders table
+
+## [0.58.0] - 2022-08-25
+
 ### Changed
 
 - Added the `Combobox` component to the affiliate orders page
 - Changed the orders filter to work with the `Combobox` values
 
+## [0.57.3] - 2022-08-24
+
 ### Changed
 
 - update `admin-ui` version to `0.132.7`
@@ -27,11 +32,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - changed `Search` state to `value`, `onChange` and `onClear` props
 - `Tooltip` label to text
 
+## [0.57.2] - 2022-08-18
+
 ## [0.57.1] - 2022-08-09
 
 ### Fixed
 
 - Fixed block structure
+
 ## [0.57.0] - 2022-08-09
 
 ### Added
diff --git a/manifest.json b/manifest.json
index 3baae52a..ae3d6053 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "affiliates",
   "vendor": "vtex",
-  "version": "0.57.1",
+  "version": "0.58.0",
   "title": "Affiliates",
   "description": "App that adds support for affiliates on IO stores",
   "mustUpdateAt": "2018-01-04",
diff --git a/node/package.json b/node/package.json
index dacef4ff..ccdd81c7 100644
--- a/node/package.json
+++ b/node/package.json
@@ -34,5 +34,5 @@
     "lint": "tsc --noEmit --pretty",
     "test": "vtex-test-tools test --collectCoverage"
   },
-  "version": "0.57.1"
+  "version": "0.58.0"
 }
diff --git a/react/AffiliateProfileValidator.tsx b/react/AffiliateProfileValidator.tsx
index d28038ac..3cb7beaa 100644
--- a/react/AffiliateProfileValidator.tsx
+++ b/react/AffiliateProfileValidator.tsx
@@ -19,11 +19,16 @@ const AffiliateProfileValidator: FC<Props> = ({ Valid, Invalid }) => {
 
   const { orderForm } = useOrderForm()
 
-  const loading =
-    orderForm?.clientProfileData === undefined ||
-    affiliate.affiliateOrdersLoading
+  const loading = useMemo(() => {
+    return (
+      orderForm?.clientProfileData === undefined ||
+      affiliate.affiliateOrdersLoading
+    )
+  }, [orderForm, affiliate])
 
-  const isValid = affiliate?.affiliate?.slug === slug
+  const isValid = useMemo(() => {
+    return affiliate?.affiliate?.slug === slug
+  }, [affiliate, slug])
 
   if (loading) {
     return (
diff --git a/react/components/admin/commissions/EditCommissionModal.tsx b/react/components/admin/commissions/EditCommissionModal.tsx
index e9cf1e8a..34af532f 100644
--- a/react/components/admin/commissions/EditCommissionModal.tsx
+++ b/react/components/admin/commissions/EditCommissionModal.tsx
@@ -97,7 +97,6 @@ const EditCommissionModal: FC<EditCommissionModalProps> = ({
           suffix="%"
           value={commissionInput}
           onChange={onCommissionInputChange}
-          // tone={commissionInputError.tone}
           errorText={commissionInputError.message}
         />
       </ModalContent>
diff --git a/react/package.json b/react/package.json
index b8cd5f91..7d2853f0 100644
--- a/react/package.json
+++ b/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vtex.affiliates",
-  "version": "0.57.1",
+  "version": "0.58.0",
   "scripts": {
     "test": "vtex-test-tools test --collectCoverage"
   },