lint

status-im · Dec 16, 2022 · ced23fe · ced23fe
1 parent 9d1e5f3
commit ced23fe
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 58 deletions.
diff --git a/src/quo2/foundations/colors.cljs b/src/quo2/foundations/colors.cljs
@@ -183,21 +183,6 @@
       (let [base-color (get-in colors-map [(keyword color) suffix])]
         (if opacity (alpha base-color (/ opacity 100)) base-color))))))
 
-(defn- opacity->hex [opacity]
-  (case opacity
-    0 "00"
-    10 "1A"
-    20 "33"
-    30 "4d"
-    40 "66"
-    50 "80"
-    60 "99"
-    70 "B3"
-    80 "CC"
-    90 "E6"
-    "FF"))
-
-
 (defn custom-color-by-theme
   "(custom-color-by-theme color suffix-light suffix-dark opacity-light opacity-dark)
    color         :primary/:purple/...

diff --git a/src/utils/collection.cljs b/src/utils/collection.cljs
@@ -15,8 +15,8 @@
   [key coll]
   (into {} (map #(vector (key %) %) coll)))
 
-
-(defn distinct-by [key coll]
+(defn distinct-by
   "Given a key and a collection returns a unique collection by that key"
+  [key coll]
   (let [groups (group-by key coll)]
     (map #(first (groups %)) (distinct (map key coll)))))
diff --git a/status-go-version.json b/status-go-version.json
@@ -3,48 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     "version": "v0.117.1",
     "commit-sha1": "8593866862175eeab6f30765e5f0b813f3b1b4db",
     "src-sha256": "1ml22627jadj150y9yj7p9z91vx49min6hzvsg88i3nhx4153nia"
-=======
-=======
->>>>>>> d6a933aa2... refactor
-<<<<<<< HEAD
-    "version": "v0.115.6",
-    "commit-sha1": "a97b5527305b9f23b15246c5489726f8cd758edd",
-    "src-sha256": "18x506xrxbpabfy0vn82bzyd0f6zmr5khclqbzfwymi5d1m35cjm"
-=======
-    "version": "3745ec03efdf16c231e3df74da0c51af2480107e",
-    "commit-sha1": "3745ec03efdf16c231e3df74da0c51af2480107e",
-    "src-sha256": "1hikww0y1p70pr5ga3jnz72zc27k0zqjp9vk79ww9fw0165yi1h0"
->>>>>>> 0658974a7... refactor
-<<<<<<< HEAD
->>>>>>> 2a158b89a... refactor
-=======
-=======
-    "version": "v0.115.5",
-    "commit-sha1": "684e9654de4800df619ce593b5d331ebea9ed1a8",
-    "src-sha256": "0ci1s3w5jnf6sz2b6hn30gy14hp142gic006r6c3g5ln8y19wdbi"
->>>>>>> 78518d239... refactor
->>>>>>> d6a933aa2... refactor
-=======
-    "version": "v0.115.6",
-    "commit-sha1": "a97b5527305b9f23b15246c5489726f8cd758edd",
-    "src-sha256": "18x506xrxbpabfy0vn82bzyd0f6zmr5khclqbzfwymi5d1m35cjm"
->>>>>>> 3ae5dc0cc... refactor
-=======
-    "version": "53ccf5344c088242474fb1ad429013be5788e8e1",
-    "commit-sha1": "53ccf5344c088242474fb1ad429013be5788e8e1",
-    "src-sha256": "1qr5r30h347k950z38ifg2mc4mqz3dj6rj2b15150x0cfb2lvbjq"
->>>>>>> 3d0f52ba2... update status-go version
-=======
-    "version": "d1a4b53d5c36c955c09302777d4a3c5aa24f87de",
-    "commit-sha1": "d1a4b53d5c36c955c09302777d4a3c5aa24f87de",
-    "src-sha256": "10ig1l4im6fkd7kn90ylichzpcf29m7k59w91d7p47j18icdmwv7"
->>>>>>> be4f63a29... refactor
 }