From 4356288497ca09dc021881e717ccc1be61387a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kip.pe>
Date: Thu, 19 Jan 2023 13:37:04 +0800
Subject: [PATCH] Rename signup route, address property

---
 app/components/add-contributor/template.hbs   |  2 +-
 .../signup/{eth-account.js => account.js}     | 10 +++----
 app/router.js                                 |  2 +-
 .../signup/{eth-account.js => account.js}     |  0
 app/routes/signup/github.js                   |  2 +-
 app/templates/signup/account.hbs              | 29 +++++++++++++++++++
 app/templates/signup/eth-account.hbs          | 24 ---------------
 .../{eth-account-test.js => account-test.js}  |  4 +--
 8 files changed, 39 insertions(+), 34 deletions(-)
 rename app/controllers/signup/{eth-account.js => account.js} (83%)
 rename app/routes/signup/{eth-account.js => account.js} (100%)
 create mode 100644 app/templates/signup/account.hbs
 delete mode 100644 app/templates/signup/eth-account.hbs
 rename tests/unit/routes/signup/{eth-account-test.js => account-test.js} (57%)

diff --git a/app/components/add-contributor/template.hbs b/app/components/add-contributor/template.hbs
index 8478db6..c221fc6 100644
--- a/app/components/add-contributor/template.hbs
+++ b/app/components/add-contributor/template.hbs
@@ -1,6 +1,6 @@
 <form onsubmit={{action "submit"}}>
   <p>
-    <label for="c-account">Ethereum account</label>
+    <label for="c-account">Rootstock account</label>
       <Input @type="text"
              @value={{this.account}}
              name="account" id="c-account"
diff --git a/app/controllers/signup/eth-account.js b/app/controllers/signup/account.js
similarity index 83%
rename from app/controllers/signup/eth-account.js
rename to app/controllers/signup/account.js
index 1a29880..5bc6863 100644
--- a/app/controllers/signup/eth-account.js
+++ b/app/controllers/signup/account.js
@@ -9,11 +9,11 @@ export default Controller.extend({
 
   kredits: service(),
 
-  ethAddress: null,
+  accountAddress: null,
   githubAccessToken: alias('kredits.githubAccessToken'),
 
-  isValidEthAccount: computed('ethAddress', function() {
-    return isAddress(this.ethAddress);
+  isValidEthAccount: computed('accountAddress', function() {
+    return isAddress(this.accountAddress);
   }),
 
   signupButtonDisabled: not('isValidEthAccount'),
@@ -23,7 +23,7 @@ export default Controller.extend({
     completeSignup () {
       const payload = {
         accessToken: this.githubAccessToken,
-        account: this.ethAddress
+        account: this.accountAddress
       }
 
       fetch(config.githubSignupUrl, {
@@ -37,7 +37,7 @@ export default Controller.extend({
 
         this.setProperties({
           githubAccessToken: null,
-          ethAddress: null
+          accountAddress: null
         });
 
         this.transitionToRoute('signup.complete');
diff --git a/app/router.js b/app/router.js
index b0941de..b26ef15 100644
--- a/app/router.js
+++ b/app/router.js
@@ -26,7 +26,7 @@ Router.map(function() {
   });
   this.route('signup', function() {
     this.route('github');
-    this.route('eth-account');
+    this.route('account');
     this.route('complete');
   });
   this.route('budget', function() {
diff --git a/app/routes/signup/eth-account.js b/app/routes/signup/account.js
similarity index 100%
rename from app/routes/signup/eth-account.js
rename to app/routes/signup/account.js
diff --git a/app/routes/signup/github.js b/app/routes/signup/github.js
index 7ad6798..ec64bf3 100644
--- a/app/routes/signup/github.js
+++ b/app/routes/signup/github.js
@@ -22,7 +22,7 @@ export default Route.extend({
 
     this.kredits.set('githubAccessToken', accessToken);
 
-    this.transitionTo('signup.eth-account');
+    this.transitionTo('signup.account');
   }
 
 });
diff --git a/app/templates/signup/account.hbs b/app/templates/signup/account.hbs
new file mode 100644
index 0000000..e3f32ee
--- /dev/null
+++ b/app/templates/signup/account.hbs
@@ -0,0 +1,29 @@
+<header>
+  <h2>Complete your contributor profile</h2>
+</header>
+<div class="content text-lg">
+  <p class="mb-8">
+    Kredits allow you to to earn rewards for your contributions, in the form of
+    dynamic open-source grants. As a regular contributor, you can also take
+    part in the community's project governance and finances.
+  </p>
+  <p>
+    In order to interact with the system you will need a <a
+      href="https://rootstock.io">Rootstock</a> wallet/account.
+  </p>
+  <form>
+    <p>
+      <label>
+        Rootstock account:<br>
+        <Input @type="text" @value={{this.accountAddress}} placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4" class={{if this.isValidEthAccount "valid" ""}} />
+      </label>
+    </p>
+  </form>
+  <p class="actions">
+    <button disabled={{this.signupButtonDisabled}}
+            onclick={{action "completeSignup"}}
+            type="button">
+      Complete my profile
+    </button>
+  </p>
+</div>
\ No newline at end of file
diff --git a/app/templates/signup/eth-account.hbs b/app/templates/signup/eth-account.hbs
deleted file mode 100644
index 4c232e0..0000000
--- a/app/templates/signup/eth-account.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<header>
-  <h2>Complete your contributor profile</h2>
-</header>
-<div class="content text-lg">
-  <p class="mb-8">
-    Kredits allow you to take part in project governance, and to earn rewards for
-    your contributions. For both, you will need an Ethereum wallet/account.
-  </p>
-  <form>
-    <p>
-      <label>
-        Ethereum account:<br>
-        <Input @type="text" @value={{this.ethAddress}} placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4" class={{if this.isValidEthAccount "valid" ""}} />
-      </label>
-    </p>
-  </form>
-  <p class="actions">
-    <button disabled={{this.signupButtonDisabled}}
-            onclick={{action "completeSignup"}}
-            type="button">
-      Complete my profile
-    </button>
-  </p>
-</div>
\ No newline at end of file
diff --git a/tests/unit/routes/signup/eth-account-test.js b/tests/unit/routes/signup/account-test.js
similarity index 57%
rename from tests/unit/routes/signup/eth-account-test.js
rename to tests/unit/routes/signup/account-test.js
index 4c4f714..0c0adb6 100644
--- a/tests/unit/routes/signup/eth-account-test.js
+++ b/tests/unit/routes/signup/account-test.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | signup/eth-account', function(hooks) {
+module('Unit | Route | signup/account', function(hooks) {
   setupTest(hooks);
 
   test('it exists', function(assert) {
-    let route = this.owner.lookup('route:signup/eth-account');
+    let route = this.owner.lookup('route:signup/account');
     assert.ok(route);
   });
 });