diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5fe2f0b23f1..eb4fb05e49d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,8 +15,7 @@ updates: interval: "daily" # Maintain dependencies for yarn - - package-ecosystem: "yarn" + - package-ecosystem: "npm" directory: "/" schedule: interval: "daily" - diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 1a6d2b6eeb6..924e16b5da2 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -15,6 +15,7 @@ on: jobs: lint: runs-on: ubuntu-latest + if: (github.actor != 'dependabot[bot]') steps: - uses: amannn/action-semantic-pull-request@v3.4.2 env: diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 3af422104ab..7684d5df044 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -20,6 +20,7 @@ jobs: - uses: returntocorp/semgrep-action@v1 with: generateSarif: "1" + auditOn: push config: >- # more at semgrep.dev/explore p/security-audit p/typescript @@ -29,25 +30,6 @@ jobs: p/react p/r2c-ci p/owasp-top-ten - p/r2c-best-practices - - # == Optional settings in the `with:` block - - # Instead of `config:`, use rules set in Semgrep App. - # Get your token from semgrep.dev/manage/settings. - # publishToken: ${{ secrets.SEMGREP_APP_TOKEN }} - - # Never fail the build due to findings on pushes. - # Instead, just collect findings for semgrep.dev/manage/findings - # auditOn: push - - # Upload findings to GitHub Advanced Security Dashboard [step 1/2] - # See also the next step. - - - # Change job timeout (default is 1800 seconds; set to 0 to disable) - # env: - # SEMGREP_TIMEOUT: 300 # Upload findings to GitHub Advanced Security Dashboard [step 2/2] - name: Upload SARIF file for GitHub Advanced Security Dashboard diff --git a/App.tsx b/App.tsx index fbe807923fd..da3364adf9c 100644 --- a/App.tsx +++ b/App.tsx @@ -74,7 +74,7 @@ class App extends React.PureComponent { render() { return ( <> - {!__DEV__ && } + {!__DEV__ ? : null} { {this.props.label} - {this.props.removable && } + {this.props.removable ? : null} ); } diff --git a/src/components/Dropdown.tsx b/src/components/Dropdown.tsx index 21193820aed..2a5890c3b65 100644 --- a/src/components/Dropdown.tsx +++ b/src/components/Dropdown.tsx @@ -17,7 +17,7 @@ export const Dropdown = ({ title, label, testID, onSelectPress }: Props) => { {title} - {onSelectPress && } + {onSelectPress ? : null} {label} diff --git a/src/components/InputItem.tsx b/src/components/InputItem.tsx index 2b2b05a9418..b8575124a8e 100644 --- a/src/components/InputItem.tsx +++ b/src/components/InputItem.tsx @@ -131,7 +131,7 @@ export class InputItem extends Component { return ( {label} - {!!suffix && {suffix}} + {!!suffix ? {suffix} : null} { keyboardType="number-pad" renderCell={({ index, symbol, isFocused }) => ( - {!!symbol && } + {!!symbol ? : null} )} /> diff --git a/src/components/PinView.tsx b/src/components/PinView.tsx index dcb9bf02910..8941f4fa0e1 100644 --- a/src/components/PinView.tsx +++ b/src/components/PinView.tsx @@ -28,7 +28,7 @@ export class PinView extends Component { }, ]} > - {isFilled && } + {isFilled ? : null} ); })} diff --git a/src/components/TransactionItem.tsx b/src/components/TransactionItem.tsx index 530b6cd39a6..677b313c597 100644 --- a/src/components/TransactionItem.tsx +++ b/src/components/TransactionItem.tsx @@ -43,7 +43,7 @@ export const TransactionItem = ({ item, onPress, testID }: Props) => { {item.walletLabel} - {!!item.note && {item.note}} + {!!item.note ? {item.note} : null} {item.time ? dayjs(item.received).format('LT') : i18n.transactions.details.timePending} diff --git a/src/components/WalletItem.tsx b/src/components/WalletItem.tsx index 7e0f5c8b7e5..b00c303c359 100644 --- a/src/components/WalletItem.tsx +++ b/src/components/WalletItem.tsx @@ -31,7 +31,7 @@ export const WalletItem = (props: WalletItemProps) => { - {selected && } + {selected ? : null} {i18n.formatBalance(Number(value), unit, true)} diff --git a/src/navigators/Navigator.tsx b/src/navigators/Navigator.tsx index 30a296463c8..17745a5c26a 100644 --- a/src/navigators/Navigator.tsx +++ b/src/navigators/Navigator.tsx @@ -274,10 +274,10 @@ class Navigator extends React.Component { shouldRenderNotification={this.shouldRenderNotification()} userVersion={userVersion} /> - {isAuthenticated && } - {isToast && } - {this.shouldRenderConnectionIssues() && } - {this.shouldRenderUnlockScreen() && } + {isAuthenticated ? : null} + {isToast ? : null} + {this.shouldRenderConnectionIssues() ? : null} + {this.shouldRenderUnlockScreen() ? : null} ); }; diff --git a/src/screens/ExportWalletScreen.tsx b/src/screens/ExportWalletScreen.tsx index d21c095a8bb..d826e8ede9c 100644 --- a/src/screens/ExportWalletScreen.tsx +++ b/src/screens/ExportWalletScreen.tsx @@ -30,7 +30,7 @@ export const ExportWalletScreen = ({ route }: Props) => { }> {i18n.wallets.exportWallet.title} - {secret && } + {secret ? : null} diff --git a/src/screens/MessageScreen.tsx b/src/screens/MessageScreen.tsx index dda78cacd0d..936c57ea21e 100644 --- a/src/screens/MessageScreen.tsx +++ b/src/screens/MessageScreen.tsx @@ -38,7 +38,7 @@ export const MessageScreen = (props: Props) => { {title} {description} - {buttonProps &&