Skip to content

Commit

Permalink
Merge branch 'main' into S2BRFPA-961-adicionar-status-nao-mapeado-e-c…
Browse files Browse the repository at this point in the history
…orrigir-cancel
  • Loading branch information
GabrielBarross authored Aug 25, 2022
2 parents 62a6d16 + fe6d5af commit 5a61887
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 8 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
"lint": "tsc --noEmit --pretty",
"test": "vtex-test-tools test --collectCoverage"
},
"version": "0.57.1"
"version": "0.58.0"
}
13 changes: 9 additions & 4 deletions react/AffiliateProfileValidator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
1 change: 0 additions & 1 deletion react/components/admin/commissions/EditCommissionModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ const EditCommissionModal: FC<EditCommissionModalProps> = ({
suffix="%"
value={commissionInput}
onChange={onCommissionInputChange}
// tone={commissionInputError.tone}
errorText={commissionInputError.message}
/>
</ModalContent>
Expand Down
2 changes: 1 addition & 1 deletion react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vtex.affiliates",
"version": "0.57.1",
"version": "0.58.0",
"scripts": {
"test": "vtex-test-tools test --collectCoverage"
},
Expand Down

0 comments on commit 5a61887

Please sign in to comment.