Merge flipbip from https://github.com/xtruan/FlipBIP

# Conflicts:
#	flipbip/flipbip.c

flipbip/.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
       - develop
 
 env:
-  firmware_version: '0.88.0'
+  firmware_version: '0.101.2'
 
 jobs:
   build:

flipbip/.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 
 env:
-  firmware_version: '0.88.0'
+  firmware_version: '0.101.2'
 
 jobs:
   build:

flipbip/.github/workflows/ufbt_build.yml

@@ -1,4 +1,4 @@
-name: "FAP: Build for multiple SDK sources"
+name: "uFBT Build"
 on:
   push:
     branches: 
@@ -32,4 +32,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{ github.event.repository.name }}-${{ steps.build-app.outputs.suffix }}
-          path: ${{ steps.build-app.outputs.fap-artifacts }}
+          path: ${{ steps.build-app.outputs.fap-artifacts }}

flipbip/README.md

@@ -3,7 +3,7 @@
 [![Build](https://github.com/xtruan/FlipBIP/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/xtruan/FlipBIP/actions/workflows/build.yml)
 
 ## Crypto toolkit for Flipper Zero
-- Last built against `0.88.0` Flipper Zero firmware release
+- Last built against `0.101.2` Flipper Zero firmware release
 - Using Trezor crypto libs from `core/v2.5.3` release
 - NOTE: This app uses very close to the maximum Flipper Zero RAM. If you get `furi_check failed` on launch, try running again!
 
@@ -19,7 +19,7 @@ The goal of this project is to see how much crypto functionality can be brought
 - If you do not have one, download a Flipper Zero firmware to get the `fbt` build tool
 - Plug your Flipper Zero in via USB
 - Copy the contents of this folder into the `applications_user` folder of your firmware
-- Modify the `site_scons/cc.scons` file in the Flipper Zero firmware to add the `"-Os"` flag
+- ~Modify the `site_scons/cc.scons` file in the Flipper Zero firmware to add the `"-Os"` flag~
 
 Then run the command: 
  ```

flipbip/application.fam

@@ -17,6 +17,6 @@ App(
     fap_category="Tools",
     fap_author="Struan Clark (xtruan)",
     fap_weburl="https://github.com/xtruan/FlipBIP",
-    fap_version=(1, 14),
+    fap_version=(1, 16),
     fap_description="Crypto wallet for Flipper",
 )

flipbip/catalog/manifest.yml

@@ -2,16 +2,16 @@ sourcecode:
   type: git
   location:
     origin: https://github.com/xtruan/FlipBIP.git
-    commit_sha: 3cb8313f13b95e12ae1a4e5ea9d679a058b33aac
+    commit_sha: 5afc1d3d7bc5b45a06a7d188e98de61fd8a0183c
 description: "Cryptocurrency wallet with support for BTC, ETH, DOGE, and ZEC (t-addr)"
-changelog: "v1.14.0 - Confirmation before wallet regeneration"
+changelog: "v1.16 - Minor UI cleanup"
 author: "@xtruan"
 screenshots:
-  - "./catalog/startscreen.png"
   - "./catalog/menu1.png"
   - "./catalog/menu2.png"
   - "./catalog/input_mnemonic.png"
   - "./catalog/btc_loading.png"
   - "./catalog/wallet_info.png"
+  - "./catalog/wallet_mnemonic.png"
   - "./catalog/btc_receive.png"
   - "./catalog/settings.png"

flipbip/flipbip.c

@@ -171,7 +171,12 @@ FlipBip* flipbip_app_alloc() {
     dialog_ex_set_left_button_text(app->renew_dialog, "No");
     dialog_ex_set_right_button_text(app->renew_dialog, "Yes");
     dialog_ex_set_header(
-        app->renew_dialog, "Current wallet\nWill be lost.\nProceed?", 16, 12, AlignLeft, AlignTop);
+        app->renew_dialog,
+        "Current wallet\nwill be deleted!\nProceed?",
+        16,
+        12,
+        AlignLeft,
+        AlignTop);
     view_dispatcher_add_view(
         app->view_dispatcher, FlipBipViewRenewConfirm, dialog_ex_get_view(app->renew_dialog));
 

flipbip/flipbip.h

@@ -15,7 +15,7 @@
 #include "scenes/flipbip_scene.h"
 #include "views/flipbip_scene_1.h"
 
-#define FLIPBIP_VERSION "v1.14"
+#define FLIPBIP_VERSION "v1.16"
 
 #define COIN_BTC 0
 #define COIN_DOGE 3

flipbip/scenes/flipbip_scene_menu.c

@@ -1,7 +1,7 @@
 #include "../flipbip.h"
 #include "../helpers/flipbip_file.h"
 
-#define FLIPBIP_SUBMENU_TEXT "** FlipBIP wallet " FLIPBIP_VERSION " **"
+// #define FLIPBIP_SUBMENU_TEXT "** FlipBIP wallet " FLIPBIP_VERSION " **"
 
 void flipbip_scene_menu_submenu_callback(void* context, uint32_t index) {
     furi_assert(context);
@@ -12,13 +12,13 @@ void flipbip_scene_menu_submenu_callback(void* context, uint32_t index) {
 void flipbip_scene_menu_on_enter(void* context) {
     FlipBip* app = context;
 
-    // FlipBIP header with version
-    submenu_add_item(
-        app->submenu,
-        FLIPBIP_SUBMENU_TEXT,
-        SubmenuIndexNOP,
-        flipbip_scene_menu_submenu_callback,
-        app);
+    // // FlipBIP header with version
+    // submenu_add_item(
+    //     app->submenu,
+    //     FLIPBIP_SUBMENU_TEXT,
+    //     SubmenuIndexNOP,
+    //     flipbip_scene_menu_submenu_callback,
+    //     app);
 
     if(flipbip_has_file(FlipBipFileKey, NULL, false) &&
        flipbip_has_file(FlipBipFileDat, NULL, false)) {

flipbip/views/flipbip_scene_1.c

@@ -317,8 +317,9 @@ void flipbip_scene_1_draw(Canvas* canvas, FlipBipScene1Model* model) {
         canvas_draw_str(canvas, 2, 10, TEXT_LOADING);
         canvas_draw_str(canvas, 7, 30, s_derivation_text);
         // canvas_draw_icon(canvas, 86, 22, &I_Keychain_39x36);
+        canvas_set_font(canvas, FontSecondary);
+        canvas_draw_str_aligned(canvas, 125, 2, AlignRight, AlignTop, FLIPBIP_VERSION);
         if(s_warn_insecure) {
-            canvas_set_font(canvas, FontSecondary);
             canvas_draw_str(canvas, 2, 50, WARN_INSECURE_TEXT_1);
             canvas_draw_str(canvas, 2, 60, WARN_INSECURE_TEXT_2);
         }