Merge remote-tracking branch 'ledger_fork/master' into dev

Zondax · Mar 18, 2022 · 4958864 · 4958864
2 parents 97e7f02 + a14a362
commit 4958864
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/ledger.yml b/.github/workflows/ledger.yml
@@ -3,9 +3,9 @@ name: CI
 on:
  # Triggers the workflow on push or pull request events but only for the main branch
  push:
- branches: [ main ]
+ branches: [ master ]
  pull_request:
- branches: [ main ]
+ branches: [ master ]
 
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,5 +1,9 @@
 name: Build
-on: [push]
+on:
+ push:
+ pull_request:
+ branches:
+ - master
 
 jobs:
  configure:

diff --git a/app/Makefile b/app/Makefile
@@ -97,11 +97,6 @@ endif
 
 APP_LOAD_PARAMS = --curve ed25519 --delete $(COMMON_LOAD_PARAMS) --path $(APPPATH)
 
-# Pending review parameters
-APP_LOAD_PARAMS += --tlvraw 9F:01
-DEFINES += HAVE_PENDING_REVIEW_SCREEN
-
-
 ifeq ($(TARGET_NAME),TARGET_NANOS)
 APP_LOAD_PARAMS += --appFlags 0x000
 APP_STACK_SIZE:=3216