Skip to content

Commit c8269d4

Browse files
committed
feat: Resolved PR comments.
Signed-off-by: Gaurav Goel <[email protected]>
1 parent eab3294 commit c8269d4

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

app/src/main/java/com/web3auth/app/MainActivity.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
178178
"onPrimary" to "#0000FF"
179179
)
180180
),
181-
buildEnv = BuildEnv.TESTING,
181+
authBuildEnv = BuildEnv.TESTING,
182182
sessionTime = 86400,
183183
)
184184

@@ -214,14 +214,15 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
214214

215215
val launchWalletButton = findViewById<Button>(R.id.launchWalletButton)
216216
launchWalletButton.setOnClickListener {
217-
val launchWalletCompletableFuture = web3Auth.launchWalletServices(
217+
val launchWalletCompletableFuture = web3Auth.showWalletUI(
218+
chainId = "0x89",
218219
chainConfig = listOf(
219220
ChainConfig(
220221
chainId = "0x89",
221222
rpcTarget = "https://1rpc.io/matic",
222223
chainNamespace = ChainNamespace.EIP155
223224
)
224-
), chainId = "0x89"
225+
)
225226
)
226227
launchWalletCompletableFuture.whenComplete { _, error ->
227228
if (error == null) {
@@ -241,13 +242,14 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
241242
add("Android")
242243
}
243244
val signMsgCompletableFuture = web3Auth.request(
245+
chainId = "0x89",
244246
chainConfig = listOf(
245247
ChainConfig(
246248
chainId = "0x89",
247249
rpcTarget = "https://polygon-rpc.com/",
248250
chainNamespace = ChainNamespace.EIP155
249251
)
250-
), chainId = "0x89", "personal_sign", requestParams = params, appState = "web3Auth"
252+
), "personal_sign", requestParams = params, appState = "web3Auth"
251253
)
252254
signMsgCompletableFuture.whenComplete { signResult, error ->
253255
if (error == null) {

core/src/main/java/com/web3auth/core/Web3Auth.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
7373
redirectUrl = web3AuthOption.redirectUrl.toString(),
7474
whiteLabel = web3AuthOption.whiteLabel?.let { gson.toJson(it) },
7575
authConnectionConfig = web3AuthOption.authConnectionConfig?.let { gson.toJson(it) },
76-
buildEnv = web3AuthOption.buildEnv?.name?.lowercase(Locale.ROOT),
76+
buildEnv = web3AuthOption.authBuildEnv?.name?.lowercase(Locale.ROOT),
7777
mfaSettings = web3AuthOption.mfaSettings?.let { gson.toJson(it) },
7878
sessionTime = web3AuthOption.sessionTime,
7979
originData = web3AuthOption.originData?.let { gson.toJson(it) },
@@ -519,9 +519,9 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
519519
* @param path The path where the wallet services will be launched. Default value is "wallet".
520520
* @return A CompletableFuture<Void> representing the asynchronous operation.
521521
*/
522-
fun launchWalletServices(
523-
chainConfig: List<ChainConfig>,
522+
fun showWalletUI(
524523
chainId: String,
524+
chainConfig: List<ChainConfig>,
525525
path: String? = "wallet",
526526
): CompletableFuture<Void> {
527527
val launchWalletServiceCF: CompletableFuture<Void> = CompletableFuture()
@@ -583,8 +583,8 @@ class Web3Auth(web3AuthOptions: Web3AuthOptions, context: Context) : WebViewResu
583583
* @return A CompletableFuture<Void> representing the asynchronous operation.
584584
*/
585585
fun request(
586-
chainConfig: List<ChainConfig>,
587586
chainId: String,
587+
chainConfig: List<ChainConfig>,
588588
method: String,
589589
requestParams: JsonArray,
590590
path: String? = "wallet/request",

core/src/main/java/com/web3auth/core/types/Web3AuthOptions.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ import androidx.annotation.Keep
77
data class Web3AuthOptions(
88
val clientId: String,
99
val network: Network,
10-
var buildEnv: BuildEnv? = BuildEnv.PRODUCTION,
10+
var authBuildEnv: BuildEnv? = BuildEnv.PRODUCTION,
1111
@Transient var redirectUrl: Uri,
12-
var sdkUrl: String = getSdkUrl(buildEnv),
12+
var sdkUrl: String = getSdkUrl(authBuildEnv),
1313
var whiteLabel: WhiteLabelData? = null,
1414
val authConnectionConfig: List<AuthConnectionConfig>? = emptyList(),
1515
val useCoreKitKey: Boolean? = false,
1616
val chainNamespace: ChainNamespace? = ChainNamespace.EIP155,
1717
val mfaSettings: MfaSettings? = null,
1818
val sessionTime: Int? = 30 * 86400,
19-
var walletSdkUrl: String? = getWalletSdkUrl(buildEnv),
20-
var dashboardUrl: String? = getDashboardUrl(buildEnv),
19+
var walletSdkUrl: String? = getWalletSdkUrl(authBuildEnv),
20+
var dashboardUrl: String? = getDashboardUrl(authBuildEnv),
2121
var originData: Map<String, String>? = null
2222
) {
2323
init {
2424
if (dashboardUrl == null) {
25-
dashboardUrl = getDashboardUrl(buildEnv)
25+
dashboardUrl = getDashboardUrl(authBuildEnv)
2626
}
2727
}
2828
}

0 commit comments

Comments
 (0)