Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
efa0db0
Merge pull request #3018 from IntersectMBO/develop
MSzalowski Feb 18, 2025
a18a329
Merge pull request #3043 from IntersectMBO/develop
MSzalowski Feb 20, 2025
e54a962
Merge pull request #3050 from IntersectMBO/develop
MSzalowski Feb 21, 2025
fee17f6
Merge pull request #3051 from IntersectMBO/test
MSzalowski Feb 21, 2025
a904162
Merge pull request #3052 from IntersectMBO/staging
MSzalowski Feb 21, 2025
bac384c
Merge pull request #3064 from IntersectMBO/develop
MSzalowski Feb 25, 2025
dc9f16b
Merge pull request #3075 from IntersectMBO/develop
MSzalowski Feb 25, 2025
c9a9eee
Merge pull request #3087 from IntersectMBO/develop
MSzalowski Feb 26, 2025
a0871b7
Merge pull request #3073 from IntersectMBO/test
MSzalowski Feb 26, 2025
8ee5690
Merge pull request #3088 from IntersectMBO/staging
MSzalowski Feb 26, 2025
9e1651e
Merge pull request #3097 from IntersectMBO/develop
MSzalowski Feb 27, 2025
e022567
Merge pull request #3099 from IntersectMBO/test
MSzalowski Feb 27, 2025
56bd10c
Merge pull request #3100 from IntersectMBO/staging
MSzalowski Feb 27, 2025
086dc66
Merge pull request #3127 from IntersectMBO/develop
MSzalowski Mar 4, 2025
57f3500
Merge pull request #3129 from IntersectMBO/test
MSzalowski Mar 4, 2025
28b7b21
Merge pull request #3130 from IntersectMBO/staging
MSzalowski Mar 4, 2025
832ad7b
Merge pull request #3146 from IntersectMBO/develop
MSzalowski Mar 5, 2025
465d43c
Merge pull request #3156 from IntersectMBO/develop
MSzalowski Mar 6, 2025
b13348d
Merge pull request #3157 from IntersectMBO/develop
MSzalowski Mar 6, 2025
8f24c03
Merge pull request #3147 from IntersectMBO/test
MSzalowski Mar 6, 2025
0154ff5
Merge pull request #3159 from IntersectMBO/develop
aaboyle878 Mar 6, 2025
7390066
Merge pull request #3160 from IntersectMBO/test
MSzalowski Mar 6, 2025
abc999b
Merge pull request #3161 from IntersectMBO/staging
MSzalowski Mar 7, 2025
667b29b
Merge pull request #3169 from IntersectMBO/develop
MSzalowski Mar 11, 2025
d6ccd39
Merge pull request #3175 from IntersectMBO/develop
MSzalowski Mar 11, 2025
9a63f64
Merge pull request #3176 from IntersectMBO/test
MSzalowski Mar 11, 2025
b23b8e7
Merge pull request #3177 from IntersectMBO/staging
MSzalowski Mar 11, 2025
551da6b
hotfix: fix ada handle and payment address validation order
MSzalowski Mar 11, 2025
c232f98
Merge pull request #3178 from IntersectMBO/hotfix/ada-handle-and-paym…
MSzalowski Mar 11, 2025
8280b1f
Merge pull request #3179 from IntersectMBO/main
MSzalowski Mar 11, 2025
b4384c9
Merge pull request #3180 from IntersectMBO/staging
MSzalowski Mar 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ changes.

### Fixed

- hotfix for ada handle and payment address validation order [Issue 3155](https://github.com/IntersectMBO/govtool/issues/3155)

### Changed

### Removed

## [v2.0.15](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.15) 2025-03-11


### Added

- Add support for ada handle in drep payment address [Issue 3155](https://github.com/IntersectMBO/govtool/issues/3155)
Expand Down
10 changes: 6 additions & 4 deletions govtool/frontend/src/utils/isValidFormat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,18 @@ export async function isReceivingAddress(address?: string) {
return true;
}

const receivingAddress = Address.from_bech32(address);
if (receivingAddress) {
return true;
}
// Validation for ada handles needs to go first as
// handles might be shorter then bech32 addresses
const isValidAdaHandle = await adaHandleService.isValidAdaHandle(address);

if (isValidAdaHandle) {
return true;
}

const receivingAddress = Address.from_bech32(address);
if (receivingAddress) {
return true;
}
return i18n.t("forms.errors.mustBeReceivingAddress");
} catch (e) {
return i18n.t("forms.errors.mustBeReceivingAddress");
Expand Down