Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
- sprint
- dev
- main
- release/2.6.3
pull_request:
branches:
- sprint
- dev
- main
- release/2.6.3

jobs:
test:
Expand Down
5 changes: 4 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,11 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (>= 1.11.3)
activesupport (>= 6.1.7.5, != 7.1.0)
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
concurrent-ruby (< 1.3.4)
fastlane (~> 2.225.0)
xcodeproj (< 1.26.0)

RUBY VERSION
ruby 3.3.0p0
Expand Down
22 changes: 12 additions & 10 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ android {
applicationId "io.hexawallet.keeper"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 621
versionName "2.3.15"
versionCode 626
versionName "2.6.3"
missingDimensionStrategy 'react-native-camera', 'general'
missingDimensionStrategy 'store', 'play'
multiDexEnabled true
Expand All @@ -115,12 +115,11 @@ android {

signingConfigs {
release {
if (project.hasProperty('MYAPP_RELEASE_STORE_FILE')) {
storeFile file(MYAPP_RELEASE_STORE_FILE)
storePassword MYAPP_RELEASE_STORE_PASSWORD
keyAlias MYAPP_RELEASE_KEY_ALIAS
keyPassword MYAPP_RELEASE_KEY_PASSWORD
}
// Release credentials belong in the build environment, never in Git.
storeFile file(System.getenv('KEEPER_ANDROID_KEYSTORE') ?: 'release.keystore')
storePassword System.getenv('STORE_PASSWORD')
keyAlias System.getenv('KEY_ALIAS')
keyPassword System.getenv('KEY_PASSWORD')
}
debug {
storeFile file('debug.keystore')
Expand All @@ -134,13 +133,16 @@ android {
signingConfig signingConfigs.debug
}
release {
signingConfig signingConfigs.release
// Caution! In production, you need to generate your own keystore file.
// see https://reactnative.dev/docs/signed-apk-android.
// signingConfig signingConfigs.debug
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
productFlavors {
production {
signingConfig signingConfigs.release
minSdkVersion rootProject.ext.minSdkVersion
applicationId "io.hexawallet.bitcoinkeeper"
targetSdkVersion rootProject.ext.targetSdkVersion
Expand Down Expand Up @@ -203,4 +205,4 @@ dependencies {
implementation 'com.itextpdf:itextg:5.5.10'


}
}
3 changes: 3 additions & 0 deletions android/app/src/main/java/com/hexa_keeper/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.facebook.react.ReactActivity
import com.facebook.react.ReactActivityDelegate
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
import com.facebook.react.defaults.DefaultReactActivityDelegate
import com.swmansion.rnscreens.fragment.restoration.RNScreensFragmentFactory

class MainActivity : ReactActivity() {

Expand All @@ -17,6 +18,8 @@ class MainActivity : ReactActivity() {
DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)

override fun onCreate(savedInstanceState: Bundle?) {
// React Native owns screen state; discard stale native screen fragments on recreation.
supportFragmentManager.fragmentFactory = RNScreensFragmentFactory()
super.onCreate(savedInstanceState)

window.decorView.post {
Expand Down
43 changes: 28 additions & 15 deletions android/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,19 @@ platform :android do
)
end

desc "Push a new live build to Slack and internal track on Play Store"
desc "Build explicitly versioned production artifacts and upload to Play internal testing"
lane :live do
file_name = "../../.env"
file_url = "https://raw.githubusercontent.com/bithyve/bitcoin-keeper-envs/live/app.live.env"
auth_header = "Authorization: token #{ENV["GITHUB_ACCESS_TOKEN"]}"
sh(
"curl -H '#{auth_header}' -o '#{file_name}' -s '#{file_url}'",
step_name: "curl -H '***' -o '#{file_name}' -s '#{file_url}'"
)
sh("node", File.expand_path("../../scripts/release-version.cjs", __dir__), "release-check")
production_env = File.expand_path("../../.env.production", __dir__)
UI.user_error!("Missing reviewed .env.production") unless File.file?(production_env)
sh("node", File.expand_path("../../scripts/verify-channel-config.cjs", __dir__), production_env)
ENV['ENVFILE'] = production_env
store_password = ENV["STORE_PASSWORD"]
key_password = ENV["KEY_PASSWORD"]
key_alias = ENV["KEY_ALIAS"]
releaseFilePath = File.join(Dir.pwd, "../app", "release.keystore")
bump_version_code()
UI.user_error!("Missing Android release signing credentials") if [store_password, key_password, key_alias].any? { |value| value.to_s.empty? }
releaseFilePath = ENV["KEEPER_ANDROID_KEYSTORE"] || File.expand_path("../app/release.keystore", __dir__)
UI.user_error!("Missing Android release keystore") unless File.file?(releaseFilePath)
gradle(task: 'clean')
gradle(
task: 'bundle',
Expand All @@ -73,9 +72,8 @@ platform :android do
"android.injected.signing.key.password" => key_password,
}
)
upload_to_play_store(
track: 'internal'
)
aab_path = Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH].to_s
UI.user_error!("Build did not return an AAB path") if aab_path.empty?
gradle(
task: 'assemble',
build_type: 'productionRelease',
Expand All @@ -87,21 +85,36 @@ platform :android do
"android.injected.signing.key.password" => key_password,
}
)
apk_path = Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH].to_s
UI.user_error!("Build did not return an APK path") if apk_path.empty?
verifier = File.expand_path("../../scripts/verify-release-artifact.py", __dir__)
sh("python3", verifier, aab_path)
sh("python3", verifier, apk_path)
upload_to_play_store(
track: 'internal',
aab: aab_path
)
end
end


after_all do |lane|
versionCode = android_get_version_code()
slack(message: "Build success :rocket:\nVersion Code: " + versionCode.to_s)
UI.message("Build success. Version Code: " + versionCode.to_s)
if ENV['KEEPER_NOTIFY_SLACK'] == '1'
slack(message: "Build success :rocket:\nVersion Code: " + versionCode.to_s)
end
end

error do |lane, exception|
error do |lane, exception|
UI.error("Fastlane failed: " + exception.message.to_s)
if ENV['KEEPER_NOTIFY_SLACK'] == '1'
slack(
message: exception.message,
success:false
)
end
end

lane :bump_version_code do
path = '../app/build.gradle'
Expand Down
2 changes: 1 addition & 1 deletion android/fastlane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Push a new dev build to Slack
[bundle exec] fastlane android live
```

Push a new live build to Slack and internal track on Play Store
Build explicitly versioned production artifacts and upload to Play internal testing

----

Expand Down
4 changes: 0 additions & 4 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
# are providing them.
newArchEnabled=true

MYAPP_RELEASE_STORE_FILE=release.keystore
MYAPP_RELEASE_KEY_ALIAS=hexawallet
MYAPP_RELEASE_STORE_PASSWORD=hexa@2021
MYAPP_RELEASE_KEY_PASSWORD=hexa@2021
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# Use this property to enable or disable the Hermes JS engine.
Expand Down
51 changes: 51 additions & 0 deletions flows/ask-history-navigation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Run on an unlocked disposable app with an existing Ask conversation.
appId: ${APP_ID}
---
- repeat:
times: 3
commands:
- tapOn:
id: home_tab_ask
- assertVisible:
id: chat_thread_0
- tapOn:
id: chat_thread_0
- tapOn:
id: btn_learn_more
- assertVisible: Before you use Ask Keeper
- tapOn: Got it
- tapOn:
id: btn_learn_more
- tapOn: Learn more about Ask Keeper.*
- assertVisible: About Ask Keeper
- tapOn:
id: btn_back
- tapOn:
id: input_message
- assertVisible:
id: btn_back
- tapOn:
id: btn_back
- assertVisible:
id: chat_thread_0
- assertVisible:
id: home_tab_wallets
- assertVisible:
id: home_tab_keys
- assertVisible:
id: home_tab_ask
- assertVisible:
id: home_tab_more
- tapOn:
id: home_tab_more
- assertVisible: More Options
- assertNotVisible:
id: chat_thread_0
- tapOn:
id: home_tab_wallets
- assertVisible:
id: wallet_item_.*
- tapOn:
id: home_tab_ask
- assertVisible:
id: chat_thread_0
46 changes: 46 additions & 0 deletions flows/ask-tab-navigation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Run on an unlocked disposable app at Home with no Ask conversations.
# maestro test -e APP_ID=io.hexawallet.keeper flows/ask-tab-navigation.yaml
appId: ${APP_ID}
---
- repeat:
times: 3
commands:
- tapOn:
id: home_tab_ask
- assertVisible: "Something isn't working"
- tapOn:
id: home_tab_more
- assertVisible: More Options
- assertNotVisible: "Something isn't working"
- assertNotVisible: I have an idea for Keeper
- assertNotVisible: Never share seed words or private keys.
- assertVisible:
id: home_tab_wallets
- assertVisible:
id: home_tab_keys
- assertVisible:
id: home_tab_ask
- assertVisible:
id: home_tab_more
- tapOn:
id: home_tab_ask
- assertVisible: "Something isn't working"
- tapOn:
id: home_tab_wallets
- assertVisible:
id: wallet_item_.*
- assertNotVisible: "Something isn't working"
- tapOn:
id: home_tab_ask
- assertVisible: "Something isn't working"
- tapOn:
id: home_tab_keys
- assertNotVisible: "Something isn't working"
- assertVisible:
id: home_tab_wallets
- assertVisible:
id: home_tab_keys
- assertVisible:
id: home_tab_ask
- assertVisible:
id: home_tab_more
Loading
Loading