feat: Added flex support

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "near"
-version = "2.1.0"
+version = "2.2.0"
 authors = ["dj8yf0μl", "polyprogrammist"]
 edition = "2021"
 
 [dependencies]
-ledger_device_sdk = "1.9.2"
-include_gif = "1.1.0"
+ledger_device_sdk = "=1.12.0"
+include_gif = "=1.1.0"
 hex = { version = "0.4.3", default-features = false, features = ["serde"] }
 bs58 = { version = "0.5.0", default-features = false }
 borsh =  { version = "0.1.0", path = "./borsh" }
@@ -38,6 +38,9 @@ icon = "icons/app_near_14px.gif"
 [package.metadata.ledger.stax]
 icon = "icons/app_near_32px.gif"
 
+[package.metadata.ledger.flex]
+icon = "icons/app_near_40px.gif"
+
 [features]
 default = []
 speculos = ["ledger_device_sdk/speculos"]

ledger_app.toml

@@ -1,7 +1,7 @@
 [app]
 build_directory = "./"
 sdk = "Rust"
-devices = ["nanos", "nanox", "nanos+", "stax"]
+devices = ["nanos", "nanox", "nanos+", "stax", "flex"]
 
 [tests]
 pytest_directory = "./tests/"

local_test_helper.sh

@@ -8,20 +8,21 @@ function build_all() {
     cargo ledger build nanosplus
     cargo ledger build nanox
     cargo ledger build stax
+    cargo ledger build flex
     exit
 EOF
 }
 
 function test() {
   if [[ -n "$GOLDEN" ]] ;
-  then 
+  then
     golden_suffix="--golden_run"
   else
     golden_suffix=""
   fi
 
   if [[ -n "$2" ]] ;
-  then 
+  then
     filter="-k $2"
   else
     filter=""
@@ -33,6 +34,25 @@ function test() {
 EOF
 }
 
+function test_all_nano() {
+  echo $1
+
+  if [[ -n "$1" ]] ;
+  then
+    filter="-k $1"
+  else
+    filter=""
+  fi
+  echo "$filter"
+  # docker commands to test with Ragger (for ALL)
+
+  docker run --rm -i --privileged -v "/dev/bus/usb:/dev/bus/usb" -v "$(realpath .):/app" --name app-near-container ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest  /bin/bash -s <<EOF
+  set -e
+  [ -f ./tests/requirements.txt ] && pip install -r ./tests/requirements.txt
+  pytest ./tests --log-cli-level=$PYTEST_LOG_LEVEL --tb=short $filter -v --device all_nano
+EOF
+}
+
 function test_all() {
   echo $1
 
@@ -48,10 +68,9 @@ function test_all() {
   docker run --rm -i --privileged -v "/dev/bus/usb:/dev/bus/usb" -v "$(realpath .):/app" --name app-near-container ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest  /bin/bash -s <<EOF
   set -e
   [ -f ./tests/requirements.txt ] && pip install -r ./tests/requirements.txt
-  pytest ./tests --log-cli-level=$PYTEST_LOG_LEVEL --tb=short $filter -v --device all_nano
+  pytest ./tests --log-cli-level=$PYTEST_LOG_LEVEL --tb=short $filter -v --device all
 EOF
 }
-
 while getopts ":c:t:f:g" opt; do
   case $opt in
     c) command="$OPTARG"

src/app_ui/sign/common/action/mod.rs

@@ -208,18 +208,14 @@ pub fn ui_display_delegate_error(#[allow(unused)] comm: &mut Comm) {
         let info_button = InfoButton::new(
             "Delegate action is not supported",
             Some(&NEAR_LOGO),
-            "Reject Transaction",
+            "Reject",
             TuneIndex::Success,
         );
 
         let mut review: NbglGenericReview =
             NbglGenericReview::new().add_content(NbglPageContent::InfoButton(info_button));
 
-        review.show(
-            "Reject\nTransaction",
-            "Transaction Rejected",
-            "Transaction rejected",
-        );
+        review.show("Reject", "Transaction Rejected", "Transaction Rejected");
     }
 }
 
@@ -307,7 +303,7 @@ pub fn ui_display_common<const N: usize>(
             last_screen = "Action confirmed";
         }
 
-        review.show("Reject\nTransaction", last_screen, "Transaction rejected")
+        review.show("Reject", last_screen, "Transaction rejected")
     }
 }
 

src/app_ui/sign/nep366_delegate_action/prefix.rs

@@ -120,10 +120,6 @@ pub fn ui_display(prefix: &mut parsing::types::nep366_delegate_action::prefix::P
             .add_content(NbglPageContent::TagValueList(tag_values_list))
             .add_content(NbglPageContent::InfoButton(info_button));
 
-        review.show(
-            "Reject\nTransaction",
-            "NEP366 prefix confirmed",
-            "Transaction rejected",
-        )
+        review.show("Reject", "NEP366 prefix confirmed", "Transaction rejected")
     }
 }

src/app_ui/sign/transaction/prefix.rs

@@ -118,10 +118,6 @@ pub fn ui_display(prefix: &mut parsing::types::transaction::prefix::Prefix) -> b
             .add_content(NbglPageContent::TagValueList(tag_values_list))
             .add_content(NbglPageContent::InfoButton(info_button));
 
-        review.show(
-            "Reject\nTransaction",
-            "Header confirmed",
-            "Transaction rejected",
-        )
+        review.show("Reject", "Header confirmed", "Transaction rejected")
     }
 }

src/handlers/common/validate_public_key.rs

@@ -130,6 +130,6 @@ fn ui_display(info: &KeyMismatchInfo) -> Result<bool, AppSW> {
             .add_content(NbglPageContent::TagValueList(tag_values_list))
             .add_content(NbglPageContent::InfoButton(info_button));
 
-        Ok(review.show("Reject\nTransaction", "Confirmed", "Transaction rejected"))
+        Ok(review.show("Reject", "Confirmed", "Transaction rejected"))
     }
 }