Merge branch 'dist' of github.com:urbit/urbit into dist

pkg/arvo/lib/desk-jam.hoon

@@ -4,16 +4,20 @@
   |=  [our=ship =desk now=@da]
   ~>  %slog.0^leaf/"jamming desk {<desk>}"
   %-  jam
-  %-  ?:(=(%base desk) remove-tmp-dir same)
+  %-  ?:(=(%base desk) remove-misc-dirs same)
   %-  ankh-to-map
   =<  ank
   .^(dome:clay %cv /(scot %p our)/[desk]/(scot %da now))
 ::
-++  remove-tmp-dir
+++  remove-misc-dirs
   |=  fiz=(map path page)
   ^-  (map path page)
   %-  ~(gas by *(map path page))
-  (skip ~(tap by fiz) |=([p=path *] ?=([%tmp *] p)))
+  %+  skip  ~(tap by fiz)
+  |=  [p=path *]
+  ?|  ?=([%tmp *] p)
+      ?=([%tests *] p)
+  ==
 ::
 ++  ankh-to-map
   =|  res=(map path page)

pkg/btc-wallet/src/hooks/useSettings.tsx

@@ -159,7 +159,7 @@ export const SettingsProvider: React.FC<Props> = ({ channel, children }) => {
 
   const initializeSettings = () => {
     let app = 'settings-store';
-    let path = `/bucket/${window.desk}btc-wallet`;
+    let path = `/bucket/${window.desk}/btc-wallet`;
 
     fetch(`/~/scry/${app}${path}.json`)
       .then((res) => res.json())