Skip to content

Commit 17a3b81

Browse files
richardo2016xrichardo2016x
committed
Merge remote-tracking branch 'origin/develop' into tech/new_arch
2 parents d781446 + 7ce6aea commit 17a3b81

File tree

417 files changed

+17555
-23047
lines changed

Some content is hidden

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

417 files changed

+17555
-23047
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ preview-build-message.txt
3939
# Cursor AI rules (local development only)
4040
.cursor/
4141
.claude/
42+
docs
43+
CLAUDE*.md

‎.vscode/extensions.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"recommendations": [
3+
"Tobermory.es6-string-html"
4+
]
5+
}

‎apps/go.rabby.io/scripts/deploy.sh‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@ case $RABBY_GO_ENV in
99
regression|mobile-regression)
1010
RABBY_GO_ENV="mobile-regression"
1111
echo "Deploying regression build..."
12-
s3_dir="mobile-regression"
12+
local_dir="mobile-regression"
13+
s3_dir="rabby-go/$local_dir"
14+
;;
15+
debug|mobile-debug|*)
16+
RABBY_GO_ENV="mobile-debug"
17+
echo "Deploying debug build..."
18+
local_dir="mobile-debug"
19+
s3_dir="rabby-go/$local_dir"
1320
;;
1421
production|mobile-production)
1522
RABBY_GO_ENV="mobile-production"
1623
echo "Deploying production build..."
17-
s3_dir="mobile"
24+
local_dir="mobile"
25+
s3_dir="rabby-go/$local_dir"
1826
# can_prune=false
1927
;;
20-
debug|mobile-debug|*)
21-
RABBY_GO_ENV="mobile-debug"
22-
echo "Deploying debug build..."
23-
s3_dir="mobile-debug"
24-
;;
2528
esac
2629

27-
dist_dir=$project_dir/dist/$s3_dir;
30+
dist_dir=$project_dir/dist/$local_dir;
2831
if [ -z $SKIP_BUILD ]; then
2932
rm -rf $dist_dir
3033
# ./node_modules/.bin/vite build --mode $RABBY_GO_ENV
@@ -44,24 +47,26 @@ if [ ! -z "$REALLY_UPLOAD" ]; then
4447
common_sync_options="$common_sync_options --delete"
4548
fi
4649
# html
47-
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/rabby-go/$s3_dir/ --exclude "*" --include "*.html" --content-type "text/html" $common_sync_options
50+
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/$s3_dir/ --exclude "*" --include "*.html" --content-type "text/html" $common_sync_options
4851
# js
49-
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/rabby-go/$s3_dir/ --exclude "*" --include "*.js" --content-type "application/javascript" $common_sync_options
52+
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/$s3_dir/ --exclude "*" --include "*.js" --content-type "application/javascript" $common_sync_options
5053
# css
51-
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/rabby-go/$s3_dir/ --exclude "*" --include "*.css" --content-type "text/css" $common_sync_options
54+
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/$s3_dir/ --exclude "*" --include "*.css" --content-type "text/css" $common_sync_options
5255
# svg
53-
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/rabby-go/$s3_dir/ --exclude "*" --include "*.svg" --content-type "image/svg+xml" $common_sync_options
56+
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/$s3_dir/ --exclude "*" --include "*.svg" --content-type "image/svg+xml" $common_sync_options
5457
# png
55-
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/rabby-go/$s3_dir/ --exclude "*" --include "*.png" --content-type "image/png" $common_sync_options
58+
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/$s3_dir/ --exclude "*" --include "*.png" --content-type "image/png" $common_sync_options
5659
# jpeg/jpg
57-
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/rabby-go/$s3_dir/ --exclude "*" --include "*.jpeg" --content-type "image/jpeg" $common_sync_options
58-
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/rabby-go/$s3_dir/ --exclude "*" --include "*.jpg" --content-type "image/jpeg" $common_sync_options
60+
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/$s3_dir/ --exclude "*" --include "*.jpeg" --content-type "image/jpeg" $common_sync_options
61+
aws s3 sync $dist_dir/ s3://${RABBY_MOBILE_BUILD_BUCKET}/$s3_dir/ --exclude "*" --include "*.jpg" --content-type "image/jpeg" $common_sync_options
5962

60-
if [ ! -z $RABBY_GO_CDN_FRONTEND_ID ]; then
61-
echo "Automatically refresh CDN"
62-
aws cloudfront create-invalidation --distribution-id $RABBY_GO_CDN_FRONTEND_ID --paths "/$s3_dir/*"
63-
echo "CDN invalidation created"
64-
fi
63+
# if [ ! -z $RABBY_GO_CDN_FRONTEND_ID ]; then
64+
# echo "Automatically refresh CDN"
65+
# aws cloudfront create-invalidation --distribution-id $RABBY_GO_CDN_FRONTEND_ID --paths "/$s3_dir/*"
66+
# echo "CDN invalidation created"
67+
# fi
68+
echo "You can refresh CDN by the command below"
69+
echo "aws cloudfront create-invalidation --distribution-id \$RABBY_GO_CDN_FRONTEND_ID --paths "/$s3_dir/*""
6570
fi
6671

6772
echo "Refresh by \`aws cloudfront create-invalidation --distribution-id \$RABBY_GO_CDN_FRONTEND_ID --paths '/$s3_dir/*'\`"

‎apps/mobile/.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
assets/custom/*
2+
assets/pages/*

‎apps/mobile/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ scripts/tmp
8989
**/InpageBridgeWeb3.js
9090
/src/**/vconsole.min.js
9191
/android/app/src/main/assets/custom/vconsole.min.js
92+
/android/app/src/main/assets/custom/*
9293
/android/app/src/main/assets/fonts/*
9394
/android/app/src/main/res/font/*.ttf
9495
/android/app/src/main/res/font/*.otf

‎apps/mobile/.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
src/constant/default-chain-data.ts
2+
assets/custom

‎apps/mobile/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ android {
9595
applicationId "com.debank.rabbymobile"
9696
minSdkVersion rootProject.ext.minSdkVersion
9797
targetSdkVersion rootProject.ext.targetSdkVersion
98-
versionCode 100132
99-
versionName "0.6.35"
98+
versionCode 100142
99+
versionName "0.6.40"
100100
missingDimensionStrategy "store", "play"
101101
buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
102102
}

‎apps/mobile/android/app/src/debug/AndroidManifest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
tools:targetApi="28"
1010
tools:ignore="GoogleAppIndexingWarning">
1111
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
12-
<activity android:name=".MainActivity">
12+
<activity android:name=".MainActivity" android:exported="true">
1313
<intent-filter android:autoVerify="true">
1414
<action android:name="android.intent.action.VIEW" />
1515
<category android:name="android.intent.category.DEFAULT" />
1616
<category android:name="android.intent.category.BROWSABLE" />
1717
<data android:scheme="https" />
18-
<data android:scheme="rabbygo-debug" />
19-
<data android:host="go.rabby.io" android:pathPrefix="/mobile-debug/" />
18+
<data android:host="go-debug.rabby.io" android:pathPrefix="/mobile-debug/" />
2019
</intent-filter>
2120
</activity>
2221
</application>

‎apps/mobile/android/app/src/debug/res/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
<resources>
22
<string name="app_name">Debug Rabby Wallet</string>
3+
<string name="rabbygo_scheme">rabbygo-debug</string>
4+
<string name="rabbygo_httpdomain">go.rabby.io</string>
5+
<string name="rabbygo_pathprefix">/mobile-debug/</string>
36
</resources>

‎apps/mobile/android/app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
android:windowSoftInputMode="adjustPan"
3232
android:screenOrientation="portrait"
3333
android:exported="true">
34-
<intent-filter android:autoVerify="true">
34+
<intent-filter>
3535
<action android:name="android.intent.action.MAIN" />
3636
<category android:name="android.intent.category.LAUNCHER" />
3737
</intent-filter>
@@ -41,21 +41,19 @@
4141
<category android:name="android.intent.category.BROWSABLE" />
4242
<data android:scheme="rabby" />
4343
</intent-filter>
44-
<intent-filter>
44+
<intent-filter android:autoVerify="true">
4545
<action android:name="android.intent.action.VIEW" />
4646
<category android:name="android.intent.category.DEFAULT" />
4747
<category android:name="android.intent.category.BROWSABLE" />
48-
<data android:scheme="http" />
4948
<data android:scheme="https" />
50-
<data android:host="rabby.io" />
49+
<data android:host="@string/rabbygo_httpdomain" android:pathPrefix="@string/rabbygo_pathprefix" />
5150
</intent-filter>
52-
<intent-filter android:autoVerify="true">
51+
<intent-filter>
5352
<action android:name="android.intent.action.VIEW" />
5453
<category android:name="android.intent.category.DEFAULT" />
5554
<category android:name="android.intent.category.BROWSABLE" />
56-
<data android:scheme="https" />
57-
<data android:scheme="rabbygo" />
58-
<data android:host="go.rabby.io" android:pathPrefix="/mobile/" />
55+
<data android:scheme="@string/rabbygo_scheme" />
56+
<data android:host="@string/rabbygo_httpdomain" android:pathPrefix="@string/rabbygo_pathprefix" />
5957
</intent-filter>
6058
</activity>
6159
<provider

0 commit comments

Comments
 (0)