Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the conflicts merging dev to master #100

Merged
merged 28 commits into from
Aug 11, 2023
Merged

Fix the conflicts merging dev to master #100

merged 28 commits into from
Aug 11, 2023

Conversation

muursh
Copy link
Contributor

@muursh muursh commented Aug 11, 2023

No description provided.

anyxem and others added 27 commits July 8, 2022 09:02
* A-1201997882971262: testnet support - screen with switcher

* A-1201997882971262: split storage for testnet/mainnet

* A-1201997882971262: add testnet nodes list

* A-1201997882971262: inject network var

* A-1201997882971262: fixes

* A-1201997882971262: console cleanup

* A-1201997882971262: add killswitch to toggle testnet mode options

* A-1201997882971262: add flag to omit address scan on import

* A-1201997882971262: update text
* ipad issue resolved

* implement lightening network

* lightening feedback works
* A-1202603834025040: add lightning testnet support

* A-1202603834025040: fix view invoice

* cleanup console
* working import with testnet

* refector code
* import button fix and lighting network url

* bug fix for slider transcation
* update readme for browser stack

* fix lint
* test cases issue

* some issue resolve 1  on test case issue

* testing servers

* Some more test fixing

* testing lint

* yml file change

Co-authored-by: Renie Siqueira <[email protected]>
* minimum 500 sat condition and test cases

* remove comment
* add amount field validation

* fix names, regex and error message

* remove env

* package json lock file

Co-authored-by: zainali.syed24 <[email protected]>
* send's amount value fix

* removes casting to string from itemAmout
* trans issue and env setup

* package lock file

* fix: update to CI

* remove unwanted code

Co-authored-by: Renie Siqueira <[email protected]>
* build changes for release

* sendings value fix

* remove additional casting to string

* remove unwanted comment

* moves the amount value validation to the component

* add unit tests for AmountInput

* adds additional test cases

* add React Native Testing Library, rewrite tests for  amountInput

---------

Co-authored-by: owlsua <[email protected]>
* modal and lightening default url changes

* package lock file

* ci cd test case

* prettier issue
* entropy task

* screen workinng

* header changes

* covert entropyGenerator from tsx to js, drawing funcrion fix

* add comment line

* clear button improvements

* text changes and refector of code

* ci cd fix

* CI cd test case issue

* entropy drawing with account creation

* entropy validation

* refactor code and adding unit test case

* changes for unit test case

* refector code

* refector code list

* linter issue

---------

Co-authored-by: owlsua <[email protected]>
* feedback for entropy ios

* changed MLT to ML
@muursh muursh requested review from erubboli and renie as code owners August 11, 2023 15:33
chore: fixing duplicated variable.
@renie renie merged commit 04e247a into master Aug 11, 2023
@anyxem anyxem deleted the mergebranch branch February 13, 2024 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants