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.

Sign up for GitHub

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

Integrate WalletConnect #195

Merged
merged 34 commits into from
Sep 21, 2023
Merged

Integrate WalletConnect #195

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e294ec5
Upgrade npm packages
nop33 Aug 22, 2023
8beb68e
Add scan btn in Dashboard and allow sending funds
nop33 Aug 22, 2023
f491860
Init WalletConnect client and pairing
nop33 Aug 22, 2023
9c3c106
WIP: Handle WalletConnect events
nop33 Aug 23, 2023
dd1cd8e
Display dApp info and implement proposal reject
nop33 Aug 23, 2023
fc8ab7c
Implement proposal approval
nop33 Aug 23, 2023
099841e
Update dApp info display and handle network switch
nop33 Aug 23, 2023
8e2ea1e
Display current WalletConnect connections
nop33 Aug 23, 2023
a0b6598
Generate new address when none found in dApp group
nop33 Aug 24, 2023
b525454
Implement disconnect from current session
nop33 Aug 24, 2023
5cdec18
Fix group selection when creating new address
nop33 Aug 24, 2023
0335aab
Implement alternative signer address selection
nop33 Aug 24, 2023
61264b5
Handle alph_signAndSubmitTransferTx event (untested)
nop33 Aug 24, 2023
4450421
Rename mobilewallet to AlephiumWallet
nop33 Aug 28, 2023
b1985da
WIP: Handle script tx
nop33 Aug 28, 2023
e4b9237
Working PoC
nop33 Aug 28, 2023
bd21113
Handle pairings correctly
nop33 Aug 29, 2023
dc212ec
Handle sessions properly
nop33 Aug 29, 2023
fd65309
Call contract tx modal
nop33 Aug 31, 2023
0760cc6
Reorganize wallet connect files
nop33 Aug 31, 2023
340e5db
Deploy contract tx modal
nop33 Aug 31, 2023
c4455dd
Transfer tx modal
nop33 Sep 1, 2023
95616fe
Clean up
nop33 Sep 1, 2023
866b425
DRY code
nop33 Sep 1, 2023
7da3390
Fix lint
nop33 Sep 1, 2023
f5a51e9
Clean up
nop33 Sep 1, 2023
1e3a0b1
Merge branch 'master' into wc
nop33 Sep 19, 2023
cb498fd
Fix width of buttons in WC modals
nop33 Sep 20, 2023
1e74675
Reduce re-renders of wallet connect context
nop33 Sep 20, 2023
a088587
Add WalletConnect toggle
nop33 Sep 20, 2023
bc41b72
Remove build files
nop33 Sep 20, 2023
98202ec
Update dashboard header button icons
nop33 Sep 20, 2023
bf81081
Merge branch 'master' into wc
nop33 Sep 20, 2023
a1a8058
Improve layout of WC proposal modal
nop33 Sep 20, 2023
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
92 changes: 46 additions & 46 deletions ios/mobilewallet.xcodeproj/project.pbxproj → ios/AlephiumWallet.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions ...hareddata/xcschemes/mobilewallet.xcscheme → ...reddata/xcschemes/AlephiumWallet.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "mobilewallet.app"
BlueprintName = "mobilewallet"
ReferencedContainer = "container:mobilewallet.xcodeproj">
BuildableName = "AlephiumWallet.app"
BlueprintName = "AlephiumWallet"
ReferencedContainer = "container:AlephiumWallet.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -33,9 +33,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "mobilewalletTests.xctest"
BlueprintName = "mobilewalletTests"
ReferencedContainer = "container:mobilewallet.xcodeproj">
BuildableName = "AlephiumWalletTests.xctest"
BlueprintName = "AlephiumWalletTests"
ReferencedContainer = "container:AlephiumWallet.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -55,9 +55,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "mobilewallet.app"
BlueprintName = "mobilewallet"
ReferencedContainer = "container:mobilewallet.xcodeproj">
BuildableName = "AlephiumWallet.app"
BlueprintName = "AlephiumWallet"
ReferencedContainer = "container:AlephiumWallet.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -72,9 +72,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "mobilewallet.app"
BlueprintName = "mobilewallet"
ReferencedContainer = "container:mobilewallet.xcodeproj">
BuildableName = "AlephiumWallet.app"
BlueprintName = "AlephiumWallet"
ReferencedContainer = "container:AlephiumWallet.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
2 changes: 1 addition & 1 deletion ...llet.xcworkspace/contents.xcworkspacedata → ...llet.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
File renamed without changes.
0 ios/mobilewallet/mobilewallet.entitlements → ...lephiumWallet/AlephiumWallet.entitlements
View file
Open in desktop
File renamed without changes.
0 ios/mobilewallet/AppDelegate.h → ios/AlephiumWallet/AppDelegate.h
View file
Open in desktop
File renamed without changes.
0 ios/mobilewallet/AppDelegate.mm → ios/AlephiumWallet/AppDelegate.mm
View file
Open in desktop
File renamed without changes.
0 .../AppIcon.appiconset/App-Icon-20x20@1x.png → .../AppIcon.appiconset/App-Icon-20x20@1x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-20x20@2x.png → .../AppIcon.appiconset/App-Icon-20x20@2x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-20x20@3x.png → .../AppIcon.appiconset/App-Icon-20x20@3x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-29x29@1x.png → .../AppIcon.appiconset/App-Icon-29x29@1x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-29x29@2x.png → .../AppIcon.appiconset/App-Icon-29x29@2x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-29x29@3x.png → .../AppIcon.appiconset/App-Icon-29x29@3x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-40x40@1x.png → .../AppIcon.appiconset/App-Icon-40x40@1x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-40x40@2x.png → .../AppIcon.appiconset/App-Icon-40x40@2x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-40x40@3x.png → .../AppIcon.appiconset/App-Icon-40x40@3x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-60x60@2x.png → .../AppIcon.appiconset/App-Icon-60x60@2x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-60x60@3x.png → .../AppIcon.appiconset/App-Icon-60x60@3x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-76x76@1x.png → .../AppIcon.appiconset/App-Icon-76x76@1x.png
View file
Open in desktop
File renamed without changes
0 .../AppIcon.appiconset/App-Icon-76x76@2x.png → .../AppIcon.appiconset/App-Icon-76x76@2x.png
View file
Open in desktop
File renamed without changes
0 ...Icon.appiconset/App-Icon-83.5x83.5@2x.png → ...Icon.appiconset/App-Icon-83.5x83.5@2x.png
View file
Open in desktop
File renamed without changes
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...s/AppIcon.appiconset/ItunesArtwork@2x.png → ...s/AppIcon.appiconset/ItunesArtwork@2x.png
View file
Open in desktop
File renamed without changes
0 ...obilewallet/Images.xcassets/Contents.json → ...phiumWallet/Images.xcassets/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...ssets/SplashScreen.imageset/Contents.json → ...ssets/SplashScreen.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ....xcassets/SplashScreen.imageset/image.png → ....xcassets/SplashScreen.imageset/image.png
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mhh is that good?

File renamed without changes
0 ...shScreenBackground.imageset/Contents.json → ...shScreenBackground.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...SplashScreenBackground.imageset/image.png → ...SplashScreenBackground.imageset/image.png
View file
Open in desktop
File renamed without changes
0 ios/mobilewallet/Info.plist → ios/AlephiumWallet/Info.plist
View file
Open in desktop
File renamed without changes.
0 ios/mobilewallet/SplashScreen.storyboard → ios/AlephiumWallet/SplashScreen.storyboard
View file
Open in desktop
File renamed without changes.
0 ios/mobilewallet/Supporting/Expo.plist → ios/AlephiumWallet/Supporting/Expo.plist
View file
Open in desktop
File renamed without changes.
0 ios/mobilewallet/main.m → ios/AlephiumWallet/main.m
View file
Open in desktop
File renamed without changes.
0 ios/mobilewallet/noop-file.swift → ios/AlephiumWallet/noop-file.swift
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ elsif podfile_properties.key?('ios.flipper') then
end
end

target 'mobilewallet' do
target 'AlephiumWallet' do
use_expo_modules!
config = use_native_modules!

Expand Down
12 changes: 9 additions & 3 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ PODS:
- React-Core
- react-native-get-random-values (1.9.0):
- React-Core
- react-native-netinfo (9.4.1):
- React-Core
- react-native-pager-view (6.2.0):
- React-Core
- react-native-safe-area-context (4.6.3):
Expand Down Expand Up @@ -542,7 +544,7 @@ PODS:
- RNScreens (3.22.1):
- React-Core
- React-RCTImage
- RNSVG (13.9.0):
- RNSVG (13.12.0):
- React-Core
- SocketRocket (0.6.1)
- Yoga (1.14.0)
Expand Down Expand Up @@ -602,6 +604,7 @@ DEPENDENCIES:
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
- react-native-aes (from `../node_modules/react-native-aes-crypto`)
- react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
- react-native-pager-view (from `../node_modules/react-native-pager-view`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
Expand Down Expand Up @@ -732,6 +735,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-aes-crypto"
react-native-get-random-values:
:path: "../node_modules/react-native-get-random-values"
react-native-netinfo:
:path: "../node_modules/@react-native-community/netinfo"
react-native-pager-view:
:path: "../node_modules/react-native-pager-view"
react-native-safe-area-context:
Expand Down Expand Up @@ -834,6 +839,7 @@ SPEC CHECKSUMS:
React-logger: c5b527272d5f22eaa09bb3c3a690fee8f237ae95
react-native-aes: c75c46aa744bef7c2415fdf7f5b2dcb75ca4364d
react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5
react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
react-native-safe-area-context: 36cc67648134e89465663b8172336a19eeda493d
React-NativeModulesApple: bfbb84f3e6a1b919791b57303524de557ba45fef
Expand All @@ -857,11 +863,11 @@ SPEC CHECKSUMS:
RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
RNReanimated: 3ffa3d63576ecd26a4f8772d03029cccaf41b5d7
RNScreens: 50ffe2fa2342eabb2d0afbe19f7c1af286bc7fb3
RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
RNSVG: 6d07f8f8f246c85e3e16e0bcfc0d047db0c48496
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: ae2d46549a618b46c01e590f7c4c50b1ba74c1bd
PODFILE CHECKSUM: b89dff8c91ad501739b898775406a6e6b6156102

COCOAPODS: 1.12.1
Loading