Skip to content

Commit c50c893

Browse files
Merge pull request #6 from rahilmansuri1/bug-fix
Fix: UI bugs and macOS crash issue
2 parents 8036221 + 94850e5 commit c50c893

File tree

63 files changed

+1274
-588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1274
-588
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.1.1
2+
current_version = 0.1.2
33
commit = False
44
tag = False
55
allow_dirty = True

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[codespell]
22
# Ignore specific words that are intentional and should not be corrected
3-
ignore-words-list = arbitral
3+
ignore-words-list = arbitral,datas

.github/workflows/iris-wallet-desktop.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ jobs:
5858

5959
- name: Build the rgb-lightning-node binary
6060
working-directory: rgb-lightning-node
61-
run: cargo install --locked --debug --path .
61+
run: cargo build --release
6262

6363
- name: Copy rgb-lightning-node binary to root directory
6464
run: |
6565
mkdir ln_node_binary
66-
cp rgb-lightning-node/target/debug/rgb-lightning-node ln_node_binary
66+
cp rgb-lightning-node/target/release/rgb-lightning-node ln_node_binary
6767
6868
- name: Set environment variables from GitHub Secrets and generate config.py
6969
env:
@@ -170,12 +170,12 @@ jobs:
170170

171171
- name: Build the rgb-lightning-node binary
172172
working-directory: rgb-lightning-node
173-
run: cargo install --locked --debug --path .
173+
run: cargo build --release
174174

175175
- name: Copy rgb-lightning-node binary to root directory
176176
run: |
177177
mkdir ln_node_binary
178-
cp rgb-lightning-node/target/debug/rgb-lightning-node ln_node_binary
178+
cp rgb-lightning-node/target/release/rgb-lightning-node ln_node_binary
179179
180180
- name: Set environment variables from secrets and create config.py
181181
env:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ build_info.json
3030
settings.json
3131
/appimages/
3232
temp_build_constant.py
33+
.DS_Store

binary/native_auth_windows.exe

-202 KB
Binary file not shown.

iris_wallet_desktop.spec

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ print(__network__)
1919

2020
# Collect data files from pyqttoast, bip32utils, mnemonic, and cryptography
2121
pyqttoast_datas = collect_data_files('pyqttoast')
22+
rgb_lib_datas = collect_data_files('rgb_lib')
23+
rgb_lib_binaries = collect_dynamic_libs('rgb_lib')
2224

2325
base_project_path = os.path.abspath(__name__)
2426
print(base_project_path)
@@ -36,16 +38,15 @@ datas = [
3638
('./src/views/qss/*.qss', './views/qss/'),
3739
('./build_info.json', './build_info.json'),
3840
(ln_node_binary, './ln_node_binary/'),
39-
('binary', './binary/')
40-
] + pyqttoast_datas
41+
] + pyqttoast_datas + rgb_lib_datas
4142

4243
# Common Analysis
4344
a = Analysis(
4445
['src/main.py'],
4546
pathex=[],
46-
binaries=[],
47+
binaries=rgb_lib_binaries,
4748
datas=datas,
48-
hiddenimports=['pyqttoast', 'PySide6', 'bip32utils', 'mnemonic', 'importlib_metadata', 'hashlib'],
49+
hiddenimports=['pyqttoast', 'PySide6', 'bip32utils', 'mnemonic', 'importlib_metadata', 'hashlib', 'rgb_lib'],
4950
hookspath=[],
5051
runtime_hooks=[],
5152
excludes=[],

poetry.lock

Lines changed: 17 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pylint_logs.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "iris-wallet-desktop"
3-
version = "0.1.1"
3+
version = "0.1.2"
44
description = ""
55
readme = "README.md"
66
license = ""
@@ -41,6 +41,7 @@ cryptography = "^43.0.0"
4141
asyncio = "^3.4.3"
4242
requests-cache = "^1.2.1"
4343
pytest-xdist = "^3.6.1"
44+
rgb-lib = "0.3.0a12"
4445
[tool.poetry.dev-dependencies]
4546
black = "24.4.1"
4647
bump2version = "1.0.1"

src/data/repository/setting_card_repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def set_default_fee_rate(rate: str) -> IsDefaultFeeRateSet:
7272
try:
7373
local_store.set_value('defaultFeeRate', rate)
7474
# Verify the setting was applied
75-
if local_store.get_value('defaultFeeRate', value_type=float):
75+
if local_store.get_value('defaultFeeRate', value_type=int):
7676
return IsDefaultFeeRateSet(is_enabled=True)
7777
return IsDefaultFeeRateSet(is_enabled=False)
7878
except Exception as exe:

0 commit comments

Comments
 (0)