Skip to content

Commit

Permalink
feat(settings): add link to Matrix and Jam's twitter (#436)
Browse files Browse the repository at this point in the history
* feat(settings): add link to Jam twitter

* feat(settings): add link to Matrix

* fix(settings): repo rename

* feat: add matrix logo to sprite.svg

* fix(components): repo rename
  • Loading branch information
dergigi committed Aug 1, 2022
1 parent 05c908d commit ca3cc20
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 5 deletions.
3 changes: 3 additions & 0 deletions public/sprite.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export default function App() {
<div className="d-flex flex-1 order-2 justify-content-end align-items-center gap-1">
<div className="warning-hint text-start text-secondary d-none d-md-block pe-1">
<a
href="https://github.com/joinmarket-webui/joinmarket-webui/tags"
href="https://github.com/joinmarket-webui/jam/tags"
target="_blank"
rel="noopener noreferrer"
className="d-flex align-items-center text-secondary"
Expand All @@ -200,7 +200,7 @@ export default function App() {
</div>
<div className="d-flex gap-2 pe-2">
<a
href="https://github.com/joinmarket-webui/joinmarket-webui"
href="https://github.com/joinmarket-webui/jam"
target="_blank"
rel="noopener noreferrer"
className="d-flex align-items-center text-secondary"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Onboarding.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default function Onboarding() {
<Trans i18nKey="onboarding.splashscreen_warning_text">
While JoinMarket is tried and tested, Jam is not. It is in a beta stage, so use with caution.
<a
href="https://github.com/joinmarket-webui/joinmarket-webui/issues"
href="https://github.com/joinmarket-webui/jam/issues"
target="_blank"
rel="noopener noreferrer"
className="link-secondary"
Expand Down
21 changes: 19 additions & 2 deletions src/components/Settings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export default function Settings({ stopWallet }) {
)
})}
<rb.Dropdown.Item
href="https://github.com/joinmarket-webui/joinmarket-webui/tree/master/src/i18n/README.md"
href="https://github.com/joinmarket-webui/jam/tree/master/src/i18n/README.md"
target="_blank"
rel="noopener noreferrer"
>
Expand Down Expand Up @@ -273,7 +273,7 @@ export default function Settings({ stopWallet }) {
<div className={styles['section-title']}>{t('settings.section_title_community')}</div>
<div className={styles['settings-links']}>
<a
href="https://github.com/joinmarket-webui/joinmarket-webui"
href="https://github.com/joinmarket-webui/jam"
target="_blank"
rel="noopener noreferrer"
className="link-dark"
Expand All @@ -283,12 +283,29 @@ export default function Settings({ stopWallet }) {
{t('settings.github')}
</div>
</a>
<a
href="https://matrix.to/#/%23jam:matrix.dergigi.com"
target="_blank"
rel="noopener noreferrer"
className="link-dark"
>
<div className="d-flex align-items-center">
<Sprite symbol="matrix" width="24" height="24" className="me-2 p-1" />
{t('settings.matrix')}
</div>
</a>
<a href="https://t.me/JoinMarketWebUI" target="_blank" rel="noopener noreferrer" className="link-dark">
<div className="d-flex align-items-center">
<Sprite symbol="telegram" width="24" height="24" className="me-2 p-1" />
{t('settings.telegram')}
</div>
</a>
<a href="https://twitter.com/jamapporg" target="_blank" rel="noopener noreferrer" className="link-dark">
<div className="d-flex align-items-center">
<Sprite symbol="twitter" width="24" height="24" className="me-2 p-1" />
{t('settings.jam_twitter')}
</div>
</a>
<a href="https://twitter.com/joinmarket" target="_blank" rel="noopener noreferrer" className="link-dark">
<div className="d-flex align-items-center">
<Sprite symbol="twitter" width="24" height="24" className="me-2 p-1" />
Expand Down
2 changes: 2 additions & 0 deletions src/i18n/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,10 @@
"error_loading_seed_failed": "Could not retrieve seed phrase.",
"seed_modal_info_text": "Please write down your seed phrase and password! Without this information you will not be able to access and recover your wallet!",
"github": "GitHub",
"matrix": "Matrix",
"telegram": "Telegram",
"jm_twitter": "JoinMarket Twitter",
"jam_twitter": "Jam Twitter",
"confirm_locking_modal_title": "Lock Wallet",
"confirm_locking_modal_body_earn": "Earn is active. Locking the wallet will stop the service. You can close the browser window to let it run in the background.",
"confirm_locking_modal_body_jam": "A collaborative transaction is being executed. Locking the wallet will stop the service. You can close the browser window to let it run in the background."
Expand Down

0 comments on commit ca3cc20

Please sign in to comment.