Skip to content

Commit

Permalink
Merge branch 'develop' into Ahmed/wallet-nav
Browse files Browse the repository at this point in the history
  • Loading branch information
vsubhuman authored Jan 31, 2023
2 parents f70b680 + 7c499d1 commit 8cdefac
Show file tree
Hide file tree
Showing 28 changed files with 96 additions and 796 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: SonarQube Checks

on:
# Trigger analysis when pushing to your main branches, and when creating a pull request.
push:
branches:
- main
- master
- develop
- 'releases/**'
pull_request:
types: [opened, synchronize, reopened]

jobs:
sonarqube:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
fetch-depth: 0
- name: SonarQube Scan
uses: sonarsource/sonarqube-scan-action@master
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
2 changes: 0 additions & 2 deletions packages/yoroi-extension/app/api/localStorage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ export type SetCustomUserThemeRequest = {|
export type WalletsNavigation = {|
ergo: number[],
cardano: number[],
quickAccess: number[],
|}

/**
Expand Down Expand Up @@ -300,7 +299,6 @@ export default class LocalStorageApi {
if(Array.isArray(result)) return {
cardano: [],
ergo: [],
quickAccess: [],
}

return result
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export default class NavWalletDetailsRevamp extends Component<Props> {
plate,
unitOfAccountSetting,
getCurrentPrice,
openWalletInfoDialog
} = this.props;

const totalAmount = this.getTotalAmount();
Expand All @@ -97,7 +98,7 @@ export default class NavWalletDetailsRevamp extends Component<Props> {
return (
<div className={styles.wrapper}>
<div className={styles.outerWrapper}>
<div className={styles.contentWrapper}>
<button type="button" onClick={openWalletInfoDialog} className={styles.contentWrapper}>
<div className={classnames([styles.currency])}>{iconComponent}</div>
<div className={styles.content}>
<div className={styles.walletInfo}>
Expand All @@ -123,7 +124,7 @@ export default class NavWalletDetailsRevamp extends Component<Props> {
</div>
</div>
</div>
</div>
</button>
<button disabled={totalAmount === null && !showEyeIconSafe} type="button" className={styles.toggleButton} onClick={onUpdateHideBalance}>
{shouldHideBalance ? <img src={IconEyeClosed} alt="Hide balance" /> : <img src={IconEyeOpen} alt="Show balance" />}
</button>
Expand Down
Loading

0 comments on commit 8cdefac

Please sign in to comment.