Skip to content
Merged

4.0.1 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
310 commits
Select commit Hold shift + click to select a range
ad9167a
Fix event list double spinner on load
WietseWind Feb 1, 2025
d0f27b8
Fix https://github.com/XRPL-Labs/Xaman-App/issues/148
WietseWind Feb 2, 2025
e4e8b11
Conditional FeeFactor listing
WietseWind Feb 2, 2025
b58e252
Allow showing Fee Note from backend
WietseWind Feb 2, 2025
f152aa7
ServiceFee note also at fixed fee
WietseWind Feb 2, 2025
8be4953
Fetch more items at once from ledger
WietseWind Feb 5, 2025
d2788d0
Pending Event parallel performance
WietseWind Feb 5, 2025
0484790
https://github.com/XRPL-Labs/Xaman-App/issues/149
WietseWind Feb 5, 2025
06ebc2b
Report signed TX + ServiceFee to backend
WietseWind Feb 6, 2025
322b0af
3.3.3 / Android 55
WietseWind Feb 6, 2025
fceb212
Add SWAP
WietseWind Feb 7, 2025
72f92d4
Swap locales
WietseWind Feb 7, 2025
84a7406
iOS 3.3.3-12, Android 3.3.3-56
WietseWind Feb 7, 2025
7e29c77
Speed up transaction list
WietseWind Feb 7, 2025
bd26411
Speed up event list
WietseWind Feb 7, 2025
48f6154
Pettier double loader fix
WietseWind Feb 8, 2025
7254337
Improve available balance alignment on Sign Request
WietseWind Feb 10, 2025
dea2517
Bumpv ersion 58-14
WietseWind Feb 10, 2025
99b4df8
Fix Check Cash for IOU
WietseWind Feb 11, 2025
f9ec029
Amount can be empty @ backspace
WietseWind Feb 11, 2025
0f0a695
Mutiple action buttons = padding between (vertical)
WietseWind Feb 11, 2025
47b1d3c
Mutiple action buttons = padding between (vertical)
WietseWind Feb 11, 2025
ad90485
Minor UI refresh
WietseWind Feb 11, 2025
4c7af43
Add lang hide Service Fee Tx
WietseWind Feb 11, 2025
7e821b7
Add hiding service fee Eventlist option
WietseWind Feb 11, 2025
c93b260
Styling changes
WietseWind Feb 12, 2025
c7a69b9
Version 3.3.3 15 / 59
WietseWind Feb 12, 2025
420789d
More styling changes
WietseWind Feb 12, 2025
52f490e
Fix QR button alignment, normalise text inpot
WietseWind Feb 12, 2025
03478b8
Request button icon inbound
WietseWind Feb 12, 2025
1a49322
Update iOS Splash
WietseWind Feb 12, 2025
0a125ca
Allow AppId redirect on xApp launch
WietseWind Feb 12, 2025
a9a0b9e
Build 60
WietseWind Feb 12, 2025
f7a282e
iOS+Android Splash Update
WietseWind Feb 12, 2025
0045dd2
Smaller logo during iOS start
WietseWind Feb 12, 2025
723a181
3.3.3.61
WietseWind Feb 12, 2025
a84f367
Allow session logging (permissioned xApp call)
WietseWind Feb 12, 2025
3252078
Locales
WietseWind Feb 12, 2025
717603c
Should (?) fix iOS Return from FaceID = spinner @ Event list
WietseWind Feb 12, 2025
ff61bcc
Request » Receive @ home screen
WietseWind Feb 13, 2025
d8e21eb
Fix jumping QR button @ home panel
WietseWind Feb 14, 2025
98063b9
Fix iOS fixed spinner @ reactivation & nav to event lsit
WietseWind Feb 14, 2025
638d878
Fix iOS Secure text entry blurred newline
WietseWind Feb 14, 2025
2bd8c51
Allow family seed secret type selection
WietseWind Feb 14, 2025
be15d39
keytype selection sync locales
WietseWind Feb 14, 2025
0161a29
Switch network & Go home after account import
WietseWind Feb 15, 2025
adfd451
Backend: account import switch to network
WietseWind Feb 15, 2025
0e243db
Alignment of account switcher @ xapp header
WietseWind Feb 15, 2025
56be9a3
Easy network switching Xahau/XRPL
WietseWind Feb 15, 2025
5a59d9d
Build 3.3.3 62
WietseWind Feb 15, 2025
be256ce
Fix wrong network name @ home if not XRPL/XAHAU
WietseWind Feb 15, 2025
a7e500b
Build 63
WietseWind Feb 15, 2025
5c04611
Bringing back account switch element styling
WietseWind Feb 17, 2025
aceb0c8
Network/Account switching styling
WietseWind Feb 17, 2025
b99738a
Pass payload UUID to fee determination
WietseWind Feb 17, 2025
126ed57
Fix fee picker jumping
WietseWind Feb 17, 2025
7f2fb33
No “not activated” at first account launch
WietseWind Feb 17, 2025
123bfe1
Home screen android+ios account switch alignment
WietseWind Feb 17, 2025
33f9497
Add tx push @ account settings
WietseWind Feb 17, 2025
b7d9ca2
Account push tx translations
WietseWind Feb 17, 2025
23fc4c5
No flicker on first account import due to startDefault after first im…
WietseWind Feb 17, 2025
db7efc0
Persist account information (name) on new account
WietseWind Feb 18, 2025
c193be3
Android show keyboard on xApp search input focus
WietseWind Feb 18, 2025
7e6a4d0
Pro badge: allow for prop, otherwise fetch on device level
WietseWind Feb 18, 2025
a303166
Account panel alignment + Show Pro @ account
WietseWind Feb 18, 2025
b7c0df9
Fix button/input border radius
WietseWind Feb 19, 2025
8bd9d7e
Send flow btn next: arrow
WietseWind Feb 19, 2025
fd84aa6
New account = push by default
WietseWind Feb 19, 2025
4f598a8
Account Generated? default push
WietseWind Feb 19, 2025
cf051fc
Send account removal and push = false to backend on account removal
WietseWind Feb 19, 2025
773e512
Secret Number input with numpad
WietseWind Feb 19, 2025
1fcabc1
Refocus PIN passcode after entry error
WietseWind Feb 19, 2025
17782e4
Move all passcodes from numkeyboard to secure pin pad
WietseWind Feb 19, 2025
2168831
Event details page styling & font changes
WietseWind Feb 19, 2025
2c81857
Event header & border style
WietseWind Feb 19, 2025
50f13b7
Proper alignment ‘none’ @ empty xApp recent
WietseWind Feb 19, 2025
606c2f8
Re-Encryption screen alignment
WietseWind Feb 19, 2025
2c4c515
Change passcode: animationfreame instead of timeout
WietseWind Feb 19, 2025
4bde774
Setup passcode: to PinPad
WietseWind Feb 19, 2025
81751f9
Condensed PIN for small screens on new onboarding
WietseWind Feb 19, 2025
7c18b8b
No dtag 0 on lookup from global directory
WietseWind Feb 19, 2025
925a038
3.3.3 build 64
WietseWind Feb 19, 2025
0d96f7a
Fix alignment & render pixelated elements
WietseWind Feb 20, 2025
ee1f14c
Fix dtag summary edit icon match fee icon
WietseWind Feb 20, 2025
3e08d21
Get native account Pro
WietseWind Feb 20, 2025
1275d9d
3.3.3 - 65
WietseWind Feb 20, 2025
e11cd61
Automatic encryption compliance @ Testflight
WietseWind Feb 20, 2025
ca4c8be
Pass HasPro non bool to prevent account fallback to native hasPro
WietseWind Feb 20, 2025
bcd28da
Build 66
WietseWind Feb 20, 2025
fa38f7a
More flexible account hiding & removing: select next account
WietseWind Feb 20, 2025
a9ecdff
3.3.3 67
WietseWind Feb 20, 2025
9542530
Add backdropInterpolateColor for dark mode
WietseWind Feb 20, 2025
117ac10
Fix network switching dark mode in dev mode
WietseWind Feb 20, 2025
02d5cd2
PIN pad sign dialog alignment
WietseWind Feb 20, 2025
62be526
Pin/Passphrase overlay: dark mode = ligthen for contrast
WietseWind Feb 20, 2025
f496b72
Rergular PIN auth = Glass Blurview overlay instead of dialog
WietseWind Feb 20, 2025
0313a53
3.3.3 68
WietseWind Feb 20, 2025
6a4adc7
Better colour for network switcher
WietseWind Feb 21, 2025
7081534
Update Xaman Graphics iOS
WietseWind Feb 26, 2025
43dd36c
New locales EN for V2 onboarding
WietseWind Feb 26, 2025
d450135
V2 onboarding translations
WietseWind Feb 26, 2025
d32e70b
Overall Styling changes
WietseWind Feb 26, 2025
a006de8
Allow getting light/dark mode image specifically
WietseWind Feb 26, 2025
e7814a9
Image Biometric same for light/dark
WietseWind Feb 26, 2025
2c3d754
New image reference iOS
WietseWind Feb 26, 2025
f76f970
Restyle iOS onboarding (android pending)
WietseWind Feb 26, 2025
ddc397b
Transparency behind highlight pinpad colour
WietseWind Feb 27, 2025
4a6cc94
Fix large screen positioning
WietseWind Feb 27, 2025
815dd52
Version
WietseWind Feb 27, 2025
f870cbf
Fix square screen Fold devices
WietseWind Feb 27, 2025
daf3905
Fix android Fold bottom stretch @ background
WietseWind Feb 28, 2025
3cb9099
Change android splash bg
WietseWind Feb 28, 2025
39e9009
Change Android Images
WietseWind Feb 28, 2025
a22e9ea
Fix network switcher btn colour Dark mode
WietseWind Feb 28, 2025
65bdf11
Fix flatlist
WietseWind Feb 28, 2025
607f52e
Fix account list width on Fold
WietseWind Feb 28, 2025
9ba216a
No grey bg behind token transparency
WietseWind Feb 28, 2025
767834d
Fix account list & Fold devices
WietseWind Feb 28, 2025
b91b832
Show “LP” badge for LP token & space between slash
WietseWind Feb 28, 2025
e4b66f3
Show AMM dual icons
WietseWind Feb 28, 2025
7ced7bf
Version
WietseWind Feb 28, 2025
fbfc01d
Fix scroll on event page
WietseWind Feb 28, 2025
bb14fcd
Exchanged » Swapped
WietseWind Mar 3, 2025
0188e8d
Show dual icon in event list & details page on AMM/payment to self
WietseWind Mar 3, 2025
c2bb805
Load less @ Event list, but dynamically load more (faster)
WietseWind Mar 3, 2025
a4a03dd
Fix new fingerprint background @ sign request & account screens
WietseWind Mar 3, 2025
1a2d630
No border @ Event requests
WietseWind Mar 3, 2025
da2d7ec
Update button bar icons
WietseWind Mar 3, 2025
8614d12
Image prepare scripts
WietseWind Mar 3, 2025
a38e371
Account import/add/Tangem btn
WietseWind Mar 3, 2025
5f9ab16
4.0.0
WietseWind Mar 3, 2025
375d66d
Fix endless load due to RN passing object which is truthy to loadMore
WietseWind Mar 4, 2025
1e03f2a
New build
WietseWind Mar 4, 2025
a924081
Prettier account activation screen
WietseWind Mar 4, 2025
def86da
Fix showing account context menu
WietseWind Mar 4, 2025
8805a0e
Fix biometrics key opacity @ pinpad
WietseWind Mar 4, 2025
4342182
Fix double negative on own account native asset tx yield < tx fee
WietseWind Mar 4, 2025
7160815
Only show biometrics overview instead of pinpad unless no bio or fail…
WietseWind Mar 4, 2025
6313b22
Early init of secuirty key for biometrics to prevent condition where …
WietseWind Mar 4, 2025
2869572
Fix Android fingerprint icon on keypad
WietseWind Mar 4, 2025
911406a
Dark/Taint mode icons @ iOS
WietseWind Mar 4, 2025
c536a67
Build 72
WietseWind Mar 4, 2025
a13693b
Build 72
WietseWind Mar 4, 2025
9a29f54
Fix fixed translations
WietseWind Mar 4, 2025
c077c18
Fix wrong Icon on event details page
WietseWind Mar 5, 2025
d7f811f
Conditional Tangem add button on NFC capabilities
WietseWind Mar 5, 2025
6b55f4f
No Jailbreak check in dev mode
WietseWind Mar 5, 2025
5a6a7dd
Build 73
WietseWind Mar 5, 2025
bc23247
Allow tap backdrop of TL to close dialog
WietseWind Mar 5, 2025
69a0bb9
Update Request panels
WietseWind Mar 5, 2025
f622879
Improve request screen (build)
WietseWind Mar 5, 2025
56c2d36
Only set brightness once
WietseWind Mar 5, 2025
365fa9d
Add Exchange + Swap button to IOU panel
WietseWind Mar 5, 2025
861680b
Show loader instead of inactivated on first network switch
WietseWind Mar 5, 2025
e7c615f
No Swap settings on xApp modal if not swap
WietseWind Mar 5, 2025
c9fe0c4
Reliable swap panel detection
WietseWind Mar 5, 2025
9799637
Alert buttons max length else vertical
WietseWind Mar 5, 2025
d0e72cd
No logging
WietseWind Mar 5, 2025
1cea93a
Allow truncate length for formatted Issuer
WietseWind Mar 5, 2025
458d970
Code
WietseWind Mar 5, 2025
c306bca
Trust Line panel makeover (more space for amount & issuer)
WietseWind Mar 5, 2025
f3e60f4
Fix navigation current Screen state (timing issue too fast nav)
WietseWind Mar 5, 2025
b85e876
Fix empty screen flash before showing Account list
WietseWind Mar 5, 2025
adcec5b
Do not use StyleService.select in ts/tsx
WietseWind Mar 6, 2025
b006ee4
Fix colour of datetime on Devent details page
WietseWind Mar 6, 2025
4f392c6
Fix blink in Asset List Filter during load
WietseWind Mar 6, 2025
75342c4
Minor styling fixes
WietseWind Mar 6, 2025
9f825d1
Allow app reloading of one specific service
WietseWind Mar 6, 2025
6bdf5a8
Remove slippage in Exchange panel
WietseWind Mar 6, 2025
acb10e7
Spam TX label +opacity not style based
WietseWind Mar 6, 2025
6a43d25
Improve dark/light rendering
WietseWind Mar 6, 2025
713b935
Hide filter on reorder, clean filter options on text enter/reverse
WietseWind Mar 6, 2025
40eb36b
Wait removing boot splash till initial render is done (prevent white …
WietseWind Mar 6, 2025
acdff7f
Allow live theme switching
WietseWind Mar 6, 2025
54c267e
build 75 - Live theme switching
WietseWind Mar 6, 2025
1fb79aa
Store SwapNetworks from backend @ profile
WietseWind Mar 6, 2025
a0ab04d
Live style switching without force reload
WietseWind Mar 6, 2025
7ada2b3
Fix network switch memleak
WietseWind Mar 6, 2025
e902d74
Add method to navigate to tab
WietseWind Mar 6, 2025
9467b84
Navigate home after account import
WietseWind Mar 6, 2025
49893e2
Cleanup test @ Styleservice
WietseWind Mar 6, 2025
fe53027
Fix seed alignment error
WietseWind Mar 6, 2025
899dd2e
Bump version build 76
WietseWind Mar 6, 2025
8b4d137
Settings styling & alignment
WietseWind Mar 6, 2025
a95d83f
Move brightness to state
WietseWind Mar 6, 2025
31654b0
Passing Timestamps for re-render force
WietseWind Mar 6, 2025
0621b6a
my accounts to accounts
WietseWind Mar 6, 2025
ffd6125
Fix currency picker dark mode caret
WietseWind Mar 6, 2025
2277e56
Rasterize circle selector icons
WietseWind Mar 6, 2025
eed7b9b
Wait theme switch if modal present, instant on settings
WietseWind Mar 7, 2025
40e830f
Auto theme switching
WietseWind Mar 7, 2025
df484ee
77 - auto dark mode switching
WietseWind Mar 7, 2025
0da51fd
Fix long token names on small screens (token dialog
WietseWind Mar 7, 2025
72fc6c7
Fix build “Xaman empty dSYM file detected, dSYM was created with an e…
WietseWind Mar 7, 2025
e94e15d
Fix alt header on SWAP xApp Panel consistently
WietseWind Mar 7, 2025
0afb265
Add radius to filter btns
WietseWind Mar 7, 2025
368cdcf
Dynamic (user based) swap
WietseWind Mar 7, 2025
2033410
Fix header styling (margin left)
WietseWind Mar 7, 2025
2b0622e
Account Panel header allignment
WietseWind Mar 7, 2025
1ce5d99
New build 78
WietseWind Mar 7, 2025
2e264cf
Generate universal APK too
WietseWind Mar 7, 2025
b6f12fa
/
WietseWind Mar 7, 2025
380e9cc
Globally wait till it’s safe to switch theme
WietseWind Mar 7, 2025
65a1c32
Build 79
WietseWind Mar 7, 2025
4fd0023
Fix no interaction with Token Remove panel
WietseWind Mar 7, 2025
e6b14ca
Fix account. import/add navigation: always go home
WietseWind Mar 7, 2025
43832c7
Do not reset root @ going to Home Tab
WietseWind Mar 7, 2025
4b8e561
Allow for Detox session Reuse
WietseWind Mar 7, 2025
6c1a167
Fix strong pincode detection @ new PIN pad
WietseWind Mar 7, 2025
e2ded9b
Fix all E2E tests after finding several issues :)
WietseWind Mar 7, 2025
f024403
Build 80
WietseWind Mar 7, 2025
383b305
Jailbreak test back on
WietseWind Mar 7, 2025
9c3ecb8
Fix android switch (thanks tests @n3tc4t)
WietseWind Mar 7, 2025
878b7bd
Update tests (layout) after recent 4.0.l0 changes
WietseWind Mar 7, 2025
c0ff9cc
Add xCode test suite
WietseWind Mar 9, 2025
b1a5cb7
Fix event list refresh
WietseWind Mar 9, 2025
dd15fdf
Build 82
WietseWind Mar 10, 2025
6d3bad3
Remove “the” prefix before network name
WietseWind Mar 10, 2025
6d52767
Fix test case: invalid_json error msg
WietseWind Mar 10, 2025
7193c4f
Add vibration to event list refresh
WietseWind Mar 10, 2025
a339f4a
Fix xApp theme on OS auto switch dark mode
WietseWind Mar 10, 2025
727ea91
Improve filter handling
WietseWind Mar 10, 2025
026faf2
Btn Styling request panel
WietseWind Mar 10, 2025
224569e
More styling @ panels
WietseWind Mar 10, 2025
d9ee8f5
Build 83
WietseWind Mar 10, 2025
dd730f4
Fix tests
WietseWind Mar 10, 2025
78a289e
Node 20, otherwise Jest fails
WietseWind Mar 10, 2025
68af8e3
Update es.json
Ekiserrepe Mar 10, 2025
4eb392c
More flexible jest on API error invalid JSON
WietseWind Mar 10, 2025
5668d11
Merge pull request #3 from Ekiserrepe/main
WietseWind Mar 10, 2025
b6909c4
Fix push toggle @ account settings alignment
WietseWind Mar 11, 2025
361b967
All webviews: use current theme if on auto mode
WietseWind Mar 11, 2025
6af7d2d
Change settings order, remove Credits
WietseWind Mar 11, 2025
aef9790
Unique action button @ TX Event page
WietseWind Mar 11, 2025
aedf8b7
Build 84
WietseWind Mar 11, 2025
fc8a3af
4.0.1
WietseWind Mar 11, 2025
fe6fb87
Merge overlay options instead of replace
WietseWind Mar 14, 2025
4d7d7ed
Improve android swipe btn performance
WietseWind Mar 14, 2025
3f23016
Disable unvetted token interaction msg
WietseWind Mar 14, 2025
b562447
Fix TrustLine interaction (remove/…) on Android & iOS
WietseWind Mar 14, 2025
35f4d9d
Fix family seed text input colour
WietseWind Mar 14, 2025
2de06d4
Build 85, fixes TrustLine removal, secret text colour
WietseWind Mar 14, 2025
cc15762
Disable share brightness
WietseWind Mar 14, 2025
fb155de
Fix text colour on tx loading indicator
WietseWind Mar 14, 2025
17a2857
Do not show own reserve if incoming Escrow or Check
WietseWind Mar 14, 2025
75613a8
Working Escrow cancel/finish on creation with Check instead of Sequence
WietseWind Mar 14, 2025
50e022e
Check cash: default full amount @ approve screen
WietseWind Mar 14, 2025
2d63561
Build 86
WietseWind Mar 14, 2025
418c493
401
WietseWind Mar 14, 2025
de64fdc
Merge branch 'develop' into wietsewind-develop
WietseWind Mar 14, 2025
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
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ apply plugin: "com.google.firebase.crashlytics"

import com.android.build.OutputFile

def canonicalVersionName = "4.0.0"
def canonicalVersionCode = 85
def canonicalVersionName = "4.0.1"
def canonicalVersionCode = 86

// NOTE: DO NOT change postFixSize value, this is for handling legacy method for handling the versioning in android
def postFixSize = 30_000
Expand Down
4 changes: 2 additions & 2 deletions ios/Xaman.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@
CODE_SIGN_ENTITLEMENTS = Xaman/Xaman.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 85;
CURRENT_PROJECT_VERSION = 86;
DEVELOPMENT_TEAM = LK5BBJNJZ6;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down Expand Up @@ -1219,7 +1219,7 @@
CODE_SIGN_ENTITLEMENTS = Xaman/Xaman.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 85;
CURRENT_PROJECT_VERSION = 86;
DEVELOPMENT_TEAM = LK5BBJNJZ6;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = Xaman/Info.plist;
Expand Down
2 changes: 1 addition & 1 deletion ios/Xaman/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>85</string>
<string>86</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/XamanTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>85</string>
<string>86</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xaman",
"version": "4.0.0",
"version": "4.0.1",
"license": "SEE LICENSE IN <LICENSE>",
"scripts": {
"start": "node node_modules/react-native/cli.js start",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modules/EventsList/EventsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ class EventsList extends PureComponent<Props, State> {
<View style={[styles.listEmptyContainer]}>
<LoadingIndicator />
<Text>{' '}</Text>
<Text>{Localize.t('events.fetchingTransactionsFromNetwork')}</Text>
<Text style={AppStyles.baseText}>{Localize.t('events.fetchingTransactionsFromNetwork')}</Text>
<Text>{' '}</Text>
</View>
}
Expand Down
5 changes: 5 additions & 0 deletions src/components/Modules/MutationWidgets/ReserveChange.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ class ReserveChange extends PureComponent<Props, State> {
return undefined;
}

if (item.Type === LedgerEntryTypes.Escrow || item.Type === LedgerEntryTypes.Check) {
if (item.Account !== account.address) {
return undefined;
}
}
// ledger objects always have reserve change increase
return {
address: account.address,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class CheckCashTemplate extends Component<Props, State> {

fetchCheckObject = () => {
const { transaction } = this.props;
const { cashAmount } = this.state;

// assign actual check object to the CashCheck tx
LedgerService.getLedgerEntry({ index: transaction.CheckID })
Expand All @@ -81,6 +82,12 @@ class CheckCashTemplate extends Component<Props, State> {
},
() => {
transaction.Check = checkObject;
if (
checkObject?.SendMax?.value &&
(cashAmount === '' || cashAmount === '0' || cashAmount === undefined)
) {
this.onAmountChange(checkObject?.SendMax?.value);
}
},
);
} else {
Expand Down Expand Up @@ -175,7 +182,7 @@ class CheckCashTemplate extends Component<Props, State> {
<Button
onPress={this.focusAmountInput}
style={styles.editButton}
roundedSmall
roundedMini
icon="IconEdit"
iconSize={13}
light
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ class EscrowCancelTemplate extends Component<Props, State> {
// from transaction id
if (isUndefined(transaction.OfferSequence) && (transaction.AccountTxnID ?? transaction.PreviousTxnID)) {
LedgerService.getTransaction(transaction.AccountTxnID! ?? transaction.PreviousTxnID!).then((tx: any) => {
const { Sequence } = tx;
if (Sequence) {
const { Sequence, TicketSequence } = tx;
if (Sequence || TicketSequence) {
this.setState(
{
offerSequence: Sequence,
offerSequence: Sequence || TicketSequence,
},
() => {
transaction.OfferSequence = Sequence;
transaction.OfferSequence = Sequence || TicketSequence;
},
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ class EscrowFinishTemplate extends Component<Props, State> {
// from transaction id
if (isUndefined(transaction.OfferSequence) && transaction.PreviousTxnID) {
await LedgerService.getTransaction(transaction.PreviousTxnID).then((tx: any) => {
const { Sequence } = tx;
if (Sequence) {
const { Sequence, TicketSequence } = tx;
if (Sequence || TicketSequence) {
this.setState(
{
offerSequence: Sequence,
offerSequence: Sequence || TicketSequence,
},
() => {
transaction.OfferSequence = Sequence;
transaction.OfferSequence = Sequence || TicketSequence;
},
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ class TransactionLoaderModal extends Component<Props, State> {
<>
<LoadingIndicator size="large" />
<Spacer size={30} />
<Text style={[AppStyles.p, AppStyles.textCenterAligned]}>
<Text style={[AppStyles.p, AppStyles.textCenterAligned, AppStyles.baseText]}>
{Localize.t('events.fetchingTransactionFromNetwork')}
</Text>
<Text style={[AppStyles.subtext, AppStyles.textCenterAligned, AppStyles.colorGrey]}>
Expand Down
Loading