Skip to content

Commit 4e55cad

Browse files
functorafunctora
committed
refactoring wip
1 parent 316b362 commit 4e55cad

File tree

14 files changed

+71
-39
lines changed

14 files changed

+71
-39
lines changed

‎ghcjs/lightning-verifier/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ in rec {
4141
text = ''
4242
(
4343
cd ${repo}
44-
${functora-pkgs.nodejs}/bin/npm i
44+
${functora-pkgs.nodejs}/bin/npm i --prefer-offline
4545
${functora-pkgs.nodejs}/bin/npm run build
4646
nix-build -A releaseDer
4747
rm -rf ./dist/latest

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ stQuery st = do
219219
case st ^. #stIkm . #fieldOutput of
220220
ikm | ikm == mempty -> Left (st ^. #stKm)
221221
ikm -> Right $ (st ^. #stKm) & #kmIkm .~ Ikm (encodeUtf8 ikm)
222-
encodeText :: (MonadThrow m) => BL.ByteString -> m Prelude.Text
222+
encodeText :: (MonadThrow m) => BL.ByteString -> m Text
223223
encodeText =
224224
either throw pure
225225
. decodeUtf8Strict
@@ -302,7 +302,7 @@ googlePlayLink =
302302

303303
testGroupLink :: URI
304304
testGroupLink =
305-
[URI.uri|https://groups.google.com/g/currency-converter|]
305+
[URI.uri|https://groups.google.com/g/functora|]
306306

307307
functoraLink :: URI
308308
functoraLink =
@@ -316,7 +316,7 @@ apkLink :: URI
316316
apkLink =
317317
either impureThrow id
318318
. URI.mkURI
319-
. from @Unicode @Prelude.Text
319+
. from @Unicode @Text
320320
$ "https://github.com/functora/functora.github.io/releases/download/lightning-verifier-v"
321321
<> vsn
322322
<> "/lightning-verifier-v"

‎ghcjs/lightning-verifier/src/App/Widgets/Bolt11.hs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ makeBolt11Viewer st =
122122
rawR = st ^. #stDocLnPreimage . #fieldOutput
123123
ln :: Either Unicode B11.Bolt11
124124
ln =
125-
first (mappend "Bad invoice - " . from @Prelude.String @Unicode)
125+
first (mappend "Bad invoice - " . from @String @Unicode)
126126
. B11.decodeBolt11
127127
$ from @Unicode @Prelude.Text rawLn
128128
rh :: Either Unicode ByteString
@@ -169,7 +169,9 @@ verifyPreimage rh r =
169169

170170
invoiceFields :: B11.Bolt11 -> [FieldPair DynamicField Identity]
171171
invoiceFields ln =
172-
[ pair "Network"
172+
[ pair "Invoice"
173+
$ B11.bolt11Raw ln,
174+
pair "Network"
173175
$ case B11.bolt11HrpNet $ B11.bolt11Hrp ln of
174176
B11.BitcoinMainnet -> "Bitcoin Mainnet"
175177
B11.BitcoinTestnet -> "Bitcoin Testnet"
@@ -245,5 +247,6 @@ preimageFields rawR r =
245247
pair "Preimage Hash"
246248
. either impureThrow id
247249
. decodeUtf8Strict @Unicode @ByteString
250+
. B16.encode
248251
$ sha256Hash r
249252
]

‎ghcjs/lightning-verifier/src/App/Widgets/Fav.hs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import qualified Functora.Miso.Widgets.Field as Field
1313
import qualified Functora.Miso.Widgets.Grid as Grid
1414
import qualified Material.Button as Button
1515
import qualified Material.Dialog as Dialog
16+
import qualified Material.Theme as Theme
1617

1718
fav :: Model -> [View Action]
1819
fav st =
@@ -132,7 +133,10 @@ favItem st label Fav {favUri = uri} =
132133
[ Button.raised
133134
( Button.config
134135
& Button.setOnClick openAction
135-
& Button.setAttributes [Css.fullWidth]
136+
& Button.setAttributes
137+
[ Css.fullWidth,
138+
Theme.secondaryBg
139+
]
136140
)
137141
label
138142
]

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

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,24 @@ screenWidget st@Model {modelState = St {stScreen = Converter}} =
130130
{ Field.optsFilledOrOutlined = Outlined,
131131
Field.optsPlaceholder = "Invoice",
132132
Field.optsLeadingWidget =
133-
pasteWidget
134-
"content_paste_go"
135-
Jsm.selectClipboard
136-
$ #modelState
137-
. #stDoc
138-
. #stDocLnInvoice,
133+
if null
134+
( st
135+
^. #modelState
136+
. #stDoc
137+
. #stDocLnInvoice
138+
. #fieldInput
139+
. #uniqueValue
140+
)
141+
then
142+
pasteWidget
143+
"content_paste_go"
144+
Jsm.selectClipboard
145+
$ #modelState
146+
. #stDoc
147+
. #stDocLnInvoice
148+
else
149+
Just
150+
Field.ClearWidget,
139151
Field.optsTrailingWidget =
140152
pasteWidget
141153
"qr_code_scanner"
@@ -155,12 +167,24 @@ screenWidget st@Model {modelState = St {stScreen = Converter}} =
155167
{ Field.optsFilledOrOutlined = Outlined,
156168
Field.optsPlaceholder = "Preimage",
157169
Field.optsLeadingWidget =
158-
pasteWidget
159-
"content_paste_go"
160-
Jsm.selectClipboard
161-
$ #modelState
162-
. #stDoc
163-
. #stDocLnPreimage,
170+
if null
171+
( st
172+
^. #modelState
173+
. #stDoc
174+
. #stDocLnPreimage
175+
. #fieldInput
176+
. #uniqueValue
177+
)
178+
then
179+
pasteWidget
180+
"content_paste_go"
181+
Jsm.selectClipboard
182+
$ #modelState
183+
. #stDoc
184+
. #stDocLnPreimage
185+
else
186+
Just
187+
Field.ClearWidget,
164188
Field.optsTrailingWidget =
165189
pasteWidget
166190
"qr_code_scanner"

‎ghcjs/lightning-verifier/src/App/Widgets/Menu.hs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import qualified Material.IconButton as IconButton
2020
import qualified Material.Theme as Theme
2121
import qualified Material.TopAppBar as TopAppBar
2222
import qualified Text.URI as URI
23-
import qualified Prelude
2423

2524
menu :: Model -> [View Action]
2625
menu st =
@@ -109,7 +108,7 @@ menu st =
109108
( PushUpdate
110109
. Instant
111110
. Jsm.shareText
112-
. from @Prelude.String @Unicode
111+
. from @String @Unicode
113112
. either impureThrow URI.renderStr
114113
$ stUri st
115114
)

‎ghcjs/lightning-verifier/src/App/Widgets/Templates.hs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import qualified App.Widgets.Bolt11 as B11
99
import qualified Functora.Aes as Aes
1010
import Functora.Cfg
1111
import Functora.Miso.Prelude
12-
import qualified Prelude
1312

1413
newModel :: (MonadThrow m, MonadUnliftIO m) => Maybe Model -> URI -> m Model
1514
newModel mSt uri = do
@@ -64,7 +63,7 @@ newModel mSt uri = do
6463
bDoc :: ByteString <-
6564
maybe
6665
( throwString
67-
@Prelude.String
66+
@String
6867
"Failed to decrypt the document!"
6968
)
7069
pure

‎ghcjs/lightning-verifier/src/Main.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ main =
4343
. forever
4444
. handleAny (\e -> consoleLog e >> sleepSeconds 5)
4545
$ do
46-
uri <- URI.mkURI . Prelude.inspect =<< getCurrentURI
46+
uri <- URI.mkURI . inspect =<< getCurrentURI
4747
mSt <- unShareUri uri
4848
st <- newModel Nothing uri
4949
startApp
@@ -317,7 +317,7 @@ evalModel st@Model {modelState = st0} = do
317317

318318
syncUri :: URI -> JSM ()
319319
syncUri uri = do
320-
textUri <- fmap Prelude.inspect getCurrentURI
320+
textUri <- fmap inspect getCurrentURI
321321
prevUri <- URI.mkURI textUri
322322
let nextUri = prevUri {URI.uriQuery = URI.uriQuery uri}
323323
when (nextUri /= prevUri)

‎ghcjs/miso-widgets/src/Functora/Miso/Jsm/Generic.hs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import qualified Data.ByteString.Lazy as BL
1818
import Functora.Miso.Prelude
1919
import qualified Language.Javascript.JSaddle as JS
2020
import qualified Text.URI as URI
21-
import qualified Prelude
2221
import qualified Prelude ((!!))
2322

2423
popupText :: (Show a, Data a) => a -> JSM ()
@@ -144,11 +143,11 @@ genericPromise fun marg after = do
144143
raw <-
145144
JS.fromJSVal @Unicode val
146145
res <-
147-
maybe (throwString @Prelude.String "Failure, bad type!") pure raw
146+
maybe (throwString @String "Failure, bad type!") pure raw
148147
after
149148
$ Just res
150149
_ ->
151-
throwString @Prelude.String "Failure, bad argv!"
150+
throwString @String "Failure, bad argv!"
152151
failure <-
153152
JS.function $ \_ _ e -> do
154153
msg <- handleAny (\_ -> pure "Unknown") $ JS.valToText e

‎ghcjs/miso-widgets/src/Functora/Miso/Prelude.hs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import Functora.Cfg as X
88
import Functora.Miso.Orphan as X ()
99
import Functora.Prelude as X hiding
1010
( Field (..),
11-
String,
12-
Text,
1311
cons,
1412
field,
1513
)

0 commit comments

Comments
 (0)