From fdfcdd300aa5196cb64bb8251c3cef9ac4823d58 Mon Sep 17 00:00:00 2001 From: Zach Harrison Date: Wed, 10 Apr 2024 17:22:38 -0700 Subject: [PATCH 01/11] Change direction of tooltip popover --- .../sqm-tax-and-cash-dashboard-view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mint-components/src/components/tax-and-cash/sqm-tax-and-cash-dashboard/sqm-tax-and-cash-dashboard-view.tsx b/packages/mint-components/src/components/tax-and-cash/sqm-tax-and-cash-dashboard/sqm-tax-and-cash-dashboard-view.tsx index 2f82ef906..54cbe2918 100644 --- a/packages/mint-components/src/components/tax-and-cash/sqm-tax-and-cash-dashboard/sqm-tax-and-cash-dashboard-view.tsx +++ b/packages/mint-components/src/components/tax-and-cash/sqm-tax-and-cash-dashboard/sqm-tax-and-cash-dashboard-view.tsx @@ -531,7 +531,7 @@ export const TaxAndCashDashboardView = (props: TaxAndCashDashboardProps) => { {text.indirectTaxInfoSectionHeader} From f68b232fa0cc4b5217592c7c381b8b4b26ff3802 Mon Sep 17 00:00:00 2001 From: Zach Harrison Date: Thu, 11 Apr 2024 10:24:27 -0700 Subject: [PATCH 02/11] Update changelog --- packages/mint-components/CHANGELOG.md | 7 +++++++ packages/mint-components/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/mint-components/CHANGELOG.md b/packages/mint-components/CHANGELOG.md index 89699da6b..b4db7a579 100644 --- a/packages/mint-components/CHANGELOG.md +++ b/packages/mint-components/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.8.2] - 2024-04-11 + +- \ + - Changed direction of tooltip popover to prevent it from getting cut off + +## [Unreleased] + ## [1.8.0] - 2024-04-10 ### Changed diff --git a/packages/mint-components/package.json b/packages/mint-components/package.json index 6f9fce05c..6523f8bc3 100644 --- a/packages/mint-components/package.json +++ b/packages/mint-components/package.json @@ -1,7 +1,7 @@ { "name": "@saasquatch/mint-components", "title": "Mint Components", - "version": "1.8.0", + "version": "1.8.1-1", "description": "A minimal design library with components for referral and loyalty experiences. Built with Shoelace components by Saasquatch.", "icon": "https://res.cloudinary.com/saasquatch/image/upload/v1652219900/squatch-assets/For_Mint.svg", "raisins": "docs/raisins.json", From aed3ddeff7c7499d89ca544a33e0e36cd9a10e2f Mon Sep 17 00:00:00 2001 From: Locrian24 Date: Wed, 10 Apr 2024 17:03:51 -0700 Subject: [PATCH 03/11] look at proper publisher object to determine if to skip step 4 --- .../tax-and-cash/sqm-indirect-tax-form/useIndirectTaxForm.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/mint-components/src/components/tax-and-cash/sqm-indirect-tax-form/useIndirectTaxForm.tsx b/packages/mint-components/src/components/tax-and-cash/sqm-indirect-tax-form/useIndirectTaxForm.tsx index 783f7212b..817d4965d 100644 --- a/packages/mint-components/src/components/tax-and-cash/sqm-indirect-tax-form/useIndirectTaxForm.tsx +++ b/packages/mint-components/src/components/tax-and-cash/sqm-indirect-tax-form/useIndirectTaxForm.tsx @@ -42,6 +42,7 @@ type ConnectPartnerResult = { impactConnection: { connected: boolean; publisher: { + brandedSignup: boolean; requiredTaxDocumentType: TaxDocumentType | null; currentTaxDocument: null | CurrentTaxDocument; }; @@ -72,6 +73,7 @@ const CONNECT_PARTNER = gql` impactConnection { connected publisher { + brandedSignup requiredTaxDocumentType currentTaxDocument { type @@ -264,7 +266,7 @@ export function useIndirectTaxForm(props: IndirectTaxForm) { // Go to docusign form setStep("/3"); } else { - if (publisher?.brandedSignup) { + if (resultPublisher?.brandedSignup) { // Go to banking information form setStep("/4"); } else { From 787b46128a38f668902f3c80b277597f7f0f0028 Mon Sep 17 00:00:00 2001 From: Locrian24 Date: Wed, 10 Apr 2024 17:14:32 -0700 Subject: [PATCH 04/11] changelog and package version update --- packages/mint-components/CHANGELOG.md | 7 +++++++ packages/mint-components/package-lock.json | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/mint-components/CHANGELOG.md b/packages/mint-components/CHANGELOG.md index b4db7a579..0909d1048 100644 --- a/packages/mint-components/CHANGELOG.md +++ b/packages/mint-components/CHANGELOG.md @@ -14,6 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.8.1] - 2024-04-10 + +### Fixed + +- \ + - Fix issue where a non-US user in a non-US brand would skip step 4 of the Tax and Cash form. + ## [1.8.0] - 2024-04-10 ### Changed diff --git a/packages/mint-components/package-lock.json b/packages/mint-components/package-lock.json index 92dc3f575..5012e5cca 100644 --- a/packages/mint-components/package-lock.json +++ b/packages/mint-components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@saasquatch/mint-components", - "version": "1.8.0", + "version": "1.8.1-0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@saasquatch/mint-components", - "version": "1.8.0", + "version": "1.8.1-0", "hasInstallScript": true, "license": "MIT", "dependencies": { From b1ba6423b0375c431d54edcea2ec3e13249fc528 Mon Sep 17 00:00:00 2001 From: Locrian24 Date: Wed, 10 Apr 2024 17:16:15 -0700 Subject: [PATCH 05/11] update changelog log --- packages/mint-components/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mint-components/CHANGELOG.md b/packages/mint-components/CHANGELOG.md index 0909d1048..3acf27dbd 100644 --- a/packages/mint-components/CHANGELOG.md +++ b/packages/mint-components/CHANGELOG.md @@ -913,7 +913,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - \ - \ -[unreleased]: https://github.com/saasquatch/program-tools/compare/mint-components@1.8.0...HEAD +[unreleased]: https://github.com/saasquatch/program-tools/compare/mint-components@1.8.1...HEAD +[1.8.1]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fmint-components%401.8.1 [1.8.0]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fmint-components%401.8.0 [1.7.6]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fmint-components%401.7.6 [1.7.5]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fmint-components%401.7.5 From 15c93b3faefb98aba453fcc604c92555b44e3e2e Mon Sep 17 00:00:00 2001 From: Locrian24 Date: Wed, 10 Apr 2024 17:17:00 -0700 Subject: [PATCH 06/11] package-lock update --- packages/mint-components/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mint-components/package-lock.json b/packages/mint-components/package-lock.json index 5012e5cca..862a13120 100644 --- a/packages/mint-components/package-lock.json +++ b/packages/mint-components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@saasquatch/mint-components", - "version": "1.8.1-0", + "version": "1.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@saasquatch/mint-components", - "version": "1.8.1-0", + "version": "1.8.1", "hasInstallScript": true, "license": "MIT", "dependencies": { From f1d0083332006035476dadd24f226be61a26ffa7 Mon Sep 17 00:00:00 2001 From: Locrian24 Date: Wed, 10 Apr 2024 17:20:18 -0700 Subject: [PATCH 07/11] fix html import in story file --- .../mint-components/src/stories/PortalTemplates.stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mint-components/src/stories/PortalTemplates.stories.tsx b/packages/mint-components/src/stories/PortalTemplates.stories.tsx index 54c9a8f7e..71743e246 100644 --- a/packages/mint-components/src/stories/PortalTemplates.stories.tsx +++ b/packages/mint-components/src/stories/PortalTemplates.stories.tsx @@ -14,7 +14,7 @@ import editProfileTemplate from "../templates/EditProfile.html"; import activityTemplate from "../templates/Activity.html"; import resetPasswordEmailTemplate from "../templates/ResetPasswordEmail.html"; import verifyEmailTemplate from "../templates/VerifyEmail.html"; -import taxPayoutReminderEmailTemplate from "../templates/taxPayoutReminderEmail.html"; +import taxPayoutReminderEmailTemplate from "../templates/TaxPayoutReminderEmail.html"; import loginTemplate from "../templates/Login.html"; import registerTemplate from "../templates/Register.html"; import forgotPasswordTemplate from "../templates/ForgotPassword.html"; From 0d984f4574c14049405a640b2c05d728eb8d6a14 Mon Sep 17 00:00:00 2001 From: Zach Harrison Date: Thu, 11 Apr 2024 10:28:32 -0700 Subject: [PATCH 08/11] merge master --- packages/mint-components/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mint-components/CHANGELOG.md b/packages/mint-components/CHANGELOG.md index 3acf27dbd..51fa531d6 100644 --- a/packages/mint-components/CHANGELOG.md +++ b/packages/mint-components/CHANGELOG.md @@ -913,7 +913,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - \ - \ -[unreleased]: https://github.com/saasquatch/program-tools/compare/mint-components@1.8.1...HEAD +[unreleased]: https://github.com/saasquatch/program-tools/compare/mint-components@1.8.2...HEAD +[1.8.2]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fmint-components%401.8.2 [1.8.1]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fmint-components%401.8.1 [1.8.0]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fmint-components%401.8.0 [1.7.6]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fmint-components%401.7.6 From 2b7474fb6a9237c3eb846e630a97ace1c4637ab4 Mon Sep 17 00:00:00 2001 From: Zach Harrison Date: Thu, 11 Apr 2024 10:34:46 -0700 Subject: [PATCH 09/11] Fix pre release version --- packages/mint-components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mint-components/package.json b/packages/mint-components/package.json index 6523f8bc3..9663c2558 100644 --- a/packages/mint-components/package.json +++ b/packages/mint-components/package.json @@ -1,7 +1,7 @@ { "name": "@saasquatch/mint-components", "title": "Mint Components", - "version": "1.8.1-1", + "version": "1.8.2-0", "description": "A minimal design library with components for referral and loyalty experiences. Built with Shoelace components by Saasquatch.", "icon": "https://res.cloudinary.com/saasquatch/image/upload/v1652219900/squatch-assets/For_Mint.svg", "raisins": "docs/raisins.json", From ca375a2904669f52e865bdb996ab9f006a42961c Mon Sep 17 00:00:00 2001 From: Zach Harrison Date: Thu, 11 Apr 2024 16:22:30 -0700 Subject: [PATCH 10/11] Get code ready for deploy --- packages/mint-components/CHANGELOG.md | 2 +- packages/mint-components/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mint-components/CHANGELOG.md b/packages/mint-components/CHANGELOG.md index 51fa531d6..b5f32d0f7 100644 --- a/packages/mint-components/CHANGELOG.md +++ b/packages/mint-components/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [1.8.2] - 2024-04-11 +## [1.8.2] - 2024-04-12 - \ - Changed direction of tooltip popover to prevent it from getting cut off diff --git a/packages/mint-components/package.json b/packages/mint-components/package.json index 9663c2558..ff08ffecd 100644 --- a/packages/mint-components/package.json +++ b/packages/mint-components/package.json @@ -1,7 +1,7 @@ { "name": "@saasquatch/mint-components", "title": "Mint Components", - "version": "1.8.2-0", + "version": "1.8.2", "description": "A minimal design library with components for referral and loyalty experiences. Built with Shoelace components by Saasquatch.", "icon": "https://res.cloudinary.com/saasquatch/image/upload/v1652219900/squatch-assets/For_Mint.svg", "raisins": "docs/raisins.json", From f512ec2f3669feff75d9897e12af915a94017e83 Mon Sep 17 00:00:00 2001 From: Zach Harrison Date: Fri, 12 Apr 2024 14:07:41 -0700 Subject: [PATCH 11/11] Remove the extra unreleased --- packages/mint-components/CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/mint-components/CHANGELOG.md b/packages/mint-components/CHANGELOG.md index b5f32d0f7..d85163740 100644 --- a/packages/mint-components/CHANGELOG.md +++ b/packages/mint-components/CHANGELOG.md @@ -12,8 +12,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - \ - Changed direction of tooltip popover to prevent it from getting cut off -## [Unreleased] - ## [1.8.1] - 2024-04-10 ### Fixed