Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: If a clientPermalinkBaseUrl is defined, we still have to support matrix.to links #7482

Merged
merged 1 commit into from
Apr 11, 2023

Conversation

nimau
Copy link
Contributor

@nimau nimau commented Apr 7, 2023

Currently, if a custom permalinkBaseUrl is set, matrix.to permalinks are not rendered as pills.
This fix is intended to support both types of permalinks.

Current behaviour:
before

New behaviour:
after

Pull Request Checklist

  • I read the contributing guide
  • UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
  • Accessibility has been taken into account.
  • Pull request is based on the develop branch
  • Pull request contains a changelog file in ./changelog.d
  • You've made a self review of your PR
  • Pull request includes screenshots or videos of UI changes
  • Pull request includes a sign off

@nimau nimau force-pushed the nimau/pills-custom-base-url branch from 87fb6f6 to 904a50b Compare April 7, 2023 14:39
@nimau nimau force-pushed the nimau/pills-custom-base-url branch from 904a50b to dadeef7 Compare April 7, 2023 14:40
@sonarcloud
Copy link

sonarcloud bot commented Apr 7, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@nimau nimau marked this pull request as ready for review April 7, 2023 14:43
@nimau nimau requested review from a team and Anderas and removed request for a team April 7, 2023 14:43
@codecov
Copy link

codecov bot commented Apr 7, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (0aef339) 12.29% compared to head (dadeef7) 12.29%.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #7482   +/-   ##
========================================
  Coverage    12.29%   12.29%           
========================================
  Files         1645     1645           
  Lines       163155   163155           
  Branches     66991    66991           
========================================
+ Hits         20064    20066    +2     
+ Misses      142440   142439    -1     
+ Partials       651      650    -1     
Flag Coverage Δ
uitests 55.24% <ø> (ø)
unittests 6.19% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
Riot/Modules/MatrixKit/Utils/MXKTools.m 23.89% <100.00%> (ø)
Riot/Modules/Pills/PillType.swift 85.10% <100.00%> (ø)

... and 1 file with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Contributor

@Anderas Anderas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add some unit tests for this change?

@nimau
Copy link
Contributor Author

nimau commented Apr 11, 2023

Could we add some unit tests for this change?

I'm not sure, clientPermalinkBaseUrl is a constant defined in BuildSettings. In order to test that both types of permalinks are rendered, you need to be able to override this constant.

@nimau nimau merged commit bb12506 into develop Apr 11, 2023
13 checks passed
@nimau nimau deleted the nimau/pills-custom-base-url branch April 11, 2023 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants