Skip to content

Commit

Permalink
Merge pull request #6496 from TheThingsNetwork/fix/sdk-todo-comment
Browse files Browse the repository at this point in the history
Update SDK todo comment
  • Loading branch information
kschiffer authored Sep 4, 2023
2 parents 57b02bf + e24deae commit 91f67d5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion sdk/js/src/service/devices/merge.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ export default (parts, base = {}, minimum = [['ids'], ['created_at'], ['updated_
}

if (this.isLeaf) {
// TODO: Remove this once https://github.com/TheThingsNetwork/lorawan-stack/issues/4766 is resolved.
// TODO: Instead of ignoring empty time values, the merge order should be improved
// as described in the following issue comment:
// https://github.com/TheThingsNetwork/lorawan-stack/issues/4766#issuecomment-952691708
if (this.key.endsWith('_at') && e === '0001-01-01T00:00:00Z') {
return
}
Expand Down

0 comments on commit 91f67d5

Please sign in to comment.