WIP

Author: functora

ghcjs/lightning-verifier/.ghcid

@@ -1,5 +1,5 @@
 --restart=.ghcid
---restart=app.cabal
+--restart=lightning-verifier.cabal
 --restart=cabal.config
 --restart=cabal.project
 --restart=static

ghcjs/lightning-verifier/default.nix

@@ -31,6 +31,7 @@ in rec {
   });
   app = pkgs.haskell.packages.ghcjs86.callCabal2nix "app" source {};
   vsn = app.passthru.version;
+  label = app.passthru.pname;
   repo = builtins.toString ./.;
   app-serve-latest = functora-pkgs.writeShellApplication rec {
     name = "app-serve-latest";
@@ -119,13 +120,13 @@ in rec {
       ${functora-pkgs.closurecompiler}/bin/closure-compiler \
         --jscomp_off=checkVars \
         --compilation_level ADVANCED_OPTIMIZATIONS \
-        --externs ${app}/bin/app.jsexe/all.js.externs \
+        --externs ${app}/bin/${label}.jsexe/all.js.externs \
         --externs ${./static}/app.js \
         --externs ${./static}/material-components-web.min.js \
         --externs ${./static}/material-components-web-elm.min.js \
         --output_wrapper "%output%//# sourceMappingURL=all.js.map" \
         --create_source_map $out/all.js.map \
-        --js ${app}/bin/app.jsexe/all.js \
+        --js ${app}/bin/${label}.jsexe/all.js \
         --js_output_file $out/all.js
     '';
   };
@@ -208,18 +209,4 @@ in rec {
       )
     '';
   };
-  #
-  # NOTE : broken atm https://github.com/NixOS/nixpkgs/issues/187853
-  #
-  # emulateAndroidDer = android-pkgs.androidenv.emulateApp {
-  #   name = "emulateAndroidDer";
-  #   platformVersion = "33";
-  #   abiVersion = "armeabi-v7a";
-  #   systemImageType = "default";
-  #   app =
-  #     ./android/app/build/outputs/apk/release/app-release-unsigned.apk;
-  #   package = "App";
-  #   activity = "MainActivity";
-  #   sdkExtraArgs = android-sdk-args;
-  # };
 }

ghcjs/lightning-verifier/app.cabal renamed to ghcjs/lightning-verifier/lightning-verifier.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.2
-name:          app
-version:       0.1.0.9
-synopsis:      First miso app
+name:          lightning-verifier
+version:       0.1.0.1
+synopsis:      Lightning Verifier
 category:      Web
 build-type:    Simple
 
@@ -10,8 +10,8 @@ flag ghcid
   default: False
 
 common pkg
-  other-modules:      Paths_app
-  autogen-modules:    Paths_app
+  other-modules:      Paths_lightning_verifier
+  autogen-modules:    Paths_lightning_verifier
   default-language:   Haskell2010
   hs-source-dirs:     src
 
@@ -29,7 +29,6 @@ common pkg
     App.Types
     App.Widgets.Decrypt
     App.Widgets.Fav
-    App.Widgets.Header
     App.Widgets.Main
     App.Widgets.Menu
     App.Widgets.SwapAmounts
@@ -121,7 +120,7 @@ common pkg
     ghc-options:
       -no-hs-main -optl-mexec-model=reactor "-optl-Wl,--export=hs_start"
 
-executable app
+executable lightning-verifier
   import:        pkg
   main-is:       Main.hs
   ghcjs-options: -dedupe
@@ -151,7 +150,7 @@ executable app
   if (flag(ghcid) && impl(ghc >=8.10.7))
     ghc-options: -Wno-unused-packages
 
-test-suite app-test
+test-suite lightning-verifier-test
   import:         pkg
   type:           exitcode-stdio-1.0
   main-is:        Spec.hs

ghcjs/lightning-verifier/shell.nix

@@ -3,7 +3,7 @@ with (import ./default.nix); let
   functora-pkgs = import "${functora}/nix/nixpkgs.nix";
   functora-tools = import "${functora}/nix/tools.nix";
   app-ghcid = functora-pkgs.writeScriptBin "app-ghcid" ''
-    (cd ${builtins.toString ./.} && ${functora-pkgs.nodejs}/bin/npm i && ${functora-pkgs.nodejs}/bin/npm run build && ${functora-pkgs.ghcid}/bin/ghcid --test="Main.main" --command="${functora-pkgs.cabal-install}/bin/cabal new-repl app --disable-optimization --repl-options=-fobject-code --repl-options=-fno-break-on-exception --repl-options=-fno-break-on-error --repl-options=-v1 --repl-options=-ferror-spans --repl-options=-j -fghcid")
+    (cd ${builtins.toString ./.} && ${functora-pkgs.nodejs}/bin/npm i && ${functora-pkgs.nodejs}/bin/npm run build && ${functora-pkgs.ghcid}/bin/ghcid --test="Main.main" --command="${functora-pkgs.cabal-install}/bin/cabal new-repl ${label} --disable-optimization --repl-options=-fobject-code --repl-options=-fno-break-on-exception --repl-options=-fno-break-on-error --repl-options=-v1 --repl-options=-ferror-spans --repl-options=-j -fghcid")
   '';
   app-release-apk = functora-pkgs.writeShellApplication {
     name = "app-release-apk";

ghcjs/lightning-verifier/src/App/Types.hs

@@ -40,7 +40,7 @@ import Functora.Money hiding (Currency, Money, Text)
 import qualified Functora.Prelude as Prelude
 import qualified Functora.Rates as Rates
 import qualified Functora.Web as Web
-import qualified Paths_app as Paths
+import qualified Paths_lightning_verifier as Paths
 import qualified Text.URI as URI
 
 data Model = Model

ghcjs/lightning-verifier/src/App/Widgets/Main.hs

@@ -3,7 +3,6 @@ module App.Widgets.Main (mainWidget) where
 import qualified App.Misc as Misc
 import App.Types
 import qualified App.Widgets.Decrypt as Decrypt
-import qualified App.Widgets.Header as Header
 import qualified App.Widgets.Menu as Menu
 import qualified App.Widgets.SwapAmounts as SwapAmounts
 import qualified App.Widgets.SwapCurrencies as SwapCurrencies
@@ -14,6 +13,7 @@ import qualified Functora.Miso.Widgets.BrowserLink as BrowserLink
 import qualified Functora.Miso.Widgets.Currency as Currency
 import qualified Functora.Miso.Widgets.Field as Field
 import qualified Functora.Miso.Widgets.FieldPairs as FieldPairs
+import qualified Functora.Miso.Widgets.Header as Header
 import qualified Functora.Miso.Widgets.Qr as Qr
 import Functora.Money hiding (Text)
 import qualified Material.Button as Button

ghcjs/lightning-verifier/trapeze.yaml

@@ -1,8 +1,8 @@
 platforms:
   android:
     appName: Currency Converter
-    versionCode: 9
-    versionName: 0.1.0.9
+    versionCode: 1
+    versionName: 0.1.0.1
     packageName: com.functora.currency_converter
     manifest:
       - file: AndroidManifest.xml