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

namecoin fix and other small ui fixes #122

Merged
merged 59 commits into from
Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
b0ce231
bch testnet default node fix
julian-CStack Sep 26, 2022
43be461
fix ios compile
Sep 29, 2022
a11b336
background color fix
julian-CStack Sep 29, 2022
1bdb673
address book copy icon size increase
julian-CStack Sep 29, 2022
e99e43b
background color fix
julian-CStack Sep 29, 2022
0274cbc
address book copy icon size increase
julian-CStack Sep 29, 2022
13e0356
desktop settings icon and additional textstyle
julian-CStack Sep 29, 2022
a899e97
Merge branch 'staging' into ui-fixes
julian-CStack Sep 30, 2022
f81784c
Selecting Receive amount is disabled when Estimated rate is active. D…
julian-CStack Sep 30, 2022
f026835
choose from stack exchange wallet addresses
julian-CStack Sep 30, 2022
8268aaa
fill in address from address book in exchange view
julian-CStack Sep 30, 2022
77f4b22
exchange overlay dark theme color fix
julian-CStack Sep 30, 2022
4283ce9
fill in active wallet address
julian-CStack Sep 30, 2022
89e6092
creating trade overlay
julian-CStack Sep 30, 2022
241349d
restore from date picker hint text style fix
julian-CStack Sep 30, 2022
8f6c938
trade details send to address copy button
julian-CStack Sep 30, 2022
626b0ee
title fix
julian-CStack Sep 30, 2022
5451698
send from button in trade details
julian-CStack Sep 30, 2022
c2db998
clean up
julian-CStack Sep 30, 2022
98bf943
total send amount from trade flow color fix
julian-CStack Sep 30, 2022
4fcebda
show trades in tx history
julian-CStack Sep 30, 2022
bc740fd
extra swb logging
julian-CStack Sep 30, 2022
02bc606
wow min confirms updated to match standard network requirements
julian-CStack Sep 30, 2022
c9a064e
temp trade history fix
julian-CStack Sep 30, 2022
d6a91b7
Merge pull request #105 from cypherstack/ui-fixes
julian-CStack Sep 30, 2022
c803519
re enable certain bch+nmc tests
julian-CStack Sep 30, 2022
db55020
Merge pull request #106 from cypherstack/ui-fixes
julian-CStack Sep 30, 2022
8243eb1
Don't ask android where to save
julian-CStack Oct 1, 2022
679a0bb
Merge pull request #107 from cypherstack/ui-fixes
ryleedavis Oct 1, 2022
6cbc6ff
change build
Oct 1, 2022
43fa958
Merge pull request #108 from cypherstack/rylee-tmp
ryleedavis Oct 1, 2022
1a57695
exchange dash change
julian-CStack Oct 2, 2022
cb484bf
Merge branch 'staging' into ui-fixes
julian-CStack Oct 2, 2022
c83e1b5
Merge pull request #111 from cypherstack/ui-fixes
julian-CStack Oct 2, 2022
ec54d9f
added settings indicator icon
Oct 3, 2022
a4e2078
created settings view page
Oct 3, 2022
c177102
updated indicator name
Oct 3, 2022
885112a
Polygon.svg
Oct 3, 2022
171b40f
Add wownero library to build
sneurlax Oct 4, 2022
65655f4
Add prebuild script
sneurlax Oct 4, 2022
41eacf4
Document prebuild script use
sneurlax Oct 4, 2022
6dc00a6
List dependencies required by flutter_libs
sneurlax Oct 4, 2022
8dc7b0a
List preinstalled packages that need to be removed
sneurlax Oct 4, 2022
2ec5e22
Merge pull request #117 from sneurlax/wow
msalazarm Oct 4, 2022
df9fab4
Merge pull request #119 from sneurlax/docs/plugin-deps
msalazarm Oct 4, 2022
fbf6838
Merge branch 'staging' into script/prebuild
msalazarm Oct 4, 2022
a9b1084
Merge pull request #118 from sneurlax/script/prebuild
msalazarm Oct 4, 2022
7dc3393
Merge branch 'main' into updatedesktop
Oct 4, 2022
cf332e9
Merge branch 'wow' into updatedesktop
Oct 4, 2022
2ed5559
Merge branch 'desktop' into updatedesktop
Oct 4, 2022
2de7692
organize linux monero saves
Oct 4, 2022
956fa6a
make linux folder hidden
Oct 4, 2022
94c606f
Merge pull request #120 from cypherstack/updatedesktop
msalazarm Oct 4, 2022
b0336ef
minor bug fix for infinite loading on linux
Oct 4, 2022
3b90827
fix ios wownero build fully
Oct 4, 2022
9edae36
Merge pull request #121 from cypherstack/desktop
msalazarm Oct 5, 2022
efe312c
fix namecoin bug with getting address
Oct 5, 2022
1e277a8
change build
Oct 6, 2022
47c904e
Merge pull request #123 from cypherstack/rylee-tmp
ryleedavis Oct 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ cd stack_wallet
git submodule update --init --recursive
```

You will need to install all dependencies listed in each of the plugins in the crypto_plugins folder. (eg. [Monero](https://github.com/cypherstack/flutter_libmonero), [Epic Cash](https://github.com/cypherstack/flutter_libepiccash) ) as of Sep 8th 2022 that is:
Install all dependencies listed in each of the plugins in the crypto_plugins folder (eg. [flutter_libmonero](https://github.com/cypherstack/flutter_libmonero/blob/main/howto-build-android.md), [flutter_libepiccash](https://github.com/cypherstack/flutter_libepiccash) ) as of Oct 3rd 2022 that is:
```
sudo apt-get install unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake openjdk-8-jre-headless libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev llvm sudo apt-get install debhelper libclang-dev cargo rustc opencl-headers libssl-dev ocl-icd-opencl-dev
```

Install [Rust](https://www.rust-lang.org/tools/install)
```
Expand All @@ -45,6 +48,26 @@ sudo apt install build-essential debhelper cmake libclang-dev libncurses5-dev cl
sudo apt install unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake openjdk-8-jre-headless
```

Run prebuild script

```
cd scripts
./prebuild.sh
// when finished go back to the root directory
cd ..
```


Remove pre-installed system libraries for the following packages built by cryptography plugins in the crypto_plugins folder: `boost iconv libjson-dev libsecret openssl sodium unbound zmq`. You can use
```
sudo apt list --installed | grep boost
```
for example to find which pre-installed packages you may need to remove with `sudo apt remove`. Be careful, as some packages (especially boost) are linked to GNOME (GUI) packages: when in doubt, remove `-dev` packages first like with
```
sudo apt-get remove '^libboost.*-dev.*'
```
<!-- TODO: configure compiler to prefer built over system libraries -->

Building plugins for Android
```
cd scripts/android/
Expand Down
3 changes: 3 additions & 0 deletions assets/svg/Polygon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions assets/svg/box-auto.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,25 @@ PODS:
- Flutter
- cw_shared_external/Sodium (0.0.1):
- Flutter
- cw_wownero (0.0.2):
- cw_shared_external
- cw_wownero/Boost (= 0.0.2)
- cw_wownero/OpenSSL (= 0.0.2)
- cw_wownero/Sodium (= 0.0.2)
- cw_wownero/Wownero (= 0.0.2)
- Flutter
- cw_wownero/Boost (0.0.2):
- cw_shared_external
- Flutter
- cw_wownero/OpenSSL (0.0.2):
- cw_shared_external
- Flutter
- cw_wownero/Sodium (0.0.2):
- cw_shared_external
- Flutter
- cw_wownero/Wownero (0.0.2):
- cw_shared_external
- Flutter
- devicelocale (0.0.1):
- Flutter
- DKImagePickerController/Core (4.3.4):
Expand Down Expand Up @@ -127,6 +146,7 @@ DEPENDENCIES:
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- cw_monero (from `.symlinks/plugins/cw_monero/ios`)
- cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
- cw_wownero (from `.symlinks/plugins/cw_wownero/ios`)
- devicelocale (from `.symlinks/plugins/devicelocale/ios`)
- file_picker (from `.symlinks/plugins/file_picker/ios`)
- Flutter (from `Flutter`)
Expand Down Expand Up @@ -169,6 +189,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/cw_monero/ios"
cw_shared_external:
:path: ".symlinks/plugins/cw_shared_external/ios"
cw_wownero:
:path: ".symlinks/plugins/cw_wownero/ios"
devicelocale:
:path: ".symlinks/plugins/devicelocale/ios"
file_picker:
Expand Down Expand Up @@ -216,6 +238,7 @@ SPEC CHECKSUMS:
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
cw_monero: 9816991daff0e3ad0a8be140e31933b5526babd4
cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
cw_wownero: 08e5713fe311a3be95efd7f3c1bf9d47d9cfafde
devicelocale: b22617f40038496deffba44747101255cee005b0
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
Expand Down
4 changes: 3 additions & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 50;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -253,6 +253,7 @@
"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
"${BUILT_PRODUCTS_DIR}/cw_monero/cw_monero.framework",
"${BUILT_PRODUCTS_DIR}/cw_shared_external/cw_shared_external.framework",
"${BUILT_PRODUCTS_DIR}/cw_wownero/cw_wownero.framework",
"${BUILT_PRODUCTS_DIR}/devicelocale/devicelocale.framework",
"${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
"${BUILT_PRODUCTS_DIR}/flutter_libmonero/flutter_libmonero.framework",
Expand Down Expand Up @@ -285,6 +286,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cw_monero.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cw_shared_external.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cw_wownero.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/devicelocale.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_libmonero.framework",
Expand Down
4 changes: 4 additions & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ void main() async {
if (Platform.isIOS) {
appDirectory = (await getLibraryDirectory());
}
if (Platform.isLinux || Logging.isArmLinux) {
appDirectory = Directory("${appDirectory.path}/.stackwallet");
await appDirectory.create();
}
// FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
if (!(Logging.isArmLinux || Logging.isTestEnv)) {
final isar = await Isar.open(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ class _RestoreFromDatePickerState extends State<RestoreFromDatePicker> {
style: STextStyles.field(context),
decoration: InputDecoration(
hintText: "Restore from...",
hintStyle: STextStyles.fieldLabel(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textFieldDefaultSearchIconLeft,
),
suffixIcon: UnconstrainedBox(
child: Row(
children: [
Expand Down
32 changes: 18 additions & 14 deletions lib/pages/address_book_views/subviews/contact_details_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -393,13 +393,15 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
color: Theme.of(context)
.extension<StackColors>()!
.textFieldDefaultBG,
padding: const EdgeInsets.all(4),
child: SvgPicture.asset(Assets.svg.pencil,
width: 12,
height: 12,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark),
padding: const EdgeInsets.all(6),
child: SvgPicture.asset(
Assets.svg.pencil,
width: 14,
height: 14,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark,
),
),
),
const SizedBox(
Expand All @@ -421,13 +423,15 @@ class _ContactDetailsViewState extends ConsumerState<ContactDetailsView> {
color: Theme.of(context)
.extension<StackColors>()!
.textFieldDefaultBG,
padding: const EdgeInsets.all(4),
child: SvgPicture.asset(Assets.svg.copy,
width: 12,
height: 12,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark),
padding: const EdgeInsets.all(6),
child: SvgPicture.asset(
Assets.svg.copy,
width: 16,
height: 16,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark,
),
),
),
],
Expand Down
49 changes: 46 additions & 3 deletions lib/pages/address_book_views/subviews/contact_popup.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:stackwallet/models/send_view_auto_fill_data.dart';
import 'package:stackwallet/notifications/show_flush_bar.dart';
import 'package:stackwallet/pages/address_book_views/subviews/contact_details_view.dart';
import 'package:stackwallet/pages/exchange_view/exchange_step_views/step_2_view.dart';
import 'package:stackwallet/pages/send_view/send_view.dart';
import 'package:stackwallet/providers/exchange/exchange_flow_is_active_state_provider.dart';
import 'package:stackwallet/providers/global/address_book_service_provider.dart';
Expand All @@ -19,6 +20,9 @@ import 'package:stackwallet/widgets/rounded_container.dart';
import 'package:stackwallet/widgets/rounded_white_container.dart';
import 'package:tuple/tuple.dart';

final exchangeFromAddressBookAddressStateProvider =
StateProvider<String>((ref) => "");

class ContactPopUp extends ConsumerWidget {
const ContactPopUp({
Key? key,
Expand Down Expand Up @@ -268,18 +272,57 @@ class ContactPopUp extends ConsumerWidget {
color: Theme.of(context)
.extension<StackColors>()!
.textFieldDefaultBG,
padding: const EdgeInsets.all(4),
padding: const EdgeInsets.all(6),
child: SvgPicture.asset(
Assets.svg.copy,
width: 12,
height: 12,
width: 16,
height: 16,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark),
),
),
],
),
if (isExchangeFlow)
const SizedBox(
width: 6,
),
if (isExchangeFlow)
Column(
children: [
const SizedBox(
height: 2,
),
GestureDetector(
onTap: () {
ref
.read(
exchangeFromAddressBookAddressStateProvider
.state)
.state = e.address;
Navigator.of(context).popUntil(
ModalRoute.withName(
Step2View.routeName));
},
child: RoundedContainer(
color: Theme.of(context)
.extension<StackColors>()!
.textFieldDefaultBG,
padding:
const EdgeInsets.all(6),
child: SvgPicture.asset(
Assets.svg.chevronRight,
width: 16,
height: 16,
color: Theme.of(context)
.extension<
StackColors>()!
.accentColorDark),
),
),
],
),
if (contact.id != "default" &&
hasActiveWallet &&
!isExchangeFlow)
Expand Down
Loading